fenix/PDF4QT
1
0
Fork 0
mirror of https://github.com/JakubMelka/PDF4QT.git synced 2025-06-05 21:59:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

3D PDF: Bugfixing

Browse Source
This commit is contained in:
Jakub Melka
2022-11-27 18:53:08 +01:00
parent 11dc9a7bd4
commit 0037f4d4fa
4 changed files with 98 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Pdf4QtLib/sources/pdf3d_u3d.h
View File

@@ -246,6 +246,7 @@ public:
QVector4D getDiffuseColor(size_t index) const { return index < m_diffuseColors.size() ? m_diffuseColors[index] : QVector4D(0, 0, 0, 0); } QVector4D getDiffuseColor(size_t index) const { return index < m_diffuseColors.size() ? m_diffuseColors[index] : QVector4D(0, 0, 0, 0); }
QVector4D getSpecularColor(size_t index) const { return index < m_specularColors.size() ? m_specularColors[index] : QVector4D(0, 0, 0, 0); } QVector4D getSpecularColor(size_t index) const { return index < m_specularColors.size() ? m_specularColors[index] : QVector4D(0, 0, 0, 0); }
const Line& getLine(size_t index) const { return m_lines[index]; } const Line& getLine(size_t index) const { return m_lines[index]; }
const std::vector<Line>& getLines() const { return m_lines; }
void addPosition(const QVector3D& position) { m_positions.emplace_back(position); } void addPosition(const QVector3D& position) { m_positions.emplace_back(position); }
void addNormal(const QVector3D& normal) { m_normals.emplace_back(normal); } void addNormal(const QVector3D& normal) { m_normals.emplace_back(normal); }

186
Pdf4QtViewer/pdf3dsceneprocessor.cpp
View File

