sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-10-05 00:09:32 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge conflicts

Browse Source
This commit is contained in:
Matthias Kuhn 2025-08-16 14:31:58 +02:00
parent 9322bd815f
commit 5a6066c8a4
2 changed files with 7 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/3d/qgsglobechunkedentity.cpp
View File

@ -275,37 +275,17 @@ QgsGlobeChunkLoader::QgsGlobeChunkLoader( QgsChunkNode *node, QgsTerrainTextureG
, mTextureGenerator( textureGenerator )
, mGlobeCrsToLatLon( globeCrsToLatLon )
{
<<<<<<< HEAD
}
void QgsGlobeChunkLoader::start()
{
QgsChunkNode *node = chunk();
connect( mTextureGenerator, &QgsTerrainTextureGenerator::tileReady, this, [this]( int job, const QImage &img ) {
if ( job == mJobId )
{
mTexture = img;
emit finished();
=======
public:
QgsGlobeChunkLoader( QgsChunkNode *node, QgsTerrainTextureGenerator *textureGenerator, const QgsCoordinateTransform &globeCrsToLatLon )
: QgsChunkLoader( node )
, mTextureGenerator( textureGenerator )
, mGlobeCrsToLatLon( globeCrsToLatLon )
{}
void start() override
{
QgsChunkNode *node = chunk();
connect( mTextureGenerator, &QgsTerrainTextureGenerator::tileReady, this, [this]( int job, const QImage &img ) {
if ( job == mJobId )
{
mTexture = img;
emit finished();
}
} );
double latMin, latMax, lonMin, lonMax;
globeNodeIdToLatLon( node->tileId(), latMin, latMax, lonMin, lonMax );
QgsRectangle extent( lonMin, latMin, lonMax, latMax );
mJobId = mTextureGenerator->render( extent, node->tileId(), node->tileId().text() );
>>>>>>> 6b7c743bb1e (Cleaner approach)
}
} );

1
src/3d/qgsglobechunkedentity.h
View File

@ -48,6 +48,7 @@ class QgsGlobeChunkLoader : public QgsChunkLoader
Q_OBJECT
public:
QgsGlobeChunkLoader( QgsChunkNode *node, QgsTerrainTextureGenerator *textureGenerator, const QgsCoordinateTransform &globeCrsToLatLon );
void start() override;
Qt3DCore::QEntity *createEntity( Qt3DCore::QEntity *parent ) override;