Skip to content

Commit 5a080d4

Browse files
authoredMar 15, 2023
Merge pull request #52244 from ptitjano/remove-quantized
3d: Remove unused quantizedmesh path
2 parents b1419e6 + edd7e80 commit 5a080d4

File tree

6 files changed

+0
-678
lines changed

6 files changed

+0
-678
lines changed
 

‎src/3d/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,6 @@ set(QGIS_3D_SRCS
9494
terrain/qgsterraintexturegenerator_p.cpp
9595
terrain/qgsterraintextureimage_p.cpp
9696
terrain/qgsterraintileloader_p.cpp
97-
#terrain/quantizedmeshgeometry.cpp
98-
#terrain/quantizedmeshterraingenerator.cpp
9997

10098
mesh/qgsmesh3dgeometry_p.cpp
10199
mesh/qgsmesh3dentity_p.cpp

‎src/3d/terrain/qgsterraintileloader_p.cpp

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -32,25 +32,13 @@
3232
#include <Qt3DExtras/QDiffuseSpecularMaterial>
3333
#include <Qt3DExtras/QPhongMaterial>
3434

35-
#include "quantizedmeshterraingenerator.h"
36-
3735
/// @cond PRIVATE
3836

3937
QgsTerrainTileLoader::QgsTerrainTileLoader( QgsTerrainEntity *terrain, QgsChunkNode *node )
4038
: QgsChunkLoader( node )
4139
, mTerrain( terrain )
4240
{
4341
const Qgs3DMapSettings &map = mTerrain->map3D();
44-
#if 0
45-
int tx, ty, tz;
46-
if ( map.terrainGenerator->type() == TerrainGenerator::QuantizedMesh )
47-
{
48-
// TODO: sort out - should not be here
49-
QuantizedMeshTerrainGenerator *generator = static_cast<QuantizedMeshTerrainGenerator *>( map.terrainGenerator.get() );
50-
generator->quadTreeTileToBaseTile( node->x, node->y, node->z, tx, ty, tz );
51-
}
52-
#endif
53-
5442
const QgsChunkNodeId nodeId = node->tileId();
5543
const QgsRectangle extentTerrainCrs = map.terrainGenerator()->tilingScheme().tileToExtent( nodeId );
5644
QgsCoordinateTransform transform = terrain->terrainToMapTransform();

‎src/3d/terrain/quantizedmeshgeometry.cpp

Lines changed: 0 additions & 366 deletions
This file was deleted.

‎src/3d/terrain/quantizedmeshgeometry.h

Lines changed: 0 additions & 95 deletions
This file was deleted.

‎src/3d/terrain/quantizedmeshterraingenerator.cpp

Lines changed: 0 additions & 156 deletions
This file was deleted.

‎src/3d/terrain/quantizedmeshterraingenerator.h

Lines changed: 0 additions & 47 deletions
This file was deleted.

0 commit comments

Comments
 (0)
Please sign in to comment.