fix rendering when no preview painter is allowed

qgis · Feb 5, 2024 · 8dc3558 · 8dc3558
1 parent 4ecc52a
commit 8dc3558
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 1 deletion.
diff --git a/src/core/pointcloud/qgspointcloudattributebyramprenderer.cpp b/src/core/pointcloud/qgspointcloudattributebyramprenderer.cpp
@@ -130,8 +130,14 @@ void QgsPointCloudAttributeByRampRenderer::renderBlock( const QgsPointCloudBlock
       mColorRampShader.shade( attributeValue, &red, &green, &blue, &alpha );
 
       if ( renderAsTriangles() )
+      {
         addPointToTriangulation( x, y, z, QColor( red, green, blue, alpha ), context );
 
+        // We don't want to render any points if we're rendering triangles and there is no preview painter
+        if ( !context.renderContext().previewRenderPainter() )
+          continue;
+      }
+
       drawPoint( x, y, QColor( red, green, blue, alpha ), context );
       if ( renderElevation )
         drawPointToElevationMap( x, y, z, context );

diff --git a/src/core/pointcloud/qgspointcloudclassifiedrenderer.cpp b/src/core/pointcloud/qgspointcloudclassifiedrenderer.cpp
@@ -149,8 +149,14 @@ void QgsPointCloudClassifiedRenderer::renderBlock( const QgsPointCloudBlock *blo
       }
 
       if ( renderAsTriangles() )
+      {
         addPointToTriangulation( x, y, z, color, context );
 
+        // We don't want to render any points if we're rendering triangles and there is no preview painter
+        if ( !context.renderContext().previewRenderPainter() )
+          continue;
+      }
+
       const double size = pointSizes.value( attributeValue );
       drawPoint( x, y, color, size, context );
       if ( renderElevation )

diff --git a/src/core/pointcloud/qgspointcloudlayerrenderer.cpp b/src/core/pointcloud/qgspointcloudlayerrenderer.cpp
@@ -740,7 +740,10 @@ Qgis::MapLayerRendererFlags QgsPointCloudLayerRenderer::flags() const
   // when rendering as triangles we still want to show temporary incremental renders as points until
   // the final triangulated surface is ready, which may be slow
   // So we request here a preview render image for the temporary incremental updates:
-  return Qgis::MapLayerRendererFlag::RenderPartialOutputs | Qgis::MapLayerRendererFlag::RenderPartialOutputOverPreviousCachedImage;
+  if ( mRenderer->renderAsTriangles() )
+    return Qgis::MapLayerRendererFlag::RenderPartialOutputs | Qgis::MapLayerRendererFlag::RenderPartialOutputOverPreviousCachedImage;
+
+  return Qgis::MapLayerRendererFlags();
 }
 
 bool QgsPointCloudLayerRenderer::forceRasterRender() const

diff --git a/src/core/pointcloud/qgspointcloudrgbrenderer.cpp b/src/core/pointcloud/qgspointcloudrgbrenderer.cpp
@@ -165,8 +165,14 @@ void QgsPointCloudRgbRenderer::renderBlock( const QgsPointCloudBlock *block, Qgs
       blue = std::max( 0, std::min( 255, blue ) );
 
       if ( renderAsTriangles() )
+      {
         addPointToTriangulation( x, y, z, QColor( red, green, blue ), context );
 
+        // We don't want to render any points if we're rendering triangles and there is no preview painter
+        if ( !context.renderContext().previewRenderPainter() )
+          continue;
+      }
+
       drawPoint( x, y, QColor( red, green, blue ), context );
       if ( renderElevation )
         drawPointToElevationMap( x, y, z, context );