sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-25 00:58:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

Add option to update camera through debug panel

Browse Source
This commit is contained in:
Withalion 2024-11-19 22:13:03 +01:00 committed by Martin Dobias
parent 70d7f59e06
commit a6fac72d9b
3 changed files with 104 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
src/app/3d/qgs3ddebugwidget.cpp
View File

@ -59,11 +59,21 @@ Qgs3DDebugWidget::Qgs3DDebugWidget( Qgs3DMapCanvas *canvas, QWidget *parent )
mLookingX->setRange( std::numeric_limits<float>::lowest(), std::numeric_limits<float>::max() );
mLookingY->setRange( std::numeric_limits<float>::lowest(), std::numeric_limits<float>::max() );
mLookingZ->setRange( std::numeric_limits<float>::lowest(), std::numeric_limits<float>::max() );
connect( mNearPlane, qOverload<double>( &QDoubleSpinBox::valueChanged ), this, &Qgs3DDebugWidget::castCameraInputValue );
connect( mFarPlane, qOverload<double>( &QDoubleSpinBox::valueChanged ), this, &Qgs3DDebugWidget::castCameraInputValue );
connect( mCameraX, qOverload<double>( &QDoubleSpinBox::valueChanged ), this, &Qgs3DDebugWidget::castCameraInputValue );
connect( mCameraY, qOverload<double>( &QDoubleSpinBox::valueChanged ), this, &Qgs3DDebugWidget::castCameraInputValue );
connect( mCameraZ, qOverload<double>( &QDoubleSpinBox::valueChanged ), this, &Qgs3DDebugWidget::castCameraInputValue );
connect( mLookingX, qOverload<double>( &QDoubleSpinBox::valueChanged ), this, &Qgs3DDebugWidget::castCameraInputValue );
connect( mLookingY, qOverload<double>( &QDoubleSpinBox::valueChanged ), this, &Qgs3DDebugWidget::castCameraInputValue );
connect( mLookingZ, qOverload<double>( &QDoubleSpinBox::valueChanged ), this, &Qgs3DDebugWidget::castCameraInputValue );
}
void Qgs3DDebugWidget::setMapSettings( Qgs3DMapSettings *mapSettings )
{
mMap = mapSettings;
// set up the checkbox block
whileBlocking( chkShowTileInfo )->setChecked( mMap->showTerrainTilesInfo() );
whileBlocking( chkShowBoundingBoxes )->setChecked( mMap->showTerrainBoundingBoxes() );
whileBlocking( chkShowCameraViewCenter )->setChecked( mMap->showCameraViewCenter() );
@ -79,6 +89,7 @@ void Qgs3DDebugWidget::setMapSettings( Qgs3DMapSettings *mapSettings )
connect( chkStopUpdates, &QCheckBox::toggled, this, [ = ]( const bool enabled ) {mMap->setStopUpdates( enabled ); } );
connect( chkDebugOverlay, &QCheckBox::toggled, this, [ = ]( const bool enabled ) {mMap->setIsDebugOverlayEnabled( enabled ); } );
// set up the shadow map block
whileBlocking( mDebugShadowMapGroupBox )->setChecked( mMap->debugShadowMapEnabled() );
whileBlocking( mDebugShadowMapCornerComboBox )->setCurrentIndex( mMap->debugShadowMapCorner() );
whileBlocking( mDebugShadowMapSizeSpinBox )->setValue( mMap->debugShadowMapSize() );
@ -96,6 +107,7 @@ void Qgs3DDebugWidget::setMapSettings( Qgs3DMapSettings *mapSettings )
mMap->setDebugShadowMapSettings( mDebugShadowMapGroupBox->isChecked() && mMap->shadowSettings().renderShadows(), static_cast<Qt::Corner>( mDebugShadowMapCornerComboBox->currentIndex() ), value );
} );
// set up the depth map block
whileBlocking( mDebugDepthMapGroupBox )->setChecked( mMap->debugDepthMapEnabled() );
whileBlocking( mDebugDepthMapCornerComboBox )->setCurrentIndex( mMap->debugDepthMapCorner() );
whileBlocking( mDebugDepthMapSizeSpinBox )->setValue( mMap->debugDepthMapSize() );
@ -111,16 +123,75 @@ void Qgs3DDebugWidget::setMapSettings( Qgs3DMapSettings *mapSettings )
{
mMap->setDebugDepthMapSettings( mDebugDepthMapGroupBox->isChecked(), static_cast<Qt::Corner>( mDebugDepthMapCornerComboBox->currentIndex() ), value );
} );
// connect signals emitted by castCameraInputValue
connect( this, &Qgs3DDebugWidget::nearPlaneChanged, m3DMapCanvas->cameraController()->camera(), &Qt3DRender::QCamera::setNearPlane );
connect( this, &Qgs3DDebugWidget::farPlaneChanged, m3DMapCanvas->cameraController()->camera(), &Qt3DRender::QCamera::setFarPlane );
connect( this, &Qgs3DDebugWidget::positionChanged, m3DMapCanvas->cameraController()->camera(), &Qt3DRender::QCamera::setPosition );
}
void Qgs3DDebugWidget::updateFromCamera() const
{
mNearPlane->setValue( m3DMapCanvas->cameraController()->camera()->nearPlane() );
mFarPlane->setValue( m3DMapCanvas->cameraController()->camera()->farPlane() );
mCameraX->setValue( m3DMapCanvas->cameraController()->camera()->position().x() );
mCameraY->setValue( m3DMapCanvas->cameraController()->camera()->position().y() );
mCameraZ->setValue( m3DMapCanvas->cameraController()->camera()->position().z() );
mLookingX->setValue( m3DMapCanvas->cameraController()->lookingAtPoint().x() );
mLookingY->setValue( m3DMapCanvas->cameraController()->lookingAtPoint().y() );
mLookingZ->setValue( m3DMapCanvas->cameraController()->lookingAtPoint().z() );
whileBlocking( mNearPlane )->setValue( m3DMapCanvas->cameraController()->camera()->nearPlane() );
whileBlocking( mFarPlane )->setValue( m3DMapCanvas->cameraController()->camera()->farPlane() );
whileBlocking( mCameraX )->setValue( m3DMapCanvas->cameraController()->camera()->position().x() );
whileBlocking( mCameraY )->setValue( m3DMapCanvas->cameraController()->camera()->position().y() );
whileBlocking( mCameraZ )->setValue( m3DMapCanvas->cameraController()->camera()->position().z() );
whileBlocking( mLookingX )->setValue( m3DMapCanvas->cameraController()->lookingAtPoint().x() );
whileBlocking( mLookingY )->setValue( m3DMapCanvas->cameraController()->lookingAtPoint().y() );
whileBlocking( mLookingZ )->setValue( m3DMapCanvas->cameraController()->lookingAtPoint().z() );
}
void Qgs3DDebugWidget::castCameraInputValue( const double value )
{
if ( sender() == mCameraX || sender() == mCameraY || sender() == mCameraZ )
{
auto *newPosition = new QVector3D( m3DMapCanvas->cameraController()->camera()->position().x(), m3DMapCanvas->cameraController()->camera()->position().y(), m3DMapCanvas->cameraController()->camera()->position().z() );
if ( sender() == mCameraX )
{
newPosition->setX( static_cast<float>( value ) );
emit positionChanged( *newPosition );
}
else if ( sender() == mCameraY )
{
newPosition->setY( static_cast<float>( value ) );
emit positionChanged( *newPosition );
}
else if ( sender() == mCameraZ )
{
newPosition->setZ( static_cast<float>( value ) );
emit positionChanged( *newPosition );
}
}
else if ( sender() == mLookingX || sender() == mLookingY || sender() == mLookingZ )
{
const float distance = m3DMapCanvas->cameraController()->distance();
const float pitch = m3DMapCanvas->cameraController()->pitch();
const float yaw = m3DMapCanvas->cameraController()->yaw();
QgsVector3D newLookingAt =
m3DMapCanvas->cameraController()->lookingAtPoint();
if ( sender() == mLookingX )
{
newLookingAt.setX( value );
m3DMapCanvas->cameraController()->setLookingAtPoint( newLookingAt, distance, pitch, yaw );
}
else if ( sender() == mLookingY )
{
newLookingAt.setY( value );
m3DMapCanvas->cameraController()->setLookingAtPoint( newLookingAt, distance, pitch, yaw );
}
else if ( sender() == mLookingZ )
{
newLookingAt.setZ( value );
m3DMapCanvas->cameraController()->setLookingAtPoint( newLookingAt, distance, pitch, yaw );
}
}
else if ( sender() == mNearPlane )
{
emit nearPlaneChanged( static_cast<float>( value ) );
}
else if ( sender() == mFarPlane )
{
emit farPlaneChanged( static_cast<float>( value ) );
}
}

