[3d] Fix polygon edge lines are rendered vertically offset from polygons

(cherry picked from commit 7087d5d)
qgis · Aug 1, 2020 · 0f87e8f · 0f87e8f
1 parent 1671964
commit 0f87e8f
Show file tree

Hide file tree

Showing 4 changed files with 57 additions and 1 deletion.
diff --git a/src/3d/symbols/qgspolygon3dsymbol_p.cpp b/src/3d/symbols/qgspolygon3dsymbol_p.cpp
@@ -78,7 +78,7 @@ class QgsPolygon3DSymbolHandler : public QgsFeature3DHandler
 bool QgsPolygon3DSymbolHandler::prepare( const Qgs3DRenderContext &context, QSet<QString> &attributeNames )
 {
   outEdges.withAdjacency = true;
-  outEdges.init( mSymbol.altitudeClamping(), mSymbol.altitudeBinding(), mSymbol.height(), &context.map() );
+  outEdges.init( mSymbol.altitudeClamping(), mSymbol.altitudeBinding(), 0, &context.map() );
 
   outNormal.tessellator.reset( new QgsTessellator( context.map().origin().x(), context.map().origin().y(), true, mSymbol.invertNormals(), mSymbol.addBackFaces() ) );
   outSelected.tessellator.reset( new QgsTessellator( context.map().origin().x(), context.map().origin().y(), true, mSymbol.invertNormals(), mSymbol.addBackFaces() ) );

diff --git a/tests/src/3d/testqgs3drendering.cpp b/tests/src/3d/testqgs3drendering.cpp
@@ -47,6 +47,9 @@
 #include "qgssymbollayer.h"
 #include "qgsmarkersymbollayer.h"
 #include "qgsmaplayertemporalproperties.h"
+#include "qgssymbol.h"
+#include "qgssinglesymbolrenderer.h"
+#include "qgsfillsymbollayer.h"
 
 #include <QFileInfo>
 #include <QDir>
@@ -63,6 +66,7 @@ class TestQgs3DRendering : public QObject
     void testDemTerrain();
     void testMeshTerrain();
     void testExtrudedPolygons();
+    void testPolygonsEdges();
     void testLineRendering();
     void testMapTheme();
     void testMesh();
@@ -332,6 +336,58 @@ void TestQgs3DRendering::testExtrudedPolygons()
   QVERIFY( renderCheck( "polygon3d_extrusion", img, 40 ) );
 }
 
+void TestQgs3DRendering::testPolygonsEdges()
+{
+  QgsRectangle fullExtent = mLayerDtm->extent();
+
+  Qgs3DMapSettings *map = new Qgs3DMapSettings;
+  map->setCrs( mProject->crs() );
+  map->setOrigin( QgsVector3D( fullExtent.center().x(), fullExtent.center().y(), 0 ) );
+
+  QgsPhongMaterialSettings material;
+  material.setAmbient( Qt::lightGray );
+  QgsPolygon3DSymbol *symbol3d = new QgsPolygon3DSymbol;
+  symbol3d->setMaterial( material );
+  symbol3d->setExtrusionHeight( 10.f );
+  symbol3d->setHeight( 20.f );
+  symbol3d->setEdgesEnabled( true );
+  symbol3d->setEdgeWidth( 8 );
+  symbol3d->setEdgeColor( QColor( 255, 0, 0 ) );
+
+  std::unique_ptr< QgsVectorLayer > layer( mLayerBuildings->clone() );
+
+  std::unique_ptr< QgsSimpleFillSymbolLayer > simpleFill = qgis::make_unique< QgsSimpleFillSymbolLayer >( QColor( 0, 0, 0 ), Qt::SolidPattern, QColor( 0, 0, 0 ), Qt::NoPen );
+  std::unique_ptr< QgsFillSymbol > fillSymbol = qgis::make_unique< QgsFillSymbol >( QgsSymbolLayerList() << simpleFill.release() );
+  layer->setRenderer( new QgsSingleSymbolRenderer( fillSymbol.release() ) );
+
+  QgsVectorLayer3DRenderer *renderer3d = new QgsVectorLayer3DRenderer( symbol3d );
+  layer->setRenderer3D( renderer3d );
+
+  map->setLayers( QList<QgsMapLayer *>() << layer.get() );
+  QgsPointLightSettings defaultLight;
+  defaultLight.setPosition( QgsVector3D( 0, 1000, 0 ) );
+  map->setPointLights( QList<QgsPointLightSettings>() << defaultLight );
+
+  QgsFlatTerrainGenerator *flatTerrain = new QgsFlatTerrainGenerator;
+  flatTerrain->setCrs( map->crs() );
+  flatTerrain->setExtent( fullExtent );
+  map->setTerrainGenerator( flatTerrain );
+
+  QgsOffscreen3DEngine engine;
+  Qgs3DMapScene *scene = new Qgs3DMapScene( *map, &engine );
+  engine.setRootEntity( scene );
+
+  scene->cameraController()->setLookingAtPoint( QgsVector3D( 0, 0, 250 ), 100, 45, 0 );
+
+  // When running the test on Travis, it would initially return empty rendered image.
+  // Capturing the initial image and throwing it away fixes that. Hopefully we will
+  // find a better fix in the future.
+  Qgs3DUtils::captureSceneImage( engine, scene );
+  QImage img = Qgs3DUtils::captureSceneImage( engine, scene );
+
+  QVERIFY( renderCheck( "polygon_edges_height", img, 40 ) );
+}
+
 void TestQgs3DRendering::testLineRendering()
 {
   QgsRectangle fullExtent( 0, 0, 1000, 1000 );

diff --git a/...ages/3d/expected_polygon_edges_height/default/expected_polygon_edges_height.png b/...ages/3d/expected_polygon_edges_height/default/expected_polygon_edges_height.png
diff --git a/...mages/3d/expected_polygon_edges_height/travis/expected_polygon_edges_height.png b/...mages/3d/expected_polygon_edges_height/travis/expected_polygon_edges_height.png