Rename extrusionHeight to extrusion.

Author: MidnightCoder-m

src/core/3d/quick3dgeometry.cpp

@@ -161,17 +161,17 @@ void Quick3DGeometry::setAltitudeClamping( AltitudeClamping clamping )
   updateGeometry();
 }
 
-void Quick3DGeometry::setExtrusionHeight( float height )
+void Quick3DGeometry::setExtrusion( float extrusion )
 {
-  height = std::max( 0.0f, height );
-  if ( qFuzzyCompare( mExtrusionHeight, height ) )
+  extrusion = std::max( 0.0f, extrusion );
+  if ( qFuzzyCompare( mExtrusion, extrusion ) )
   {
     return;
   }
 
-  mExtrusionHeight = height;
+  mExtrusion = extrusion;
   mDirty = true;
-  emit extrusionHeightChanged();
+  emit extrusionChanged();
   updateGeometry();
 }
 
@@ -440,7 +440,7 @@ void Quick3DGeometry::updateGeometry()
       }
       totalFillVertices += ringSize;
       totalFillIndices += ( ringSize - 2 ) * 3;
-      if ( mExtrusionHeight > 0.0f )
+      if ( mExtrusion > 0.0f )
       {
         totalFillVertices += Quick3DGeometryUtils::polygonWallsVertexCount( ringSize );
         totalFillIndices += Quick3DGeometryUtils::polygonWallsIndexCount( ringSize );
@@ -484,12 +484,12 @@ void Quick3DGeometry::updateGeometry()
     {
       if ( path.size() >= 3 )
       {
-        if ( mExtrusionHeight > 0.0f )
+        if ( mExtrusion > 0.0f )
         {
-          Quick3DGeometryUtils::generatePolygonWalls( path, mExtrusionHeight, r, g, b, a, vptr, iptr, vertexOffset, minBound, maxBound );
+          Quick3DGeometryUtils::generatePolygonWalls( path, mExtrusion, r, g, b, a, vptr, iptr, vertexOffset, minBound, maxBound );
         }
-        const float capAlpha = mExtrusionHeight > 0.0f ? a : fillAlpha;
-        Quick3DGeometryUtils::generatePolygonFill( path, r, g, b, capAlpha, vptr, iptr, vertexOffset, minBound, maxBound, mExtrusionHeight );
+        const float capAlpha = mExtrusion > 0.0f ? a : fillAlpha;
+        Quick3DGeometryUtils::generatePolygonFill( path, r, g, b, capAlpha, vptr, iptr, vertexOffset, minBound, maxBound, mExtrusion );
       }
     }
   }

src/core/3d/quick3dgeometry.h

@@ -73,8 +73,8 @@ class Quick3DGeometry : public QQuick3DGeometry
     Q_PROPERTY( bool fillPolygons READ fillPolygons WRITE setFillPolygons NOTIFY fillPolygonsChanged )
     //! How the geometry's Z values are combined with the terrain elevation
     Q_PROPERTY( AltitudeClamping altitudeClamping READ altitudeClamping WRITE setAltitudeClamping NOTIFY altitudeClampingChanged )
-    //! Extrusion height in scene units; when > 0, polygons are rendered as volumetric solids with walls and a roof cap
-    Q_PROPERTY( float extrusionHeight READ extrusionHeight WRITE setExtrusionHeight NOTIFY extrusionHeightChanged )
+    //! Extrusion in scene units; when > 0, polygons are rendered as volumetric solids with walls and a roof cap
+    Q_PROPERTY( float extrusion READ extrusion WRITE setExtrusion NOTIFY extrusionChanged )
 
   public:
     explicit Quick3DGeometry( QQuick3DObject *parent = nullptr );
@@ -103,8 +103,8 @@ class Quick3DGeometry : public QQuick3DGeometry
     AltitudeClamping altitudeClamping() const { return mAltitudeClamping; }
     void setAltitudeClamping( AltitudeClamping clamping );
 
-    float extrusionHeight() const { return mExtrusionHeight; }
-    void setExtrusionHeight( float height );
+    float extrusion() const { return mExtrusion; }
+    void setExtrusion( float extrusion );
 
   signals:
     void qgsGeometryChanged();
@@ -115,7 +115,7 @@ class Quick3DGeometry : public QQuick3DGeometry
     void heightOffsetChanged();
     void fillPolygonsChanged();
     void altitudeClampingChanged();
-    void extrusionHeightChanged();
+    void extrusionChanged();
 
   private slots:
     void markDirtyAndUpdate();
@@ -145,7 +145,7 @@ class Quick3DGeometry : public QQuick3DGeometry
 
     float mLineWidth = 3.0f;
     float mHeightOffset = 15.0f;
-    float mExtrusionHeight = 0.0f;
+    float mExtrusion = 0.0f;
     bool mFillPolygons = true;
     bool mDirty = true;
     AltitudeClamping mAltitudeClamping = AltitudeClamping::Ignore;

src/core/3d/quick3dgeometryutils.cpp

