typo and fix active face

qgis · Apr 1, 2021 · b90bbc9803f97abab51fd4fe4e9e315fd56d4183 · b90bbc9
1 parent 1cf2d11
commit b90bbc9803f97abab51fd4fe4e9e315fd56d4183
Unified Split

Showing with 4 additions and 15 deletions.

+0 −9 src/3d/mesh/qgsmesh3dgeometry_p.cpp

+3 −5 src/3d/mesh/qgsmesh3dgeometry_p.h

+1 −1 src/core/mesh/qgsmeshlayerutils.cpp
diff --git a/src/3d/mesh/qgsmesh3dgeometry_p.cpp b/src/3d/mesh/qgsmesh3dgeometry_p.cpp
@@ -218,15 +218,6 @@ QgsMeshDataset3dGeometry::QgsMeshDataset3dGeometry(
   prepareData();
 }
 
-QgsMeshDataset3dGeometry::~QgsMeshDataset3dGeometry()
-{
-//  if ( mBuilder && mBuilder->isBuilding() )
-//  {
-//    mBuilder->cancel();
-//    mBuilder->waitForFinished();
-//  }
-}
-
 void QgsMeshDataset3dGeometry::getData()
 {
   const QByteArray indexData = mBuilder->indexData();

diff --git a/src/3d/mesh/qgsmesh3dgeometry_p.h b/src/3d/mesh/qgsmesh3dgeometry_p.h
@@ -93,7 +93,7 @@ class QgsMesh3DGeometryBuilder: public QObject
 
 
 /**
-* Abstract class for creating attributes and vertex/index buffers for a mesh layer
+* Base class for creating attributes and vertex/index buffers for a mesh layer
 */
 class QgsMesh3dGeometry: public  Qt3DRender::QGeometry
 {
@@ -134,7 +134,7 @@ class QgsMeshDataset3DGeometryBuilder;
  *  Base class for creating attributes and vertex/index buffers for mesh dataset
  *
  *  On creation, the instance prepare all needed data from the mesh layer but 3D geometry is not defined.
- *  Then the instance launches immediatly another thread that constructs 3D vertices, faces  and scalar value on vertices
+ *  Then the instance launches immediately another thread that constructs 3D vertices, faces  and scalar value on vertices
  *  depending on the dataset chosen for vertical magnitude and the one for scalar magnitude (color rendering).
  *
  *  When this job is finished, the mesh datset 3D geometry node is updated and can be rendered in the 3D scene.
@@ -151,8 +151,6 @@ class QgsMeshDataset3dGeometry: public  QgsMesh3dGeometry
                                        const QgsMesh3DSymbol *symbol,
                                        QNode *parent );
 
-    ~QgsMeshDataset3dGeometry();
-
     //! Data sended to the other thread to consctruct the 3D geometry
     struct VertexData
     {
@@ -204,7 +202,7 @@ class QgsMeshDataset3DGeometryBuilder: public QgsMesh3DGeometryBuilder
 /**
  *  Base class for creating attributes and vertex/index buffers for a mesh dataset
  *
- *  On creation, the instance launches immediatly another thread that constructs 3D vertices, faces of the mesh based on the mesh vertices z value.
+ *  On creation, the instance launches immediately another thread that constructs 3D vertices, faces of the mesh based on the mesh vertices z value.
  *  When this job is finished, the mesh terrain 3D geometry node is updated and can be rendered in the 3D scene.
  */
 class QgsMeshTerrain3dGeometry: public  QgsMesh3dGeometry

diff --git a/src/core/mesh/qgsmeshlayerutils.cpp b/src/core/mesh/qgsmeshlayerutils.cpp
@@ -369,7 +369,7 @@ QVector<double> QgsMeshLayerUtils::interpolateFromFacesData( const QVector<doubl
     activeFace = *active;
   else
   {
-    activeFace = QgsMeshDataBlock();
+    activeFace = QgsMeshDataBlock( QgsMeshDataBlock::ActiveFlagInteger, nativeMesh.faceCount() );
     activeFace.setValid( true );
   }