cleanup

qgis · Jan 23, 2023 · f2f0c23 · f2f0c23
1 parent 143cc3e
commit f2f0c23
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 6 deletions.
diff --git a/src/3d/chunks/qgschunkloader_p.cpp b/src/3d/chunks/qgschunkloader_p.cpp
@@ -15,7 +15,6 @@
 
 #include "qgschunkloader_p.h"
 #include "qgschunknode_p.h"
-#include "qgs3dutils.h"
 
 #include <QVector>
 ///@cond PRIVATE

diff --git a/src/3d/chunks/qgschunkloader_p.h b/src/3d/chunks/qgschunkloader_p.h
@@ -28,7 +28,6 @@
 //
 
 #include "qgschunkqueuejob_p.h"
-#include "qgsrectangle.h"
 
 #define SIP_NO_FILE
 
@@ -111,7 +110,6 @@ class _3D_EXPORT QgsQuadtreeChunkLoaderFactory : public QgsChunkLoaderFactory
     float mRootError;
     //! maximum allowed depth of quad tree
     int mMaxLevel;
-    QgsRectangle mExtent;
 
 };
 

diff --git a/src/3d/qgsrulebasedchunkloader_p.cpp b/src/3d/qgsrulebasedchunkloader_p.cpp
@@ -168,7 +168,6 @@ QgsRuleBasedChunkLoaderFactory::QgsRuleBasedChunkLoaderFactory( const Qgs3DMapSe
 {
   const QgsAABB rootBbox = Qgs3DUtils::mapToWorldExtent( map.extent(), zMin, zMax, map.origin() );
   setupQuadtree( rootBbox, -1, leafLevel );  // negative root error means that the node does not contain anything
-  mExtent = map.extent();
 }
 
 QgsRuleBasedChunkLoaderFactory::~QgsRuleBasedChunkLoaderFactory() = default;

diff --git a/src/3d/qgsvectorlayerchunkloader_p.cpp b/src/3d/qgsvectorlayerchunkloader_p.cpp
@@ -167,7 +167,6 @@ QgsVectorLayerChunkLoaderFactory::QgsVectorLayerChunkLoaderFactory( const Qgs3DM
   rootBbox.zMin -= 1.0;
   rootBbox.zMax += 1.0;
   setupQuadtree( rootBbox, -1, leafLevel );  // negative root error means that the node does not contain anything
-  mExtent = map.extent();
 }
 
 QgsChunkLoader *QgsVectorLayerChunkLoaderFactory::createChunkLoader( QgsChunkNode *node ) const

diff --git a/src/3d/terrain/qgsdemterraintileloader_p.cpp b/src/3d/terrain/qgsdemterraintileloader_p.cpp
@@ -193,7 +193,7 @@ static QByteArray _readDtmData( QgsRasterDataProvider *provider, const QgsRectan
     block->convert( Qgis::DataType::Float32 ); // currently we expect just floats
 
     // set noData outside our clippingExtent
-    QRect subRect = QgsRasterBlock::subRect( extent, block->width(), block->height(), clippingExtent );
+    const QRect subRect = QgsRasterBlock::subRect( extent, block->width(), block->height(), clippingExtent );
     if ( !block->hasNoDataValue() )
     {
       // QgsRasterBlock::setIsNoDataExcept() misbehaves without a defined no data value

diff --git a/src/3d/terrain/qgsterraingenerator.h b/src/3d/terrain/qgsterraingenerator.h
@@ -123,6 +123,7 @@ class _3D_EXPORT QgsTerrainGenerator : public QgsQuadtreeChunkLoaderFactory
 
     QgsTilingScheme mTerrainTilingScheme;   //!< Tiling scheme of the terrain
     QgsTerrainEntity *mTerrain = nullptr;
+    QgsRectangle mExtent;
 
     bool mIsValid = true;