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

Fix saving/loading globe 3D view

Browse Source
This commit is contained in:
David Koňařík 2025-04-22 10:37:17 +02:00 committed by Nyall Dawson
parent d53c04322c
commit 10a7e974cf
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/3d/qgscameracontroller.cpp
View File

@ -244,9 +244,16 @@ void QgsCameraController::setCameraPose( const QgsCameraPose &camPose, bool forc
QDomElement QgsCameraController::writeXml( QDomDocument &doc ) const
{
QDomElement elemCamera = doc.createElement( QStringLiteral( "camera" ) );
elemCamera.setAttribute( QStringLiteral( "x" ), mCameraPose.centerPoint().x() );
elemCamera.setAttribute( QStringLiteral( "y" ), mCameraPose.centerPoint().z() );
elemCamera.setAttribute( QStringLiteral( "elev" ), mCameraPose.centerPoint().y() );
QgsVector3D centerPoint;
if ( mScene->mapSettings()->sceneMode() == Qgis::SceneMode::Local )
centerPoint = mCameraPose.centerPoint();
else if ( mScene->mapSettings()->sceneMode() == Qgis::SceneMode::Globe )
// Save center point in map coordinates, since our world origin won't be
// the same on loading
centerPoint = mCameraPose.centerPoint() + mOrigin;
elemCamera.setAttribute( QStringLiteral( "x" ), centerPoint.x() );
elemCamera.setAttribute( QStringLiteral( "y" ), centerPoint.z() );
elemCamera.setAttribute( QStringLiteral( "elev" ), centerPoint.y() );
elemCamera.setAttribute( QStringLiteral( "dist" ), mCameraPose.distanceFromCenterPoint() );
elemCamera.setAttribute( QStringLiteral( "pitch" ), mCameraPose.pitchAngle() );
elemCamera.setAttribute( QStringLiteral( "yaw" ), mCameraPose.headingAngle() );
@ -261,7 +268,10 @@ void QgsCameraController::readXml( const QDomElement &elem )
const float dist = elem.attribute( QStringLiteral( "dist" ) ).toFloat();
const float pitch = elem.attribute( QStringLiteral( "pitch" ) ).toFloat();
const float yaw = elem.attribute( QStringLiteral( "yaw" ) ).toFloat();
setLookingAtPoint( QgsVector3D( x, elev, y ), dist, pitch, yaw );
QgsVector3D centerPoint( x, elev, y );
if ( mScene->mapSettings()->sceneMode() == Qgis::SceneMode::Globe )
centerPoint = centerPoint - mOrigin;
setLookingAtPoint( centerPoint, dist, pitch, yaw );
}
double QgsCameraController::sampleDepthBuffer( int px, int py )