@@ -207,7 +207,7 @@ bool Quick3DGeometryUtils::polygonIsEar( const QVector<QVector3D> &ring, const Q
 }
 
 void Quick3DGeometryUtils::generatePolygonWalls( const QVector<QVector3D> &vertices,
-                                                 float extrusionHeight,
+                                                 float extrusion,
                                                  float r, float g, float b, float a,
                                                  float *&vptr, quint32 *&iptr,
                                                  quint32 &vertexOffset,
@@ -229,8 +229,8 @@ void Quick3DGeometryUtils::generatePolygonWalls( const QVector<QVector3D> &verti
   {
     const QVector3D &edgeStart = ring[i];
     const QVector3D &edgeEnd = ring[( i + 1 ) % n];
-    const QVector3D edgeStartTop = edgeStart + QVector3D( 0, extrusionHeight, 0 );
-    const QVector3D edgeEndTop = edgeEnd + QVector3D( 0, extrusionHeight, 0 );
+    const QVector3D edgeStartTop = edgeStart + QVector3D( 0, extrusion, 0 );
+    const QVector3D edgeEndTop = edgeEnd + QVector3D( 0, extrusion, 0 );
 
     const float dx = edgeEnd.x() - edgeStart.x();
     const float dz = edgeEnd.z() - edgeStart.z();
@@ -263,7 +263,7 @@ void Quick3DGeometryUtils::generatePolygonFill( const QVector<QVector3D> &vertic
                                                 float *&vptr, quint32 *&iptr,
                                                 quint32 &vertexOffset,
                                                 QVector3D &minBound, QVector3D &maxBound,
-                                                float extrusionHeight )
+                                                float extrusion )
 {
   QVector<QVector3D> ring = vertices;
   if ( ring.size() > 3 && ( ring.first() - ring.last() ).length() < 0.001f )
@@ -279,7 +279,7 @@ void Quick3DGeometryUtils::generatePolygonFill( const QVector<QVector3D> &vertic
 
   const quint32 baseVertex = vertexOffset;
   const QVector3D upNormal( 0.0f, 1.0f, 0.0f );
-  const QVector3D lift( 0.0f, extrusionHeight, 0.0f );
+  const QVector3D lift( 0.0f, extrusion, 0.0f );
 
   for ( int i = 0; i < n; ++i )
   {

src/core/3d/quick3dgeometryutils.h

@@ -70,23 +70,23 @@ class QFIELD_CORE_EXPORT Quick3DGeometryUtils
      * keeps degenerate or self-touching rings from leaving uninitialised
      * indices in the buffer).
      *
-     * When \a extrusionHeight is non-zero every fill vertex is shifted upward
+     * When \a extrusion is non-zero every fill vertex is shifted upward
      * by that amount so the fill becomes a roof cap on top of extruded walls.
      */
     static void generatePolygonFill( const QVector<QVector3D> &vertices,
                                      float r, float g, float b, float a,
                                      float *&vptr, quint32 *&iptr,
                                      quint32 &vertexOffset,
                                      QVector3D &minBound, QVector3D &maxBound,
-                                     float extrusionHeight = 0.0f );
+                                     float extrusion = 0.0f );
 
     /**
      * Generates vertical wall quads for each edge of a closed polygon ring,
-     * extruding from the base vertices upward by \a extrusionHeight scene units.
+     * extruding from the base vertices upward by \a extrusion scene units.
      * Each edge produces 4 vertices and 2 triangles (6 indices).
      */
     static void generatePolygonWalls( const QVector<QVector3D> &vertices,
-                                      float extrusionHeight,
+                                      float extrusion,
                                       float r, float g, float b, float a,
                                       float *&vptr, quint32 *&iptr,
                                       quint32 &vertexOffset,

src/core/multifeaturelistmodel.h

@@ -63,7 +63,7 @@ class MultiFeatureListModel : public QSortFilterProxyModel
       ConditionalFontItalicRole,
       ConditionalFontUnderlineRole,
       ConditionalFontStrikeOutRole,
-      ExtrusionHeightRole,
+      ExtrusionRole,
     };
 
     explicit MultiFeatureListModel( QObject *parent = nullptr );

src/core/multifeaturelistmodelbase.cpp

@@ -288,7 +288,7 @@ QHash<int, QByteArray> MultiFeatureListModelBase::roleNames() const
   roleNames[MultiFeatureListModel::ConditionalFontStrikeOutRole] = "conditionalFontStrikeOut";
   roleNames[MultiFeatureListModel::ConditionalFontItalicRole] = "conditionalFontItalic";
   roleNames[MultiFeatureListModel::ConditionalFontBoldRole] = "conditionalFontBold";
-  roleNames[MultiFeatureListModel::ExtrusionHeightRole] = "extrusionHeight";
+  roleNames[MultiFeatureListModel::ExtrusionRole] = "extrusion";
 
   return roleNames;
 }
@@ -468,7 +468,7 @@ QVariant MultiFeatureListModelBase::data( const QModelIndex &index, int role ) c
       return false;
       break;
 
-    case MultiFeatureListModel::ExtrusionHeightRole:
+    case MultiFeatureListModel::ExtrusionRole:
     {
       if ( vlayer )
       {

src/qml/3d/FeatureListSelectionHighlight3D.qml

@@ -37,7 +37,7 @@ Node {
           lineWidth: featureListSelectionHighlight3D.lineWidth
           heightOffset: featureListSelectionHighlight3D.heightOffset
           altitudeClamping: featureListSelectionHighlight3D.altitudeClamping
-          extrusionHeight: model.extrusionHeight
+          extrusion: model.extrusion
           color: model.featureSelected ? featureListSelectionHighlight3D.selectedColor : featureListSelectionHighlight3D.selectionModel.model.selectedCount === 0 && index === featureListSelectionHighlight3D.selectionModel.focusedItem ? featureListSelectionHighlight3D.focusedColor : featureListSelectionHighlight3D.color
         }
 
@@ -47,7 +47,7 @@ Node {
             metalness: 0.0
             roughness: 1.0
             vertexColorsEnabled: true
-            alphaMode: model.extrusionHeight > 0 ? PrincipledMaterial.Opaque : PrincipledMaterial.Blend
+            alphaMode: model.extrusion > 0 ? PrincipledMaterial.Opaque : PrincipledMaterial.Blend
             depthDrawMode: Material.AlwaysDepthDraw
             cullMode: PrincipledMaterial.NoCulling
           }