Update rubber band's line material based on viewport size

qgis · Jun 18, 2021 · b304e22 · b304e22
1 parent de79264
commit b304e22
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/src/3d/qgsrubberband3d.cpp b/src/3d/qgsrubberband3d.cpp
@@ -15,6 +15,7 @@
 
 #include "qgsrubberband3d.h"
 
+#include "qgscameracontroller.h"
 #include "qgslinevertexdata_p.h"
 #include "qgsabstractmaterialsettings.h"
 #include "qgslinematerial_p.h"
@@ -33,7 +34,7 @@
 /// @cond PRIVATE
 
 
-QgsRubberBand3D::QgsRubberBand3D( Qgs3DMapSettings &map, Qt3DCore::QEntity *parentEntity )
+QgsRubberBand3D::QgsRubberBand3D( Qgs3DMapSettings &map, QgsCameraController *cameraController, Qt3DCore::QEntity *parentEntity )
 {
   mMapSettings = &map;
 
@@ -57,7 +58,12 @@ QgsRubberBand3D::QgsRubberBand3D( Qgs3DMapSettings &map, Qt3DCore::QEntity *pare
   mLineMaterial = new QgsLineMaterial;
   mLineMaterial->setLineWidth( 3 );
   mLineMaterial->setLineColor( Qt::red );
-  mLineMaterial->setViewportSize( QSize( 200, 200 ) ); // TODO: based on viewport size!
+
+  QObject::connect( cameraController, &QgsCameraController::viewportChanged, mLineMaterial, [this, cameraController]
+  {
+    mLineMaterial->setViewportSize( cameraController->viewport().size() );
+  } );
+  mLineMaterial->setViewportSize( cameraController->viewport().size() );
 
   mEntity->addComponent( mLineMaterial );
 }

diff --git a/src/3d/qgsrubberband3d.h b/src/3d/qgsrubberband3d.h
@@ -33,6 +33,7 @@
 
 #include "qgslinestring.h"
 
+class QgsCameraController;
 class QgsLineMaterial;
 class Qgs3DMapSettings;
 
@@ -63,7 +64,7 @@ namespace Qt3DRender
 class _3D_EXPORT QgsRubberBand3D
 {
   public:
-    QgsRubberBand3D( Qgs3DMapSettings &map, Qt3DCore::QEntity *parentEntity );
+    QgsRubberBand3D( Qgs3DMapSettings &map, QgsCameraController *cameraController, Qt3DCore::QEntity *parentEntity );
     ~QgsRubberBand3D();
 
     float width() const;

diff --git a/src/app/3d/qgs3dmaptoolmeasureline.cpp b/src/app/3d/qgs3dmaptoolmeasureline.cpp
@@ -74,7 +74,7 @@ void Qgs3DMapToolMeasureLine::activate()
 
   mCanvas->scene()->registerPickHandler( mPickHandler.get() );
 
-  mRubberBand.reset( new QgsRubberBand3D( *mCanvas->map(), mCanvas->scene() ) );
+  mRubberBand.reset( new QgsRubberBand3D( *mCanvas->map(), mCanvas->cameraController(), mCanvas->scene() ) );
 
   if ( mIsAlreadyActivated )
   {