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-12-15 19:39:12 +01:00
parent 10a5fa0759
commit 03eed1b476
2 changed files with 36 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Pdf4QtLib/sources/pdf3d_u3d.h
View File

@@ -537,6 +537,8 @@ private:
float m_reflectivity = 0.0; float m_reflectivity = 0.0;
}; };
// TODO: apply material to default color
class PDF4QTLIBSHARED_EXPORT PDF3D_U3D class PDF4QTLIBSHARED_EXPORT PDF3D_U3D
{ {
public: public:

38
Pdf4QtViewer/pdf3dsceneprocessor.cpp
View File

@@ -713,7 +713,19 @@ Qt3DCore::QNode* PDF3DSceneProcessor::createPointSetGeometry(const pdf::u3d::PDF
if (!points.empty()) if (!points.empty())
{ {
pdf::u3d::PDF3D_U3D_PointSetGeometry::Point point = points.front(); pdf::u3d::PDF3D_U3D_PointSetGeometry::Point point = points.front();
color = pointSetGeometry->getDiffuseColor(point.diffuseColor).toVector3D(); if (point.diffuseColor != 0)
{
color = pointSetGeometry->getDiffuseColor(point.diffuseColor).toVector3D();
}
else
{
QString shaderName = pointSetGeometry->getShaderName(point.shadingId);
const pdf::u3d::PDF3D_U3D_Shader* shader = m_sceneData->getShader(shaderName);
const pdf::u3d::PDF3D_U3D_Material* shaderMaterial = m_sceneData->getMaterial(shader->getMaterialName());
const QColor diffuseColor = shaderMaterial->getDiffuseColor();
const QVector3D defaultColor(diffuseColor.redF(), diffuseColor.greenF(), diffuseColor.blueF());
color = defaultColor;
}
} }
*colorBufferDataPtr++ = color.x(); *colorBufferDataPtr++ = color.x();
@@ -915,12 +927,31 @@ Qt3DCore::QNode* PDF3DSceneProcessor::createLineSetGeometry(const pdf::u3d::PDF3
positions.reserve(lines.size() * 2); positions.reserve(lines.size() * 2);
colors.reserve(lines.size() * 2); colors.reserve(lines.size() * 2);
QString shaderName = lineSetGeometry->getShaderName(shadingId);
const pdf::u3d::PDF3D_U3D_Shader* shader = m_sceneData->getShader(shaderName);
const pdf::u3d::PDF3D_U3D_Material* shaderMaterial = m_sceneData->getMaterial(shader->getMaterialName());
const QColor diffuseColor = shaderMaterial->getDiffuseColor();
const QVector3D defaultColor(diffuseColor.redF(), diffuseColor.greenF(), diffuseColor.blueF());
for (const Line& line : lines) for (const Line& line : lines)
{ {
QVector3D color1 = defaultColor;
QVector3D color2 = defaultColor;
if (line.diffuseColor1 != 0)
{
color1 = lineSetGeometry->getDiffuseColor(line.diffuseColor1).toVector3D();
}
if (line.diffuseColor2 != 0)
{
color2 = lineSetGeometry->getDiffuseColor(line.diffuseColor2).toVector3D();
}
positions.push_back(lineSetGeometry->getPosition(line.position1)); positions.push_back(lineSetGeometry->getPosition(line.position1));
positions.push_back(lineSetGeometry->getPosition(line.position2)); positions.push_back(lineSetGeometry->getPosition(line.position2));
colors.push_back(lineSetGeometry->getDiffuseColor(line.diffuseColor1).toVector3D()); colors.push_back(color1);
colors.push_back(lineSetGeometry->getDiffuseColor(line.diffuseColor2).toVector3D()); colors.push_back(color2);
} }
Qt3DRender::QAttribute* positionAttribute = createPositionAttribute(positions); Qt3DRender::QAttribute* positionAttribute = createPositionAttribute(positions);
@@ -936,7 +967,6 @@ Qt3DCore::QNode* PDF3DSceneProcessor::createLineSetGeometry(const pdf::u3d::PDF3
geometryRenderer->setPrimitiveRestartEnabled(false); geometryRenderer->setPrimitiveRestartEnabled(false);
geometryRenderer->setPrimitiveType(Qt3DRender::QGeometryRenderer::Lines); geometryRenderer->setPrimitiveType(Qt3DRender::QGeometryRenderer::Lines);
QString shaderName = lineSetGeometry->getShaderName(shadingId);
Qt3DRender::QMaterial* material = createMaterialFromShader(shaderName, true); Qt3DRender::QMaterial* material = createMaterialFromShader(shaderName, true);
Qt3DCore::QEntity* entity = new Qt3DCore::QEntity(); Qt3DCore::QEntity* entity = new Qt3DCore::QEntity();