fix triangles flickering for 3D mesh rendering

vcloarec · nyalldawson · commit f00b056023e7 · 2020-01-20T15:45:51.000+10:00
diff --git a/src/3d/mesh/qgsmesh3dentity_p.cpp b/src/3d/mesh/qgsmesh3dentity_p.cpp
@@ -53,14 +53,15 @@ void QgsMesh3dEntity::buildGeometry()
   }
 
   mesh->setGeometry( new QgsMesh3dGeometry( mTriangularMesh,
+                     mMapSettings.origin(),
                      mExtent,
                      mSymbol.verticaleScale(),
                      mesh ) );
 
   addComponent( mesh );
 
   Qt3DCore::QTransform *tform = new Qt3DCore::QTransform;
-  tform->setTranslation( QVector3D( float( -mMapSettings.origin().x() ), 0, float( mMapSettings.origin().y() ) ) );
+  tform->setTranslation( QVector3D( 0, 0, 0 ) ) ;
   addComponent( tform );
 }
 
@@ -93,11 +94,11 @@ void QgsMesh3dTerrainTileEntity::buildGeometry()
 {
   Qt3DRender::QGeometryRenderer *mesh = new Qt3DRender::QGeometryRenderer;
 
-  mesh->setGeometry( new QgsMesh3dGeometry( mTriangularMesh, mExtent, mSymbol.verticaleScale(), mesh ) );
+  mesh->setGeometry( new QgsMesh3dGeometry( mTriangularMesh, mMapSettings.origin(), mExtent, mSymbol.verticaleScale(), mesh ) );
   addComponent( mesh );
 
   Qt3DCore::QTransform *tform = new Qt3DCore::QTransform;
-  tform->setTranslation( QVector3D( float( -mMapSettings.origin().x() ), 0, float( mMapSettings.origin().y() ) ) );
+  tform->setTranslation( QVector3D( 0, 0, 0 ) );
   addComponent( tform );
 }
 
diff --git a/src/3d/mesh/qgsmesh3dgeometry_p.cpp b/src/3d/mesh/qgsmesh3dgeometry_p.cpp
@@ -26,7 +26,10 @@
 
 using namespace Qt3DRender;
 
