Rename TerrainBoundsEntity to ChunkBoundsEntity

wonder-sk · wonder-sk · commit 04e12d9dcecb · 2017-09-15T10:38:23.000+02:00
... since it can be used also for other chunked entities - not just terrain
diff --git a/src/3d/CMakeLists.txt b/src/3d/CMakeLists.txt
@@ -3,6 +3,7 @@
 
 SET(QGIS_3D_SRCS
   cameracontroller.cpp
+  chunkboundsentity.cpp
   chunkedentity.cpp
   chunklist.cpp
   chunkloader.cpp
@@ -21,7 +22,6 @@ SET(QGIS_3D_SRCS
   #quantizedmeshterraingenerator.cpp
   scene.cpp
   terrain.cpp
-  terrainboundsentity.cpp
   terrainchunkloader.cpp
   terraingenerator.cpp
   tessellator.cpp
@@ -55,6 +55,7 @@ QT5_ADD_RESOURCES(QGIS_3D_RCC_SRCS shaders.qrc)
 SET(QGIS_3D_HDRS
   aabb.h
   cameracontroller.h
+  chunkboundsentity.h
   chunkedentity.h
   chunklist.h
   chunkloader.h
@@ -73,7 +74,6 @@ SET(QGIS_3D_HDRS
   #quantizedmeshterraingenerator.h
   scene.h
   terrain.h
-  terrainboundsentity.h
   terrainchunkloader.h
   terraingenerator.h
   tessellator.h
diff --git a/src/3d/chunkboundsentity.cpp b/src/3d/chunkboundsentity.cpp
@@ -1,4 +1,4 @@
-#include "terrainboundsentity.h"
+#include "chunkboundsentity.h"
 
 #include <Qt3DRender/QAttribute>
 #include <Qt3DRender/QBuffer>
@@ -105,7 +105,7 @@ void AABBMesh::setBoxes( const QList<AABB> &bboxes )
 // ----------------
 
 
-TerrainBoundsEntity::TerrainBoundsEntity( Qt3DCore::QNode *parent )
+ChunkBoundsEntity::ChunkBoundsEntity( Qt3DCore::QNode *parent )
   : Qt3DCore::QEntity( parent )
 {
   aabbMesh = new AABBMesh;
@@ -116,7 +116,7 @@ TerrainBoundsEntity::TerrainBoundsEntity( Qt3DCore::QNode *parent )
   addComponent( bboxesMaterial );
 }
 
-void TerrainBoundsEntity::setBoxes( const QList<AABB> &bboxes )
+void ChunkBoundsEntity::setBoxes( const QList<AABB> &bboxes )
 {
   aabbMesh->setBoxes( bboxes );
 }
diff --git a/src/3d/chunkboundsentity.h b/src/3d/chunkboundsentity.h
@@ -1,21 +1,21 @@
-#ifndef TERRAINBOUNDSENTITY_H
-#define TERRAINBOUNDSENTITY_H
+#ifndef CHUNKBOUNDSENTITY_H
+#define CHUNKBOUNDSENTITY_H
 
 #include <Qt3DCore/QEntity>
 
 class AABB;
 class AABBMesh;
 
 //! Draws bounds of axis aligned bounding boxes
-class TerrainBoundsEntity : public Qt3DCore::QEntity
+class ChunkBoundsEntity : public Qt3DCore::QEntity
 {
   public:
-    TerrainBoundsEntity( Qt3DCore::QNode *parent = nullptr );
+    ChunkBoundsEntity( Qt3DCore::QNode *parent = nullptr );
 
     void setBoxes( const QList<AABB> &bboxes );
 
   private:
     AABBMesh *aabbMesh;
 };
 
-#endif // TERRAINBOUNDSENTITY_H
+#endif // CHUNKBOUNDSENTITY_H
diff --git a/src/3d/chunkedentity.cpp b/src/3d/chunkedentity.cpp
@@ -1,9 +1,10 @@
 #include "chunkedentity.h"
 
-#include "chunknode.h"
+#include "chunkboundsentity.h"
 #include "chunklist.h"
 #include "chunkloader.h"
-#include "terrainboundsentity.h"
+#include "chunknode.h"
+
 
 static float screenSpaceError( float epsilon, float distance, float screenSize, float fov )
 {
@@ -195,7 +196,7 @@ void ChunkedEntity::setShowBoundingBoxes( bool enabled )
 
   if ( enabled )
   {
-    bboxesEntity = new TerrainBoundsEntity( this );
+    bboxesEntity = new ChunkBoundsEntity( this );
   }
   else
   {
diff --git a/src/3d/chunkedentity.h b/src/3d/chunkedentity.h
@@ -9,7 +9,7 @@ class AABB;
 class ChunkNode;
 class ChunkList;
 class ChunkLoaderFactory;
-class TerrainBoundsEntity;
+class ChunkBoundsEntity;
 class LoaderThread;
 
 #include <QVector3D>
@@ -76,7 +76,7 @@ class ChunkedEntity : public Qt3DCore::QEntity
     //! max. length for replacement queue
     int maxLoadedChunks;
 
-    TerrainBoundsEntity *bboxesEntity;
+    ChunkBoundsEntity *bboxesEntity;
 
     LoaderThread *loaderThread;
     QMutex loaderMutex;

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#include "terrainboundsentity.h"`
	`1`	`+#include "chunkboundsentity.h"`
`2`	`2`
`3`	`3`	`#include <Qt3DRender/QAttribute>`
`4`	`4`	`#include <Qt3DRender/QBuffer>`
`@@ -105,7 +105,7 @@ void AABBMesh::setBoxes( const QList<AABB> &bboxes )`
`105`	`105`	`// ----------------`
`106`	`106`
`107`	`107`
`108`		`-TerrainBoundsEntity::TerrainBoundsEntity( Qt3DCore::QNode *parent )`
	`108`	`+ChunkBoundsEntity::ChunkBoundsEntity( Qt3DCore::QNode *parent )`
`109`	`109`	`: Qt3DCore::QEntity( parent )`
`110`	`110`	`{`
`111`	`111`	`aabbMesh = new AABBMesh;`
`@@ -116,7 +116,7 @@ TerrainBoundsEntity::TerrainBoundsEntity( Qt3DCore::QNode *parent )`
`116`	`116`	`addComponent( bboxesMaterial );`
`117`	`117`	`}`
`118`	`118`
`119`		`-void TerrainBoundsEntity::setBoxes( const QList<AABB> &bboxes )`
	`119`	`+void ChunkBoundsEntity::setBoxes( const QList<AABB> &bboxes )`
`120`	`120`	`{`
`121`	`121`	`aabbMesh->setBoxes( bboxes );`
`122`	`122`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,10 @@`
`1`	`1`	`#include "chunkedentity.h"`
`2`	`2`
`3`		`-#include "chunknode.h"`
	`3`	`+#include "chunkboundsentity.h"`
`4`	`4`	`#include "chunklist.h"`
`5`	`5`	`#include "chunkloader.h"`
`6`		`-#include "terrainboundsentity.h"`
	`6`	`+#include "chunknode.h"`
	`7`	`+`
`7`	`8`
`8`	`9`	`static float screenSpaceError( float epsilon, float distance, float screenSize, float fov )`
`9`	`10`	`{`
`@@ -195,7 +196,7 @@ void ChunkedEntity::setShowBoundingBoxes( bool enabled )`
`195`	`196`
`196`	`197`	`if ( enabled )`
`197`	`198`	`{`
`198`		`- bboxesEntity = new TerrainBoundsEntity( this );`
	`199`	`+ bboxesEntity = new ChunkBoundsEntity( this );`
`199`	`200`	`}`
`200`	`201`	`else`
`201`	`202`	`{`