Fixed flat terrain scale bug

qgis · Jul 5, 2020 · b3a2a3c · b3a2a3c
1 parent 94a25d2
commit b3a2a3c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/3d/qgs3dexportobject.h b/src/3d/qgs3dexportobject.h
@@ -53,6 +53,7 @@ class Qgs3DExportObject : public QObject
     void setupPositionCoordinates( const QVector<float> &positionsBuffer, float scale = 1.0f, const QVector3D translation = QVector3D( 0, 0, 0 ) );
     //! Sets positions coordinates from just one positions buffer and indexes buffer and does the translation and scaling
     void setupPositionCoordinates( const QVector<float> &positionsBuffer, const QVector<unsigned int> &facesIndexes, float scale = 1.0f, const QVector3D translation = QVector3D( 0, 0, 0 ) );
+
     /**
      * Updates the box bounds explained with the current object bounds
      * This expands the bounding box if the current object outside the bounds of the already established bounds

diff --git a/src/3d/qgs3dsceneexporter.cpp b/src/3d/qgs3dsceneexporter.cpp
@@ -398,7 +398,6 @@ void Qgs3DSceneExporter::parseFlatTile( QgsTerrainTileEntity *tileEntity )
   }
 
   float scale = transform->scale();
-  QVector3D translation = transform->translation();
 
   QVector<float> positionBuffer = createPlaneVertexData( scale, scale, tileGeometry->resolution() );
   QVector<unsigned int> indexesBuffer = createPlaneIndexData( tileGeometry->resolution() );
@@ -407,7 +406,7 @@ void Qgs3DSceneExporter::parseFlatTile( QgsTerrainTileEntity *tileEntity )
   mObjects.push_back( object );
 
   object->setSmoothEdges( mSmoothEdges );
-  object->setupPositionCoordinates( positionBuffer, indexesBuffer, scale, translation );
+  object->setupPositionCoordinates( positionBuffer, indexesBuffer );
 }
 
 void Qgs3DSceneExporter::parseDemTile( QgsTerrainTileEntity *tileEntity )
@@ -433,7 +432,7 @@ void Qgs3DSceneExporter::parseDemTile( QgsTerrainTileEntity *tileEntity )
   DemTerrainTileGeometry *tileGeometry = qobject_cast<DemTerrainTileGeometry *>( geometry );
   if ( tileGeometry == nullptr )
   {
-    qDebug() << "WARNING : " << "Qt3DExtras::QPlaneGeometry* is expected at " << __FILE__ << ":" << __LINE__;
+    qDebug() << "WARNING : " << "DemTerrainTileGeometry* is expected at " << __FILE__ << ":" << __LINE__;
     return;
   }