Skip to content

Commit d213d31

Browse files
committed
More renaming. No code changes
1 parent 260f68a commit d213d31

33 files changed

+137
-135
lines changed

src/3d/CMakeLists.txt

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
# sources
33

44
SET(QGIS_3D_SRCS
5-
cameracontroller.cpp
6-
polygongeometry.cpp
7-
tessellator.cpp
8-
tilingscheme.cpp
9-
utils.cpp
105

116
qgs3dmapscene.cpp
127
qgs3dmapsettings.cpp
8+
qgs3dutils.cpp
9+
qgscameracontroller.cpp
1310
qgsphongmaterialsettings.cpp
11+
qgstessellatedpolygongeometry.cpp
12+
qgstessellator.cpp
13+
qgstilingscheme.cpp
1414
qgsvectorlayer3drenderer.cpp
1515

1616
chunks/chunkboundsentity.cpp
@@ -46,10 +46,10 @@ SET(QGIS_3D_SRCS
4646
)
4747

4848
SET(QGIS_3D_MOC_HDRS
49-
cameracontroller.h
5049

5150
qgs3dmapscene.h
5251
qgs3dmapsettings.h
52+
qgscameracontroller.h
5353

5454
chunks/chunkedentity.h
5555
chunks/chunkloader.h
@@ -70,15 +70,15 @@ QT5_ADD_RESOURCES(QGIS_3D_RCC_SRCS shaders.qrc)
7070

7171
SET(QGIS_3D_HDRS
7272
aabb.h
73-
cameracontroller.h
74-
polygongeometry.h
75-
tessellator.h
76-
tilingscheme.h
77-
utils.h
7873

7974
qgs3dmapscene.h
8075
qgs3dmapsettings.h
76+
qgs3dutils.h
77+
qgscameracontroller.h
8178
qgsphongmaterialsettings.h
79+
qgstessellatedpolygongeometry.h
80+
qgstessellator.h
81+
qgstilingscheme.h
8282
qgsvectorlayer3drenderer.h
8383

8484
chunks/chunkboundsentity.h

src/3d/chunks/chunkedentity.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#include "chunklist.h"
55
#include "chunkloader.h"
66
#include "chunknode.h"
7-
#include "utils.h"
7+
#include "qgs3dutils.h"
88

99
static float screenSpaceError( float epsilon, float distance, float screenSize, float fov )
1010
{
@@ -200,7 +200,7 @@ void ChunkedEntity::updateNodes( const QList<ChunkNode *> &nodes, ChunkQueueJobF
200200

201201
void ChunkedEntity::update( ChunkNode *node, const SceneState &state )
202202
{
203-
if (Utils::isCullable(node->bbox, state.viewProjectionMatrix ) )
203+
if ( Qgs3DUtils::isCullable( node->bbox, state.viewProjectionMatrix ) )
204204
{
205205
++frustumCulled;
206206
return;

src/3d/qgs3dmapscene.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@
1111

1212
#include "aabb.h"
1313
#include "qgsabstract3drenderer.h"
14-
#include "cameracontroller.h"
14+
#include "qgscameracontroller.h"
1515
#include "chunknode.h"
1616
#include "qgsvectorlayer.h"
1717
#include "qgs3dmapsettings.h"
1818
#include "terrain.h"
1919
#include "terraingenerator.h"
2020
//#include "testchunkloader.h"
2121
#include "chunkedentity.h"
22-
#include "utils.h"
22+
#include "qgs3dutils.h"
2323

2424
#include <Qt3DRender/QMesh>
2525
#include <Qt3DRender/QSceneLoader>
@@ -55,7 +55,7 @@ Qgs3DMapScene::Qgs3DMapScene( const Qgs3DMapSettings &map, Qt3DExtras::QForwardR
5555
addComponent( mFrameAction ); // takes ownership
5656

5757
// Camera controlling
58-
mCameraController = new CameraController( this ); // attaches to the scene
58+
mCameraController = new QgsCameraController( this ); // attaches to the scene
5959
mCameraController->setViewport( viewportRect );
6060
mCameraController->setCamera( camera );
6161
mCameraController->resetView( 1000 );
@@ -101,8 +101,8 @@ Qgs3DMapScene::Qgs3DMapScene( const Qgs3DMapSettings &map, Qt3DExtras::QForwardR
101101
chunkEntities << testChunkEntity;
102102
#endif
103103

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

107107
#if 0
108108
// experiments with loading of existing 3D models.
@@ -154,7 +154,7 @@ void Qgs3DMapScene::viewZoomFull()
154154
mCameraController->resetView( side ); // assuming FOV being 45 degrees
155155
}
156156

157-
SceneState _sceneState( CameraController *cameraController )
157+
SceneState _sceneState( QgsCameraController *cameraController )
158158
{
159159
Qt3DRender::QCamera *camera = cameraController->camera();
160160
SceneState state;
@@ -277,7 +277,7 @@ void Qgs3DMapScene::createTerrain()
277277
void Qgs3DMapScene::createTerrainDeferred()
278278
{
279279
double tile0width = mMap.terrainGenerator()->extent().width();
280-
int maxZoomLevel = Utils::maxZoomLevel( tile0width, mMap.mapTileResolution(), mMap.maxTerrainGroundError() );
280+
int maxZoomLevel = Qgs3DUtils::maxZoomLevel( tile0width, mMap.mapTileResolution(), mMap.maxTerrainGroundError() );
281281

282282
mTerrain = new Terrain( maxZoomLevel, mMap );
283283
//mTerrain->setEnabled(false);

src/3d/qgs3dmapscene.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ namespace Qt3DExtras
2222
}
2323

2424
class QgsMapLayer;
25-
class CameraController;
25+
class QgsCameraController;
2626
class Qgs3DMapSettings;
2727
class Terrain;
2828
class ChunkedEntity;
@@ -36,7 +36,7 @@ class _3D_EXPORT Qgs3DMapScene : public Qt3DCore::QEntity
3636
public:
3737
Qgs3DMapScene( const Qgs3DMapSettings &map, Qt3DExtras::QForwardRenderer *defaultFrameGraph, Qt3DRender::QRenderSettings *renderSettings, Qt3DRender::QCamera *camera, const QRect &viewportRect, Qt3DCore::QNode *parent = nullptr );
3838

39-
CameraController *cameraController() { return mCameraController; }
39+
QgsCameraController *cameraController() { return mCameraController; }
4040
Terrain *terrain() { return mTerrain; }
4141

4242
void viewZoomFull();
@@ -58,7 +58,7 @@ class _3D_EXPORT Qgs3DMapScene : public Qt3DCore::QEntity
5858
const Qgs3DMapSettings &mMap;
5959
//! Provides a way to have a synchronous function executed each frame
6060
Qt3DLogic::QFrameAction *mFrameAction;
61-
CameraController *mCameraController;
61+
QgsCameraController *mCameraController;
6262
Terrain *mTerrain;
6363
//! Forward renderer provided by 3D window
6464
Qt3DExtras::QForwardRenderer *mForwardRenderer;

src/3d/utils.cpp renamed to src/3d/qgs3dutils.cpp

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include "utils.h"
1+
#include "qgs3dutils.h"
22

33
#include "qgslinestring.h"
44
#include "qgspolygon.h"
@@ -12,7 +12,7 @@
1212

1313

1414

15-
int Utils::maxZoomLevel( double tile0width, double tileResolution, double maxError )
15+
int Qgs3DUtils::maxZoomLevel( double tile0width, double tileResolution, double maxError )
1616
{
1717
if ( maxError <= 0 || tileResolution <= 0 || tile0width <= 0 )
1818
return 0; // invalid input
@@ -25,7 +25,7 @@ int Utils::maxZoomLevel( double tile0width, double tileResolution, double maxErr
2525
return round( zoomLevel ); // we could use ceil() here if we wanted to always get to the desired error
2626
}
2727

28-
QString Utils::altClampingToString( AltitudeClamping altClamp )
28+
QString Qgs3DUtils::altClampingToString( AltitudeClamping altClamp )
2929
{
3030
switch ( altClamp )
3131
{
@@ -37,7 +37,7 @@ QString Utils::altClampingToString( AltitudeClamping altClamp )
3737
}
3838

3939

40-
AltitudeClamping Utils::altClampingFromString( const QString &str )
40+
AltitudeClamping Qgs3DUtils::altClampingFromString( const QString &str )
4141
{
4242
if ( str == "absolute" )
4343
return AltClampAbsolute;
@@ -48,7 +48,7 @@ AltitudeClamping Utils::altClampingFromString( const QString &str )
4848
}
4949

5050

51-
QString Utils::altBindingToString( AltitudeBinding altBind )
51+
QString Qgs3DUtils::altBindingToString( AltitudeBinding altBind )
5252
{
5353
switch ( altBind )
5454
{
@@ -59,7 +59,7 @@ QString Utils::altBindingToString( AltitudeBinding altBind )
5959
}
6060

6161

62-
AltitudeBinding Utils::altBindingFromString( const QString &str )
62+
AltitudeBinding Qgs3DUtils::altBindingFromString( const QString &str )
6363
{
6464
if ( str == "vertex" )
6565
return AltBindVertex;
@@ -68,7 +68,7 @@ AltitudeBinding Utils::altBindingFromString( const QString &str )
6868
}
6969

7070

71-
void Utils::clampAltitudes( QgsLineString *lineString, AltitudeClamping altClamp, AltitudeBinding altBind, const QgsPoint &centroid, float height, const Qgs3DMapSettings &map )
71+
void Qgs3DUtils::clampAltitudes( QgsLineString *lineString, AltitudeClamping altClamp, AltitudeBinding altBind, const QgsPoint &centroid, float height, const Qgs3DMapSettings &map )
7272
{
7373
for ( int i = 0; i < lineString->nCoordinates(); ++i )
7474
{
@@ -98,7 +98,7 @@ void Utils::clampAltitudes( QgsLineString *lineString, AltitudeClamping altClamp
9898
}
9999

100100

101-
bool Utils::clampAltitudes( QgsPolygonV2 *polygon, AltitudeClamping altClamp, AltitudeBinding altBind, float height, const Qgs3DMapSettings &map )
101+
bool Qgs3DUtils::clampAltitudes( QgsPolygonV2 *polygon, AltitudeClamping altClamp, AltitudeBinding altBind, float height, const Qgs3DMapSettings &map )
102102
{
103103
if ( !polygon->is3D() )
104104
polygon->addZValue( 0 );
@@ -127,7 +127,7 @@ bool Utils::clampAltitudes( QgsPolygonV2 *polygon, AltitudeClamping altClamp, Al
127127
}
128128

129129

130-
QString Utils::matrix4x4toString( const QMatrix4x4 &m )
130+
QString Qgs3DUtils::matrix4x4toString( const QMatrix4x4 &m )
131131
{
132132
const float *d = m.constData();
133133
QStringList elems;
@@ -136,7 +136,7 @@ QString Utils::matrix4x4toString( const QMatrix4x4 &m )
136136
return elems.join( ' ' );
137137
}
138138

139-
QMatrix4x4 Utils::stringToMatrix4x4( const QString &str )
139+
QMatrix4x4 Qgs3DUtils::stringToMatrix4x4( const QString &str )
140140
{
141141
QMatrix4x4 m;
142142
float *d = m.data();
@@ -146,7 +146,7 @@ QMatrix4x4 Utils::stringToMatrix4x4( const QString &str )
146146
return m;
147147
}
148148

149-
QList<QVector3D> Utils::positions( const Qgs3DMapSettings &map, QgsVectorLayer *layer, const QgsFeatureRequest &request )
149+
QList<QVector3D> Qgs3DUtils::positions( const Qgs3DMapSettings &map, QgsVectorLayer *layer, const QgsFeatureRequest &request )
150150
{
151151
QList<QVector3D> positions;
152152
QgsFeature f;
@@ -203,7 +203,7 @@ static inline uint outcode( const QVector4D &v )
203203
//! should be equivalent to https://searchcode.com/codesearch/view/35195518/
204204
//! qt3d /src/threed/painting/qglpainter.cpp
205205
//! bool QGLPainter::isCullable(const QBox3D& box) const
206-
bool Utils::isCullable( const AABB &bbox, const QMatrix4x4 &viewProjectionMatrix )
206+
bool Qgs3DUtils::isCullable( const AABB &bbox, const QMatrix4x4 &viewProjectionMatrix )
207207
{
208208
uint out = 0xff;
209209

src/3d/utils.h renamed to src/3d/qgs3dutils.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
#ifndef UTILS_H
2-
#define UTILS_H
1+
#ifndef QGS3DUTILS_H
2+
#define QGS3DUTILS_H
33

44
class QgsLineString;
55
class QgsPolygonV2;
@@ -24,7 +24,7 @@ enum AltitudeBinding
2424
};
2525

2626

27-
class _3D_EXPORT Utils
27+
class _3D_EXPORT Qgs3DUtils
2828
{
2929
public:
3030

@@ -63,4 +63,4 @@ class _3D_EXPORT Utils
6363
static QList<QVector3D> positions(const Map3D &map, QgsVectorLayer *layer, const QgsFeatureRequest &req);
6464
};
6565

66-
#endif // UTILS_H
66+
#endif // QGS3DUTILS_H

src/3d/cameracontroller.cpp renamed to src/3d/qgscameracontroller.cpp

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
#include "cameracontroller.h"
1+
#include "qgscameracontroller.h"
22

33
#include <Qt3DRender/QObjectPicker>
44
#include <Qt3DRender/QPickEvent>
55

66

7-
CameraController::CameraController( Qt3DCore::QNode *parent )
7+
QgsCameraController::QgsCameraController( Qt3DCore::QNode *parent )
88
: Qt3DCore::QEntity( parent )
99
, mLastPressedHeight( 0 )
1010
, mMouseDevice( new Qt3DInput::QMouseDevice() )
@@ -33,7 +33,7 @@ CameraController::CameraController( Qt3DCore::QNode *parent )
3333
// it is only in action when a mouse button is pressed.
3434
mMouseHandler->setSourceDevice( mMouseDevice );
3535
connect( mMouseHandler, &Qt3DInput::QMouseHandler::positionChanged,
36-
this, &CameraController::onPositionChanged );
36+
this, &QgsCameraController::onPositionChanged );
3737
addComponent( mMouseHandler );
3838

3939
// TODO: keep using QAxis and QAction approach or just switch to using QMouseHandler / QKeyboardHandler?
@@ -106,13 +106,13 @@ CameraController::CameraController( Qt3DCore::QNode *parent )
106106
addComponent( mLogicalDevice );
107107
}
108108

109-
void CameraController::addTerrainPicker( Qt3DRender::QObjectPicker *picker )
109+
void QgsCameraController::addTerrainPicker( Qt3DRender::QObjectPicker *picker )
110110
{
111111
// object picker for terrain for correct map panning
112-
connect( picker, &Qt3DRender::QObjectPicker::pressed, this, &CameraController::onPickerMousePressed );
112+
connect( picker, &Qt3DRender::QObjectPicker::pressed, this, &QgsCameraController::onPickerMousePressed );
113113
}
114114

115-
void CameraController::setCamera( Qt3DRender::QCamera *camera )
115+
void QgsCameraController::setCamera( Qt3DRender::QCamera *camera )
116116
{
117117
if ( mCamera == camera )
118118
return;
@@ -125,7 +125,7 @@ void CameraController::setCamera( Qt3DRender::QCamera *camera )
125125
emit cameraChanged();
126126
}
127127

128-
void CameraController::setViewport( const QRect &viewport )
128+
void QgsCameraController::setViewport( const QRect &viewport )
129129
{
130130
if ( mViewport == viewport )
131131
return;
@@ -134,7 +134,7 @@ void CameraController::setViewport( const QRect &viewport )
134134
emit viewportChanged();
135135
}
136136

137-
void CameraController::setCameraData( float x, float y, float dist, float pitch, float yaw )
137+
void QgsCameraController::setCameraData( float x, float y, float dist, float pitch, float yaw )
138138
{
139139
cd.x = x;
140140
cd.y = y;
@@ -173,7 +173,7 @@ QPointF screen_point_to_point_on_plane( const QPointF &pt, const QRect &viewport
173173
}
174174

175175

176-
void CameraController::frameTriggered( float dt )
176+
void QgsCameraController::frameTriggered( float dt )
177177
{
178178
if ( mCamera == nullptr )
179179
return;
@@ -245,7 +245,7 @@ void CameraController::frameTriggered( float dt )
245245
}
246246
}
247247

248-
void CameraController::resetView( float distance )
248+
void QgsCameraController::resetView( float distance )
249249
{
250250
setCameraData( 0, 0, distance );
251251
// a basic setup to make frustum depth range long enough that it does not cull everything
@@ -255,12 +255,12 @@ void CameraController::resetView( float distance )
255255
emit cameraChanged();
256256
}
257257

258-
void CameraController::onPositionChanged( Qt3DInput::QMouseEvent *mouse )
258+
void QgsCameraController::onPositionChanged( Qt3DInput::QMouseEvent *mouse )
259259
{
260260
mMousePos = QPoint( mouse->x(), mouse->y() );
261261
}
262262

263-
void CameraController::onPickerMousePressed( Qt3DRender::QPickEvent *pick )
263+
void QgsCameraController::onPickerMousePressed( Qt3DRender::QPickEvent *pick )
264264
{
265265
mLastPressedHeight = pick->worldIntersection().y();
266266
}

0 commit comments

Comments
 (0)