-static QByteArray createPlaneVertexData( const QgsTriangularMesh &mesh, const QgsRectangle &extent, float vertScale )
+static QByteArray createPlaneVertexData( const QgsTriangularMesh &mesh,
+    const QgsVector3D &origin,
+    const QgsRectangle &extent,
+    float vertScale )
 {
   const int nVerts = mesh.vertices().count();
 
@@ -49,9 +52,9 @@ static QByteArray createPlaneVertexData( const QgsTriangularMesh &mesh, const Qg
   for ( int i = 0; i < nVerts; i++ )
   {
     const QgsMeshVertex &vert = mesh.vertices().at( i );
-    *fptr++ = float( vert.x() );
-    *fptr++ = float( vert.z() ) * vertScale ;
-    *fptr++ = float( -vert.y() );
+    *fptr++ = float( vert.x() - origin.x() );
+    *fptr++ = float( vert.z() - origin.z() ) * vertScale ;
+    *fptr++ = float( -vert.y() + origin.y() );
 
     *fptr++ = float( ( vert.x() - x0 ) / w );
     *fptr++ = float( ( y0 - vert.y() ) / h );
@@ -144,16 +147,20 @@ static QByteArray createPlaneIndexData( const QgsTriangularMesh &mesh )
 class MeshPlaneVertexBufferFunctor : public QBufferDataGenerator
 {
   public:
-    explicit MeshPlaneVertexBufferFunctor( const QgsTriangularMesh &mesh,  const QgsRectangle &extent, float vertScale )
+    explicit MeshPlaneVertexBufferFunctor( const QgsTriangularMesh &mesh,
+                                           const QgsVector3D &origin,
+                                           const QgsRectangle &extent,
+                                           float vertScale )
       : mMesh( mesh ),
+        mOrigin( origin ),
         mExtent( extent ),
         mVertScale( vertScale )
 
     {}
 
     QByteArray operator()() final
     {
-      return createPlaneVertexData( mMesh, mExtent, mVertScale );
+      return createPlaneVertexData( mMesh, mOrigin, mExtent, mVertScale );
     }
 
     bool operator ==( const QBufferDataGenerator &other ) const final
@@ -171,6 +178,7 @@ class MeshPlaneVertexBufferFunctor : public QBufferDataGenerator
   private:
 
     QgsTriangularMesh mMesh;
+    QgsVector3D mOrigin;
     QgsRectangle mExtent;
     float mVertScale;
 
@@ -253,11 +261,13 @@ class MeshPlaneVertexDatasetBufferFunctor : public QBufferDataGenerator
 
 QgsMesh3dGeometry::QgsMesh3dGeometry(
   const QgsTriangularMesh &mesh,
+  const QgsVector3D &origin,
   const QgsRectangle &extent,
   float verticaleScale,
   QgsMesh3dGeometry::QNode *parent ):
   QGeometry( parent ),
   mTriangularMesh( mesh ),
+  mOrigin( origin ),
   mExtent( extent ),
   mVertScale( verticaleScale )
 {
@@ -313,7 +323,7 @@ void QgsMesh3dGeometry::init()
   // Each primitive has 3 vertives
   mIndexAttribute->setCount( uint( mTriangularMesh.triangles().count() ) * 3 );
 
-  mVertexBuffer->setData( MeshPlaneVertexBufferFunctor( mTriangularMesh, mExtent, mVertScale )() );
+  mVertexBuffer->setData( MeshPlaneVertexBufferFunctor( mTriangularMesh, mOrigin, mExtent, mVertScale )() );
   mIndexBuffer->setData( MeshPlaneIndexBufferFunctor( mTriangularMesh )() );
 
   addAttribute( mPositionAttribute );
diff --git a/src/3d/mesh/qgsmesh3dgeometry_p.h b/src/3d/mesh/qgsmesh3dgeometry_p.h
@@ -22,6 +22,8 @@
 #include <Qt3DRender/qgeometry.h>
 #include <QVector3D>
 
+#include <qgsvector3d.h>
+
 #include "qgstriangularmesh.h"
 
 ///@cond PRIVATE
@@ -51,12 +53,13 @@ class QgsMesh3dGeometry: public  Qt3DRender::QGeometry
   public:
 
     //! Constructs a mesh layer geometry from triangular mesh.
-    explicit QgsMesh3dGeometry( const QgsTriangularMesh &mesh, const QgsRectangle &extent, float verticaleScale, QNode *parent );
+    explicit QgsMesh3dGeometry( const QgsTriangularMesh &mesh, const QgsVector3D &origin, const QgsRectangle &extent, float verticaleScale, QNode *parent );
 
   private:
     void init();
 
     QgsTriangularMesh mTriangularMesh;
+    QgsVector3D mOrigin;
     QgsRectangle mExtent;
     float mVertScale;
 
@@ -66,10 +69,8 @@ class QgsMesh3dGeometry: public  Qt3DRender::QGeometry
     Qt3DRender::QAttribute *mIndexAttribute = nullptr;
     Qt3DRender::QBuffer *mVertexBuffer = nullptr;
     Qt3DRender::QBuffer *mIndexBuffer = nullptr;
-
 };
 
-
 ///@endcond
 
 #endif // QGSMESHGEOMETRY_P_H

Original file line number	Diff line number	Diff line change
`@@ -53,14 +53,15 @@ void QgsMesh3dEntity::buildGeometry()`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`mesh->setGeometry( new QgsMesh3dGeometry( mTriangularMesh,`
	`56`	`+ mMapSettings.origin(),`
`56`	`57`	`mExtent,`
`57`	`58`	`mSymbol.verticaleScale(),`
`58`	`59`	`mesh ) );`
`59`	`60`
`60`	`61`	`addComponent( mesh );`
`61`	`62`
`62`	`63`	`Qt3DCore::QTransform *tform = new Qt3DCore::QTransform;`
`63`		`- tform->setTranslation( QVector3D( float( -mMapSettings.origin().x() ), 0, float( mMapSettings.origin().y() ) ) );`
	`64`	`+ tform->setTranslation( QVector3D( 0, 0, 0 ) ) ;`
`64`	`65`	`addComponent( tform );`
`65`	`66`	`}`
`66`	`67`
`@@ -93,11 +94,11 @@ void QgsMesh3dTerrainTileEntity::buildGeometry()`
`93`	`94`	`{`
`94`	`95`	`Qt3DRender::QGeometryRenderer *mesh = new Qt3DRender::QGeometryRenderer;`
`95`	`96`
`96`		`- mesh->setGeometry( new QgsMesh3dGeometry( mTriangularMesh, mExtent, mSymbol.verticaleScale(), mesh ) );`
	`97`	`+ mesh->setGeometry( new QgsMesh3dGeometry( mTriangularMesh, mMapSettings.origin(), mExtent, mSymbol.verticaleScale(), mesh ) );`
`97`	`98`	`addComponent( mesh );`
`98`	`99`
`99`	`100`	`Qt3DCore::QTransform *tform = new Qt3DCore::QTransform;`
`100`		`- tform->setTranslation( QVector3D( float( -mMapSettings.origin().x() ), 0, float( mMapSettings.origin().y() ) ) );`
	`101`	`+ tform->setTranslation( QVector3D( 0, 0, 0 ) );`
`101`	`102`	`addComponent( tform );`
`102`	`103`	`}`
`103`	`104`