@@ -383,35 +383,7 @@ Qt3DCore::QNode* PDF3DSceneProcessor::createLineSetGeometry(const pdf::u3d::PDF3
// We will display lines colored by auxiliary color // We will display lines colored by auxiliary color
// Vertex buffer // Vertex buffer
Qt3DRender::QBuffer* vertexBuffer = new Qt3DRender::QBuffer(); Qt3DRender::QAttribute* positionAttribute = createPositionAttribute(lineSetGeometry->getPositions());
vertexBuffer->setType(Qt3DRender::QBuffer::VertexBuffer);
uint positionCount = static_cast<uint>(lineSetGeometry->getPositionCount());
QByteArray vertexBufferData;
vertexBufferData.resize(positionCount * 3 * sizeof(float));
float* vertexBufferDataPtr = reinterpret_cast<float*>(vertexBufferData.data());
for (size_t i = 0; i < positionCount; ++i)
{
QVector3D position = lineSetGeometry->getPosition(i);
*vertexBufferDataPtr++ = position.x();
*vertexBufferDataPtr++ = position.y();
*vertexBufferDataPtr++ = position.z();
}
vertexBuffer->setData(vertexBufferData);
constexpr uint elementSize = 3;
constexpr uint byteStride = elementSize * sizeof(float);
Qt3DRender::QAttribute* positionAttribute = new Qt3DRender::QAttribute();
positionAttribute->setName(Qt3DRender::QAttribute::defaultPositionAttributeName());
positionAttribute->setVertexBaseType(Qt3DRender::QAttribute::Float);
positionAttribute->setVertexSize(3);
positionAttribute->setAttributeType(Qt3DRender::QAttribute::VertexAttribute);
positionAttribute->setBuffer(vertexBuffer);
positionAttribute->setByteOffset(0);
positionAttribute->setByteStride(byteStride);
positionAttribute->setCount(positionCount);
// Index buffer // Index buffer
uint lineCount = static_cast<uint>(lineSetGeometry->getLineCount()); uint lineCount = static_cast<uint>(lineSetGeometry->getLineCount());
@@ -466,8 +438,40 @@ Qt3DCore::QNode* PDF3DSceneProcessor::createLineSetGeometry(const pdf::u3d::PDF3
case SolidWireframe: case SolidWireframe:
{ {
// We will display classic colored lines // We will display classic colored lines
// TODO: implement this
break; std::vector<QVector3D> positions;
std::vector<QVector3D> colors;
positions.reserve(lineSetGeometry->getLineCount() * 2);
colors.reserve(lineSetGeometry->getLineCount() * 2);
using Line = pdf::u3d::PDF3D_U3D_LineSetGeometry::Line;
for (const Line& line : lineSetGeometry->getLines())
{
positions.push_back(lineSetGeometry->getPosition(line.position1));
positions.push_back(lineSetGeometry->getPosition(line.position2));
colors.push_back(lineSetGeometry->getDiffuseColor(line.diffuseColor1).toVector3D());
colors.push_back(lineSetGeometry->getDiffuseColor(line.diffuseColor2).toVector3D());
}
Qt3DRender::QAttribute* positionAttribute = createPositionAttribute(positions);
Qt3DRender::QAttribute* colorAttribute = createColorAttribute(colors);
// Geometry
Qt3DRender::QGeometry* geometry = new Qt3DRender::QGeometry();
geometry->addAttribute(positionAttribute);
geometry->addAttribute(colorAttribute);
Qt3DRender::QGeometryRenderer* geometryRenderer = new Qt3DRender::QGeometryRenderer();
geometryRenderer->setGeometry(geometry);
geometryRenderer->setPrimitiveRestartEnabled(false);
geometryRenderer->setPrimitiveType(Qt3DRender::QGeometryRenderer::Lines);
Qt3DExtras::QPerVertexColorMaterial* material = new Qt3DExtras::QPerVertexColorMaterial();
Qt3DCore::QEntity* entity = new Qt3DCore::QEntity();
entity->addComponent(geometryRenderer);
entity->addComponent(material);
return entity;
} }
case Vertices: case Vertices:
@@ -475,35 +479,7 @@ Qt3DCore::QNode* PDF3DSceneProcessor::createLineSetGeometry(const pdf::u3d::PDF3
// We will display only vertices, with auxiliary color // We will display only vertices, with auxiliary color
// Vertex buffer // Vertex buffer
Qt3DRender::QBuffer* vertexBuffer = new Qt3DRender::QBuffer(); Qt3DRender::QAttribute* positionAttribute = createPositionAttribute(lineSetGeometry->getPositions());
vertexBuffer->setType(Qt3DRender::QBuffer::VertexBuffer);
uint positionCount = static_cast<uint>(lineSetGeometry->getPositionCount());
QByteArray vertexBufferData;
vertexBufferData.resize(positionCount * 3 * sizeof(float));
float* vertexBufferDataPtr = reinterpret_cast<float*>(vertexBufferData.data());
for (size_t i = 0; i < positionCount; ++i)
{
QVector3D position = lineSetGeometry->getPosition(i);
*vertexBufferDataPtr++ = position.x();
*vertexBufferDataPtr++ = position.y();
*vertexBufferDataPtr++ = position.z();
}
vertexBuffer->setData(vertexBufferData);
constexpr uint elementSize = 3;
constexpr uint byteStride = elementSize * sizeof(float);
Qt3DRender::QAttribute* positionAttribute = new Qt3DRender::QAttribute();
positionAttribute->setName(Qt3DRender::QAttribute::defaultPositionAttributeName());
positionAttribute->setVertexBaseType(Qt3DRender::QAttribute::Float);
positionAttribute->setVertexSize(3);
positionAttribute->setAttributeType(Qt3DRender::QAttribute::VertexAttribute);
positionAttribute->setBuffer(vertexBuffer);
positionAttribute->setByteOffset(0);
positionAttribute->setByteStride(byteStride);
positionAttribute->setCount(positionCount);
// Geometry // Geometry
Qt3DRender::QGeometry* geometry = new Qt3DRender::QGeometry(); Qt3DRender::QGeometry* geometry = new Qt3DRender::QGeometry();
@@ -541,40 +517,13 @@ Qt3DCore::QNode* PDF3DSceneProcessor::createLineSetGeometry(const pdf::u3d::PDF3
{ {
// We will display vertices with line color // We will display vertices with line color
constexpr uint elementSize = 3 + 3;
constexpr uint byteStride = elementSize * sizeof(float);
// Vertex buffer // Vertex buffer
Qt3DRender::QBuffer* vertexBuffer = new Qt3DRender::QBuffer(); Qt3DRender::QAttribute* positionAttribute = createPositionAttribute(lineSetGeometry->getPositions());
vertexBuffer->setType(Qt3DRender::QBuffer::VertexBuffer);
uint positionCount = static_cast<uint>(lineSetGeometry->getPositionCount());
QByteArray vertexBufferData;
vertexBufferData.resize(positionCount * 3 * sizeof(float));
float* vertexBufferDataPtr = reinterpret_cast<float*>(vertexBufferData.data());
for (size_t i = 0; i < positionCount; ++i)
{
QVector3D position = lineSetGeometry->getPosition(i);
*vertexBufferDataPtr++ = position.x();
*vertexBufferDataPtr++ = position.y();
*vertexBufferDataPtr++ = position.z();
}
vertexBuffer->setData(vertexBufferData);
Qt3DRender::QAttribute* positionAttribute = new Qt3DRender::QAttribute();
positionAttribute->setName(Qt3DRender::QAttribute::defaultPositionAttributeName());
positionAttribute->setVertexBaseType(Qt3DRender::QAttribute::Float);
positionAttribute->setVertexSize(3);
positionAttribute->setAttributeType(Qt3DRender::QAttribute::VertexAttribute);
positionAttribute->setBuffer(vertexBuffer);
positionAttribute->setByteOffset(0);
positionAttribute->setByteStride(byteStride);
positionAttribute->setCount(positionCount);
// Color buffer // Color buffer
Qt3DRender::QBuffer* colorBuffer = new Qt3DRender::QBuffer(); Qt3DRender::QBuffer* colorBuffer = new Qt3DRender::QBuffer();
colorBuffer->setType(Qt3DRender::QBuffer::VertexBuffer); colorBuffer->setType(Qt3DRender::QBuffer::VertexBuffer);
const uint positionCount = positionAttribute->count();
QByteArray colorBufferData; QByteArray colorBufferData;
colorBufferData.resize(positionCount * 3 * sizeof(float)); colorBufferData.resize(positionCount * 3 * sizeof(float));
@@ -612,8 +561,8 @@ Qt3DCore::QNode* PDF3DSceneProcessor::createLineSetGeometry(const pdf::u3d::PDF3
colorAttribute->setVertexSize(3); colorAttribute->setVertexSize(3);
colorAttribute->setAttributeType(Qt3DRender::QAttribute::VertexAttribute); colorAttribute->setAttributeType(Qt3DRender::QAttribute::VertexAttribute);
colorAttribute->setBuffer(colorBuffer); colorAttribute->setBuffer(colorBuffer);
colorAttribute->setByteOffset(3 * sizeof(float)); colorAttribute->setByteOffset(0);
colorAttribute->setByteStride(byteStride); colorAttribute->setByteStride(3 * sizeof(float));
colorAttribute->setCount(positionCount); colorAttribute->setCount(positionCount);
// Geometry // Geometry
@@ -703,9 +652,6 @@ Qt3DCore::QNode* PDF3DSceneProcessor::createBoundingBoxWireGeometry(const PDF3DB
} }
vertexBuffer->setData(vertexBufferData); vertexBuffer->setData(vertexBufferData);
constexpr uint elementSize = 3;
constexpr uint byteStride = elementSize * sizeof(float);
Qt3DRender::QAttribute* positionAttribute = new Qt3DRender::QAttribute(); Qt3DRender::QAttribute* positionAttribute = new Qt3DRender::QAttribute();
positionAttribute->setName(Qt3DRender::QAttribute::defaultPositionAttributeName()); positionAttribute->setName(Qt3DRender::QAttribute::defaultPositionAttributeName());
positionAttribute->setVertexBaseType(Qt3DRender::QAttribute::Float); positionAttribute->setVertexBaseType(Qt3DRender::QAttribute::Float);
@@ -713,7 +659,7 @@ Qt3DCore::QNode* PDF3DSceneProcessor::createBoundingBoxWireGeometry(const PDF3DB
positionAttribute->setAttributeType(Qt3DRender::QAttribute::VertexAttribute); positionAttribute->setAttributeType(Qt3DRender::QAttribute::VertexAttribute);
positionAttribute->setBuffer(vertexBuffer); positionAttribute->setBuffer(vertexBuffer);
positionAttribute->setByteOffset(0); positionAttribute->setByteOffset(0);
positionAttribute->setByteStride(byteStride); positionAttribute->setByteStride(3 * sizeof(float));
positionAttribute->setCount(positionCount); positionAttribute->setCount(positionCount);
// Index buffer // Index buffer
@@ -807,9 +753,6 @@ Qt3DCore::QNode* PDF3DSceneProcessor::createBoundingBoxTransparentGeometry(const
} }
vertexBuffer->setData(vertexBufferData); vertexBuffer->setData(vertexBufferData);
constexpr uint elementSize = 3;
constexpr uint byteStride = elementSize * sizeof(float);
Qt3DRender::QAttribute* positionAttribute = new Qt3DRender::QAttribute(); Qt3DRender::QAttribute* positionAttribute = new Qt3DRender::QAttribute();
positionAttribute->setName(Qt3DRender::QAttribute::defaultPositionAttributeName()); positionAttribute->setName(Qt3DRender::QAttribute::defaultPositionAttributeName());
positionAttribute->setVertexBaseType(Qt3DRender::QAttribute::Float); positionAttribute->setVertexBaseType(Qt3DRender::QAttribute::Float);
@@ -817,7 +760,7 @@ Qt3DCore::QNode* PDF3DSceneProcessor::createBoundingBoxTransparentGeometry(const
positionAttribute->setAttributeType(Qt3DRender::QAttribute::VertexAttribute); positionAttribute->setAttributeType(Qt3DRender::QAttribute::VertexAttribute);
positionAttribute->setBuffer(vertexBuffer); positionAttribute->setBuffer(vertexBuffer);
positionAttribute->setByteOffset(0); positionAttribute->setByteOffset(0);
positionAttribute->setByteStride(byteStride); positionAttribute->setByteStride(3 * sizeof(float));
positionAttribute->setCount(positionCount); positionAttribute->setCount(positionCount);
// Index buffer // Index buffer
@@ -877,6 +820,51 @@ Qt3DCore::QNode* PDF3DSceneProcessor::createBoundingBoxTransparentGeometry(const
return entity; return entity;
} }
Qt3DRender::QAttribute* PDF3DSceneProcessor::createGenericAttribute(const std::vector<QVector3D>& values) const
{
Qt3DRender::QBuffer* vertexBuffer = new Qt3DRender::QBuffer();
vertexBuffer->setType(Qt3DRender::QBuffer::VertexBuffer);
uint positionCount = static_cast<uint>(values.size());
QByteArray vertexBufferData;
vertexBufferData.resize(positionCount * 3 * sizeof(float));
float* vertexBufferDataPtr = reinterpret_cast<float*>(vertexBufferData.data());
for (size_t i = 0; i < positionCount; ++i)
{
QVector3D position = values[i];
*vertexBufferDataPtr++ = position.x();
*vertexBufferDataPtr++ = position.y();
*vertexBufferDataPtr++ = position.z();
}
vertexBuffer->setData(vertexBufferData);
Qt3DRender::QAttribute* positionAttribute = new Qt3DRender::QAttribute();
positionAttribute->setVertexBaseType(Qt3DRender::QAttribute::Float);
positionAttribute->setVertexSize(3);
positionAttribute->setAttributeType(Qt3DRender::QAttribute::VertexAttribute);
positionAttribute->setBuffer(vertexBuffer);
positionAttribute->setByteOffset(0);
positionAttribute->setByteStride(3 * sizeof(float));
positionAttribute->setCount(positionCount);
return positionAttribute;
}
Qt3DRender::QAttribute* PDF3DSceneProcessor::createPositionAttribute(const std::vector<QVector3D>& positions) const
{
Qt3DRender::QAttribute* attribute = createGenericAttribute(positions);
attribute->setName(Qt3DRender::QAttribute::defaultPositionAttributeName());
return attribute;
}
Qt3DRender::QAttribute* PDF3DSceneProcessor::createColorAttribute(const std::vector<QVector3D>& colors) const
{
Qt3DRender::QAttribute* attribute = createGenericAttribute(colors);
attribute->setName(Qt3DRender::QAttribute::defaultColorAttributeName());
return attribute;
}
pdf::PDFReal PDF3DSceneProcessor::getPointSize() const pdf::PDFReal PDF3DSceneProcessor::getPointSize() const
{ {
return m_pointSize; return m_pointSize;

9
Pdf4QtViewer/pdf3dsceneprocessor.h
View File

@@ -33,6 +33,11 @@ class QNode;
class QEntity; class QEntity;
} }
namespace Qt3DRender
{
class QAttribute;
}
namespace pdf namespace pdf
{ {
namespace u3d namespace u3d
@@ -129,6 +134,10 @@ private:
Qt3DCore::QNode* createBoundingBoxWireGeometry(const PDF3DBoundingBox& boundingBox); Qt3DCore::QNode* createBoundingBoxWireGeometry(const PDF3DBoundingBox& boundingBox);
Qt3DCore::QNode* createBoundingBoxTransparentGeometry(const PDF3DBoundingBox& boundingBox); Qt3DCore::QNode* createBoundingBoxTransparentGeometry(const PDF3DBoundingBox& boundingBox);
Qt3DRender::QAttribute* createGenericAttribute(const std::vector<QVector3D>& values) const;
Qt3DRender::QAttribute* createPositionAttribute(const std::vector<QVector3D>& positions) const;
Qt3DRender::QAttribute* createColorAttribute(const std::vector<QVector3D>& colors) const;
SceneMode m_mode = Solid; SceneMode m_mode = Solid;
QColor m_auxiliaryColor = Qt::black; QColor m_auxiliaryColor = Qt::black;
QColor m_faceColor = Qt::black; QColor m_faceColor = Qt::black;

2
Pdf4QtViewer/pdfmediaviewerdialog.cpp
View File

@@ -197,7 +197,7 @@ void PDFMediaViewerDialog::regenerateScene()
if (m_sceneU3d.has_value()) if (m_sceneU3d.has_value())
{ {
PDF3DSceneProcessor processor; PDF3DSceneProcessor processor;
processor.setMode(PDF3DSceneProcessor::ShadedVertices); processor.setMode(PDF3DSceneProcessor::Wireframe);
processor.setSceneRoot("PDF3D Scene"); processor.setSceneRoot("PDF3D Scene");
processor.setPointSize(6.0f); processor.setPointSize(6.0f);
auto scene = processor.createScene(&m_sceneU3d.value()); auto scene = processor.createScene(&m_sceneU3d.value());