Edge highlighting for extruded polygons

qgis · Apr 9, 2019 · 50dd4b1 · 50dd4b1
1 parent 78da017
commit 50dd4b1
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 4 deletions.
diff --git a/src/3d/symbols/qgslinevertexdata_p.cpp b/src/3d/symbols/qgslinevertexdata_p.cpp
@@ -96,7 +96,7 @@ Qt3DRender::QGeometry *QgsLineVertexData::createGeometry( Qt3DCore::QNode *paren
   return geom;
 }
 
-void QgsLineVertexData::addLineString( const QgsLineString &lineString )
+void QgsLineVertexData::addLineString( const QgsLineString &lineString, float extraHeightOffset )
 {
   if ( withAdjacency )
     indexes << vertices.count();  // add the following vertex (for adjacency)
@@ -108,7 +108,7 @@ void QgsLineVertexData::addLineString( const QgsLineString &lineString )
   for ( int i = 0; i < lineString.vertexCount(); ++i )
   {
     QgsPoint p = lineString.pointN( i );
-    float z = Qgs3DUtils::clampAltitude( p, altClamping, altBinding, baseHeight, centroid, *mapSettings );
+    float z = Qgs3DUtils::clampAltitude( p, altClamping, altBinding, baseHeight + extraHeightOffset, centroid, *mapSettings );
 
     vertices << QVector3D( p.x() - mapSettings->origin().x(), z, -( p.y() - mapSettings->origin().y() ) );
     indexes << vertices.count() - 1;
@@ -120,4 +120,33 @@ void QgsLineVertexData::addLineString( const QgsLineString &lineString )
   indexes << 0;  // add primitive restart
 }
 
+
+void QgsLineVertexData::addVerticalLines( const QgsLineString &lineString, float verticalLength )
+{
+  QgsPoint centroid;
+  if ( altBinding == Qgs3DTypes::AltBindCentroid )
+    centroid = lineString.centroid();
+
+  for ( int i = 0; i < lineString.vertexCount(); ++i )
+  {
+    QgsPoint p = lineString.pointN( i );
+    float z = Qgs3DUtils::clampAltitude( p, altClamping, altBinding, baseHeight, centroid, *mapSettings );
+    float z2 = z + verticalLength;
+
+    if ( withAdjacency )
+      indexes << vertices.count();  // add the following vertex (for adjacency)
+
+    vertices << QVector3D( p.x() - mapSettings->origin().x(), z, -( p.y() - mapSettings->origin().y() ) );
+    indexes << vertices.count() - 1;
+    vertices << QVector3D( p.x() - mapSettings->origin().x(), z2, -( p.y() - mapSettings->origin().y() ) );
+    indexes << vertices.count() - 1;
+
+    if ( withAdjacency )
+      indexes << vertices.count() - 1;  // add the last vertex (for adjacency)
+
+    indexes << 0;  // add primitive restart
+  }
+}
+
+
 /// @endcond
diff --git a/src/3d/symbols/qgslinevertexdata_p.h b/src/3d/symbols/qgslinevertexdata_p.h
@@ -78,7 +78,8 @@ struct QgsLineVertexData
   QByteArray createIndexBuffer();
   Qt3DRender::QGeometry *createGeometry( Qt3DCore::QNode *parent );
 
-  void addLineString( const QgsLineString &lineString );
+  void addLineString( const QgsLineString &lineString, float extraHeightOffset = 0 );
+  void addVerticalLines( const QgsLineString &lineString, float verticalLength );
 };
 
 /// @endcond

diff --git a/src/3d/symbols/qgspolygon3dsymbol_p.cpp b/src/3d/symbols/qgspolygon3dsymbol_p.cpp
@@ -93,7 +93,19 @@ void QgsPolygon3DSymbolHandler::processPolygon( QgsPolygon *polyClone, QgsFeatur
     for ( int i = 0; i < polyClone->numInteriorRings(); ++i )
       outEdges.addLineString( *static_cast<const QgsLineString *>( polyClone->interiorRing( i ) ) );
 
-    // TODO: if has extrusion: also add vertical edges for each vertex
+    if ( extrusionHeight )
+    {
+      // add roof and wall edges
+      const QgsLineString *exterior = static_cast<const QgsLineString *>( polyClone->exteriorRing() );
+      outEdges.addLineString( *exterior, extrusionHeight );
+      outEdges.addVerticalLines( *exterior, extrusionHeight );
+      for ( int i = 0; i < polyClone->numInteriorRings(); ++i )
+      {
+        const QgsLineString *interior = static_cast<const QgsLineString *>( polyClone->interiorRing( i ) );
+        outEdges.addLineString( *interior, extrusionHeight );
+        outEdges.addVerticalLines( *interior, extrusionHeight );
+      }
+    }
   }
 
   Qgs3DUtils::clampAltitudes( polyClone, mSymbol.altitudeClamping(), mSymbol.altitudeBinding(), height, context.map() );