fix loading of classes

qgis · Oct 26, 2020 · 9563158 · 9563158
1 parent a3da3b3
commit 9563158
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/3d/qgspointcloudlayerchunkloader_p.cpp b/src/3d/qgspointcloudlayerchunkloader_p.cpp
@@ -73,7 +73,7 @@ void QgsPointCloud3DGeometry::makeVertexBuffer( const QgsPointCloud3DSymbolHandl
   vertexBufferData.resize( data.positions.size() * 4 * sizeof( float ) );
   float *rawVertexArray = reinterpret_cast<float *>( vertexBufferData.data() );
   int idx = 0;
-  int i = 0;
+  Q_ASSERT( data.positions.count() == data.classes.count() );
   for ( int i = 0; i < data.positions.size(); ++i )
   {
     rawVertexArray[idx++] = data.positions.at( i ).x();

diff --git a/src/3d/shaders/pointcloud.frag b/src/3d/shaders/pointcloud.frag
@@ -17,7 +17,7 @@ void main(void)
   else if ( abs( clsid - 12 ) < 0.1 )   // overlaps
   {
       color = vec4(1,0,0,1);
-      //discard;
+      discard;  // skip overlaps
   }
   else
   {

diff --git a/src/core/pointcloud/qgspointclouddecoder.cpp b/src/core/pointcloud/qgspointclouddecoder.cpp
@@ -68,7 +68,7 @@ QVector<char> QgsPointCloudDecoder::decompressBinaryClasses( const QString &file
     // qint32 z = *(double*)(ptData+16);
     char cls = bytes[30];
     // vertices.push_back( Point3D( x, y, z ) );
-    classes.push_back( cls );
+    classes[i] = cls;
     //++count;
   }
   return classes;