Skip to content

Commit 260f68a

Browse files
committed
More renaming of 3D-related classes and files. No actual code changes
1 parent ff5ebe9 commit 260f68a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+319
-309
lines changed

src/3d/CMakeLists.txt

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,15 @@
33

44
SET(QGIS_3D_SRCS
55
cameracontroller.cpp
6-
map3d.cpp
7-
phongmaterialsettings.cpp
86
polygongeometry.cpp
9-
scene.cpp
107
tessellator.cpp
118
tilingscheme.cpp
129
utils.cpp
13-
vectorlayer3drenderer.cpp
10+
11+
qgs3dmapscene.cpp
12+
qgs3dmapsettings.cpp
13+
qgsphongmaterialsettings.cpp
14+
qgsvectorlayer3drenderer.cpp
1415

1516
chunks/chunkboundsentity.cpp
1617
chunks/chunkedentity.cpp
@@ -46,8 +47,9 @@ SET(QGIS_3D_SRCS
4647

4748
SET(QGIS_3D_MOC_HDRS
4849
cameracontroller.h
49-
map3d.h
50-
scene.h
50+
51+
qgs3dmapscene.h
52+
qgs3dmapsettings.h
5153

5254
chunks/chunkedentity.h
5355
chunks/chunkloader.h
@@ -69,14 +71,15 @@ QT5_ADD_RESOURCES(QGIS_3D_RCC_SRCS shaders.qrc)
6971
SET(QGIS_3D_HDRS
7072
aabb.h
7173
cameracontroller.h
72-
map3d.h
73-
phongmaterialsettings.h
7474
polygongeometry.h
75-
scene.h
7675
tessellator.h
7776
tilingscheme.h
7877
utils.h
79-
vectorlayer3drenderer.h
78+
79+
qgs3dmapscene.h
80+
qgs3dmapsettings.h
81+
qgsphongmaterialsettings.h
82+
qgsvectorlayer3drenderer.h
8083

8184
chunks/chunkboundsentity.h
8285
chunks/chunkedentity.h

src/3d/scene.cpp renamed to src/3d/qgs3dmapscene.cpp

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include "scene.h"
1+
#include "qgs3dmapscene.h"
22

33
#include <Qt3DRender/QCamera>
44
#include <Qt3DRender/QPickingSettings>
@@ -14,7 +14,7 @@
1414
#include "cameracontroller.h"
1515
#include "chunknode.h"
1616
#include "qgsvectorlayer.h"
17-
#include "map3d.h"
17+
#include "qgs3dmapsettings.h"
1818
#include "terrain.h"
1919
#include "terraingenerator.h"
2020
//#include "testchunkloader.h"
@@ -26,14 +26,14 @@
2626
#include <Qt3DExtras/QPhongMaterial>
2727

2828

29-
Scene::Scene( const Map3D &map, Qt3DExtras::QForwardRenderer *defaultFrameGraph, Qt3DRender::QRenderSettings *renderSettings, Qt3DRender::QCamera *camera, const QRect &viewportRect, Qt3DCore::QNode *parent )
29+
Qgs3DMapScene::Qgs3DMapScene( const Qgs3DMapSettings &map, Qt3DExtras::QForwardRenderer *defaultFrameGraph, Qt3DRender::QRenderSettings *renderSettings, Qt3DRender::QCamera *camera, const QRect &viewportRect, Qt3DCore::QNode *parent )
3030
: Qt3DCore::QEntity( parent )
3131
, mMap( map )
3232
, mTerrain( nullptr )
3333
, mForwardRenderer( defaultFrameGraph )
3434
{
3535

36-
connect( &map, &Map3D::backgroundColorChanged, this, &Scene::onBackgroundColorChanged );
36+
connect( &map, &Qgs3DMapSettings::backgroundColorChanged, this, &Qgs3DMapScene::onBackgroundColorChanged );
3737
onBackgroundColorChanged();
3838

3939
// TODO: strange - setting OnDemand render policy still keeps QGIS busy (Qt 5.9.0)
@@ -51,7 +51,7 @@ Scene::Scene( const Map3D &map, Qt3DExtras::QForwardRenderer *defaultFrameGraph,
5151

5252
mFrameAction = new Qt3DLogic::QFrameAction();
5353
connect( mFrameAction, &Qt3DLogic::QFrameAction::triggered,
54-
this, &Scene::onFrameTriggered );
54+
this, &Qgs3DMapScene::onFrameTriggered );
5555
addComponent( mFrameAction ); // takes ownership
5656

5757
// Camera controlling
@@ -63,11 +63,11 @@ Scene::Scene( const Map3D &map, Qt3DExtras::QForwardRenderer *defaultFrameGraph,
6363
// create terrain entity
6464

6565
createTerrain();
66-
connect( &map, &Map3D::terrainGeneratorChanged, this, &Scene::createTerrain );
67-
connect( &map, &Map3D::terrainVerticalScaleChanged, this, &Scene::createTerrain );
68-
connect( &map, &Map3D::mapTileResolutionChanged, this, &Scene::createTerrain );
69-
connect( &map, &Map3D::maxTerrainScreenErrorChanged, this, &Scene::createTerrain );
70-
connect( &map, &Map3D::maxTerrainGroundErrorChanged, this, &Scene::createTerrain );
66+
connect( &map, &Qgs3DMapSettings::terrainGeneratorChanged, this, &Qgs3DMapScene::createTerrain );
67+
connect( &map, &Qgs3DMapSettings::terrainVerticalScaleChanged, this, &Qgs3DMapScene::createTerrain );
68+
connect( &map, &Qgs3DMapSettings::mapTileResolutionChanged, this, &Qgs3DMapScene::createTerrain );
69+
connect( &map, &Qgs3DMapSettings::maxTerrainScreenErrorChanged, this, &Qgs3DMapScene::createTerrain );
70+
connect( &map, &Qgs3DMapSettings::maxTerrainGroundErrorChanged, this, &Qgs3DMapScene::createTerrain );
7171

7272
// create entities of renderers
7373

@@ -78,7 +78,7 @@ Scene::Scene( const Map3D &map, Qt3DExtras::QForwardRenderer *defaultFrameGraph,
7878
}
7979

8080
// listen to changes of layers in order to add/remove 3D renderer entities
81-
connect( &map, &Map3D::layersChanged, this, &Scene::onLayersChanged );
81+
connect( &map, &Qgs3DMapSettings::layersChanged, this, &Qgs3DMapScene::onLayersChanged );
8282

8383
Qt3DCore::QEntity *lightEntity = new Qt3DCore::QEntity;
8484
Qt3DCore::QTransform *lightTransform = new Qt3DCore::QTransform;
@@ -101,8 +101,8 @@ Scene::Scene( const Map3D &map, Qt3DExtras::QForwardRenderer *defaultFrameGraph,
101101
chunkEntities << testChunkEntity;
102102
#endif
103103

104-
connect( mCameraController, &CameraController::cameraChanged, this, &Scene::onCameraChanged );
105-
connect( mCameraController, &CameraController::viewportChanged, this, &Scene::onCameraChanged );
104+
connect( mCameraController, &CameraController::cameraChanged, this, &Qgs3DMapScene::onCameraChanged );
105+
connect( mCameraController, &CameraController::viewportChanged, this, &Qgs3DMapScene::onCameraChanged );
106106

107107
#if 0
108108
// experiments with loading of existing 3D models.
@@ -147,7 +147,7 @@ Scene::Scene( const Map3D &map, Qt3DExtras::QForwardRenderer *defaultFrameGraph,
147147
onCameraChanged();
148148
}
149149

150-
void Scene::viewZoomFull()
150+
void Qgs3DMapScene::viewZoomFull()
151151
{
152152
QgsRectangle extent = mMap.terrainGenerator()->extent();
153153
float side = qMax( extent.width(), extent.height() );
@@ -166,7 +166,7 @@ SceneState _sceneState( CameraController *cameraController )
166166
return state;
167167
}
168168

169-
void Scene::onCameraChanged()
169+
void Qgs3DMapScene::onCameraChanged()
170170
{
171171
Q_FOREACH ( ChunkedEntity *entity, chunkEntities )
172172
{
@@ -242,7 +242,7 @@ void Scene::onCameraChanged()
242242
//qDebug() << "camera near/far" << mCameraController->camera()->nearPlane() << mCameraController->camera()->farPlane();
243243
}
244244

245-
void Scene::onFrameTriggered( float dt )
245+
void Qgs3DMapScene::onFrameTriggered( float dt )
246246
{
247247
mCameraController->frameTriggered( dt );
248248

@@ -256,7 +256,7 @@ void Scene::onFrameTriggered( float dt )
256256
}
257257
}
258258

259-
void Scene::createTerrain()
259+
void Qgs3DMapScene::createTerrain()
260260
{
261261
if ( mTerrain )
262262
{
@@ -269,12 +269,12 @@ void Scene::createTerrain()
269269
if ( !mTerrainUpdateScheduled )
270270
{
271271
// defer re-creation of terrain: there may be multiple invocations of this slot, so create the new entity just once
272-
QTimer::singleShot( 0, this, &Scene::createTerrainDeferred );
272+
QTimer::singleShot( 0, this, &Qgs3DMapScene::createTerrainDeferred );
273273
mTerrainUpdateScheduled = true;
274274
}
275275
}
276276

277-
void Scene::createTerrainDeferred()
277+
void Qgs3DMapScene::createTerrainDeferred()
278278
{
279279
double tile0width = mMap.terrainGenerator()->extent().width();
280280
int maxZoomLevel = Utils::maxZoomLevel( tile0width, mMap.mapTileResolution(), mMap.maxTerrainGroundError() );
@@ -305,12 +305,12 @@ void Scene::createTerrainDeferred()
305305
mTerrainUpdateScheduled = false;
306306
}
307307

308-
void Scene::onBackgroundColorChanged()
308+
void Qgs3DMapScene::onBackgroundColorChanged()
309309
{
310310
mForwardRenderer->setClearColor( mMap.backgroundColor() );
311311
}
312312

313-
void Scene::onLayerRenderer3DChanged()
313+
void Qgs3DMapScene::onLayerRenderer3DChanged()
314314
{
315315
QgsMapLayer *layer = qobject_cast<QgsMapLayer *>( sender() );
316316
Q_ASSERT( layer );
@@ -322,7 +322,7 @@ void Scene::onLayerRenderer3DChanged()
322322
addLayerEntity( layer );
323323
}
324324

325-
void Scene::onLayersChanged()
325+
void Qgs3DMapScene::onLayersChanged()
326326
{
327327
QSet<QgsMapLayer *> layersBefore = QSet<QgsMapLayer *>::fromList( mLayerEntities.keys() );
328328
QList<QgsMapLayer *> layersAdded;
@@ -350,7 +350,7 @@ void Scene::onLayersChanged()
350350
}
351351
}
352352

353-
void Scene::addLayerEntity( QgsMapLayer *layer )
353+
void Qgs3DMapScene::addLayerEntity( QgsMapLayer *layer )
354354
{
355355
QgsAbstract3DRenderer *renderer = layer->renderer3D();
356356
if ( renderer )
@@ -360,26 +360,26 @@ void Scene::addLayerEntity( QgsMapLayer *layer )
360360
mLayerEntities.insert( layer, newEntity );
361361
}
362362

363-
connect( layer, &QgsMapLayer::renderer3DChanged, this, &Scene::onLayerRenderer3DChanged );
363+
connect( layer, &QgsMapLayer::renderer3DChanged, this, &Qgs3DMapScene::onLayerRenderer3DChanged );
364364

365365
if ( layer->type() == QgsMapLayer::VectorLayer )
366366
{
367367
QgsVectorLayer *vlayer = qobject_cast<QgsVectorLayer *>( layer );
368-
connect( vlayer, &QgsVectorLayer::selectionChanged, this, &Scene::onLayerRenderer3DChanged );
368+
connect( vlayer, &QgsVectorLayer::selectionChanged, this, &Qgs3DMapScene::onLayerRenderer3DChanged );
369369
}
370370
}
371371

372-
void Scene::removeLayerEntity( QgsMapLayer *layer )
372+
void Qgs3DMapScene::removeLayerEntity( QgsMapLayer *layer )
373373
{
374374
Qt3DCore::QEntity *entity = mLayerEntities.take( layer );
375375
if ( entity )
376376
entity->deleteLater();
377377

378-
disconnect( layer, &QgsMapLayer::renderer3DChanged, this, &Scene::onLayerRenderer3DChanged );
378+
disconnect( layer, &QgsMapLayer::renderer3DChanged, this, &Qgs3DMapScene::onLayerRenderer3DChanged );
379379

380380
if ( layer->type() == QgsMapLayer::VectorLayer )
381381
{
382382
QgsVectorLayer *vlayer = qobject_cast<QgsVectorLayer *>( layer );
383-
disconnect( vlayer, &QgsVectorLayer::selectionChanged, this, &Scene::onLayerRenderer3DChanged );
383+
disconnect( vlayer, &QgsVectorLayer::selectionChanged, this, &Qgs3DMapScene::onLayerRenderer3DChanged );
384384
}
385385
}

src/3d/scene.h renamed to src/3d/qgs3dmapscene.h

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
#ifndef SCENE_H
2-
#define SCENE_H
1+
#ifndef QGS3DMAPSCENE_H
2+
#define QGS3DMAPSCENE_H
33

44
#include "qgis_3d.h"
55

@@ -23,18 +23,18 @@ namespace Qt3DExtras
2323

2424
class QgsMapLayer;
2525
class CameraController;
26-
class Map3D;
26+
class Qgs3DMapSettings;
2727
class Terrain;
2828
class ChunkedEntity;
2929

3030
/**
3131
* Entity that encapsulates our 3D scene - contains all other entities (such as terrain) as children.
3232
*/
33-
class _3D_EXPORT Scene : public Qt3DCore::QEntity
33+
class _3D_EXPORT Qgs3DMapScene : public Qt3DCore::QEntity
3434
{
3535
Q_OBJECT
3636
public:
37-
Scene( const Map3D &map, Qt3DExtras::QForwardRenderer *defaultFrameGraph, Qt3DRender::QRenderSettings *renderSettings, Qt3DRender::QCamera *camera, const QRect &viewportRect, Qt3DCore::QNode *parent = nullptr );
37+
Qgs3DMapScene( const Qgs3DMapSettings &map, Qt3DExtras::QForwardRenderer *defaultFrameGraph, Qt3DRender::QRenderSettings *renderSettings, Qt3DRender::QCamera *camera, const QRect &viewportRect, Qt3DCore::QNode *parent = nullptr );
3838

3939
CameraController *cameraController() { return mCameraController; }
4040
Terrain *terrain() { return mTerrain; }
@@ -55,7 +55,7 @@ class _3D_EXPORT Scene : public Qt3DCore::QEntity
5555
void removeLayerEntity( QgsMapLayer *layer );
5656

5757
private:
58-
const Map3D &mMap;
58+
const Qgs3DMapSettings &mMap;
5959
//! Provides a way to have a synchronous function executed each frame
6060
Qt3DLogic::QFrameAction *mFrameAction;
6161
CameraController *mCameraController;
@@ -68,4 +68,4 @@ class _3D_EXPORT Scene : public Qt3DCore::QEntity
6868
bool mTerrainUpdateScheduled = false;
6969
};
7070

71-
#endif // SCENE_H
71+
#endif // QGS3DMAPSCENE_H

0 commit comments

Comments
 (0)