24
src/app/3d/qgs3ddebugwidget.h
View File

@ -34,6 +34,23 @@ class Qgs3DDebugWidget : public QWidget, Ui::Q3DDebugWidget
*/
void setMapSettings( Qgs3DMapSettings *mapSettings );
signals:
/**
* Emitted when the near plane value is changed by user in the QDoubleSpinBox widget.
*/
void nearPlaneChanged( float value );
/**
* Emitted when the far plane value is changed by user in the QDoubleSpinBox widget.
*/
void farPlaneChanged( float value );
/**
* Emitted when the camera position value is changed by user in the QDoubleSpinBox widget.
*/
void positionChanged( const QVector3D &position );
public slots:
/**
@ -41,6 +58,13 @@ class Qgs3DDebugWidget : public QWidget, Ui::Q3DDebugWidget
*/
void updateFromCamera() const;
private slots:
/**
* Necessary function which casts the new camera info value from signals and either emits new signals or changes the values directly.
*/
void castCameraInputValue( double value );
private:
Qgs3DMapSettings *mMap = nullptr;
Qgs3DMapCanvas *m3DMapCanvas = nullptr;

2
src/app/3d/qgs3dmapcanvaswidget.cpp
View File

@ -429,10 +429,10 @@ void Qgs3DMapCanvasWidget::setMapSettings( Qgs3DMapSettings *map )
whileBlocking( mActionSync3DNavTo2D )->setChecked( map->viewSyncMode().testFlag( Qgis::ViewSyncModeFlag::Sync3DTo2D ) );
whileBlocking( mShowFrustumPolyogon )->setChecked( map->viewFrustumVisualizationEnabled() );
mCanvas->setMapSettings( map );
connect( map, &Qgs3DMapSettings::showDebugPanelChanged, this, qOverload<bool>( &Qgs3DMapCanvasWidget::toggleDebugWidget ) );
toggleDebugWidget( map->showDebugPanel() );
mDebugWidget->setMapSettings( map );
mCanvas->setMapSettings( map );
connect( mCanvas->scene(), &Qgs3DMapScene::totalPendingJobsCountChanged, this, &Qgs3DMapCanvasWidget::onTotalPendingJobsCountChanged );
connect( mCanvas->scene(), &Qgs3DMapScene::gpuMemoryLimitReached, this, &Qgs3DMapCanvasWidget::onGpuMemoryLimitReached );