Merge pull request #5587 from nyalldawson/3d

nyalldawson · web-flow · commit 992d1e26bdd9 · 2017-11-11T07:31:21.000+11:00
Fix 3d renderer does not work with multi-point layers
diff --git a/src/3d/qgs3dutils.cpp b/src/3d/qgs3dutils.cpp
@@ -172,14 +172,15 @@ QList<QVector3D> Qgs3DUtils::positions( const Qgs3DMapSettings &map, QgsVectorLa
       continue;
 
     const QgsAbstractGeometry *g = f.geometry().constGet();
-    if ( const QgsPoint *pt = qgsgeometry_cast< const QgsPoint *>( g ) )
+    for ( auto it = g->vertices_begin(); it != g->vertices_end(); ++it )
     {
+      QgsPoint pt = *it;
       float geomZ = 0;
-      if ( pt->is3D() )
+      if ( pt.is3D() )
       {
-        geomZ = pt->z();
+        geomZ = pt.z();
       }
-      float terrainZ = map.terrainGenerator()->heightAt( pt->x(), pt->y(), map ) * map.terrainVerticalScale();
+      float terrainZ = map.terrainGenerator()->heightAt( pt.x(), pt.y(), map ) * map.terrainVerticalScale();
       float h;
       switch ( altClamp )
       {
@@ -193,11 +194,9 @@ QList<QVector3D> Qgs3DUtils::positions( const Qgs3DMapSettings &map, QgsVectorLa
           h = terrainZ + geomZ;
           break;
       }
-      positions.append( QVector3D( pt->x() - map.originX(), h, -( pt->y() - map.originY() ) ) );
+      positions.append( QVector3D( pt.x() - map.originX(), h, -( pt.y() - map.originY() ) ) );
       //qDebug() << positions.last();
     }
-    else
-      qDebug() << "not a point";
   }
 
   return positions;
diff --git a/src/3d/qgs3dutils.h b/src/3d/qgs3dutils.h
@@ -75,7 +75,7 @@ class _3D_EXPORT Qgs3DUtils
     static QMatrix4x4 stringToMatrix4x4( const QString &str );
 
     /**
-     * Calculates (x,y,z) position of point in the Point vector layers
+     * Calculates (x,y,z) positions of a (multi)point in the Point vector layers
      */
     static QList<QVector3D> positions( const Qgs3DMapSettings &map, QgsVectorLayer *layer, const QgsFeatureRequest &req, AltitudeClamping altClamp );
 
diff --git a/src/app/3d/qgsline3dsymbolwidget.cpp b/src/app/3d/qgsline3dsymbolwidget.cpp
@@ -23,6 +23,10 @@ QgsLine3DSymbolWidget::QgsLine3DSymbolWidget( QWidget *parent )
 {
   setupUi( this );
 
+  spinHeight->setClearValue( 0.0 );
+  spinWidth->setClearValue( 0.0 );
+  spinExtrusion->setClearValue( 0.0 );
+
   setSymbol( QgsLine3DSymbol() );
 
   connect( spinWidth, static_cast<void ( QDoubleSpinBox::* )( double )>( &QDoubleSpinBox::valueChanged ), this, &QgsLine3DSymbolWidget::changed );
diff --git a/src/app/3d/qgspoint3dsymbolwidget.cpp b/src/app/3d/qgspoint3dsymbolwidget.cpp
@@ -25,6 +25,16 @@ QgsPoint3DSymbolWidget::QgsPoint3DSymbolWidget( QWidget *parent )
 {
   setupUi( this );
 
+  spinTX->setClearValue( 0.0 );
+  spinTY->setClearValue( 0.0 );
+  spinTZ->setClearValue( 0.0 );
+  spinSX->setClearValue( 1.0 );
+  spinSY->setClearValue( 1.0 );
+  spinSZ->setClearValue( 1.0 );
+  spinRX->setClearValue( 0.0 );
+  spinRY->setClearValue( 0.0 );
+  spinRZ->setClearValue( 0.0 );
+
   cboShape->addItem( tr( "Sphere" ), QgsPoint3DSymbol::Sphere );
   cboShape->addItem( tr( "Cylinder" ), QgsPoint3DSymbol::Cylinder );
   cboShape->addItem( tr( "Cube" ), QgsPoint3DSymbol::Cube );
diff --git a/src/app/3d/qgspolygon3dsymbolwidget.cpp b/src/app/3d/qgspolygon3dsymbolwidget.cpp
@@ -22,6 +22,8 @@ QgsPolygon3DSymbolWidget::QgsPolygon3DSymbolWidget( QWidget *parent )
   : QWidget( parent )
 {
   setupUi( this );
+  spinHeight->setClearValue( 0.0 );
+  spinExtrusion->setClearValue( 0.0 );
 
   setSymbol( QgsPolygon3DSymbol(), nullptr );
 

Original file line number	Diff line number	Diff line change
`@@ -172,14 +172,15 @@ QList<QVector3D> Qgs3DUtils::positions( const Qgs3DMapSettings &map, QgsVectorLa`
`172`	`172`	`continue;`
`173`	`173`
`174`	`174`	`const QgsAbstractGeometry *g = f.geometry().constGet();`
`175`		`- if ( const QgsPoint pt = qgsgeometry_cast< const QgsPoint >( g ) )`
	`175`	`+ for ( auto it = g->vertices_begin(); it != g->vertices_end(); ++it )`
`176`	`176`	`{`
	`177`	`+ QgsPoint pt = *it;`
`177`	`178`	`float geomZ = 0;`
`178`		`- if ( pt->is3D() )`
	`179`	`+ if ( pt.is3D() )`
`179`	`180`	`{`
`180`		`- geomZ = pt->z();`
	`181`	`+ geomZ = pt.z();`
`181`	`182`	`}`
`182`		`- float terrainZ = map.terrainGenerator()->heightAt( pt->x(), pt->y(), map ) * map.terrainVerticalScale();`
	`183`	`+ float terrainZ = map.terrainGenerator()->heightAt( pt.x(), pt.y(), map ) * map.terrainVerticalScale();`
`183`	`184`	`float h;`
`184`	`185`	`switch ( altClamp )`
`185`	`186`	`{`
`@@ -193,11 +194,9 @@ QList<QVector3D> Qgs3DUtils::positions( const Qgs3DMapSettings &map, QgsVectorLa`
`193`	`194`	`h = terrainZ + geomZ;`
`194`	`195`	`break;`
`195`	`196`	`}`
`196`		`- positions.append( QVector3D( pt->x() - map.originX(), h, -( pt->y() - map.originY() ) ) );`
	`197`	`+ positions.append( QVector3D( pt.x() - map.originX(), h, -( pt.y() - map.originY() ) ) );`
`197`	`198`	`//qDebug() << positions.last();`
`198`	`199`	`}`
`199`		`- else`
`200`		`- qDebug() << "not a point";`
`201`	`200`	`}`
`202`	`201`
`203`	`202`	`return positions;`
Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,10 @@ QgsLine3DSymbolWidget::QgsLine3DSymbolWidget( QWidget *parent )`
`23`	`23`	`{`
`24`	`24`	`setupUi( this );`
`25`	`25`
	`26`	`+ spinHeight->setClearValue( 0.0 );`
	`27`	`+ spinWidth->setClearValue( 0.0 );`
	`28`	`+ spinExtrusion->setClearValue( 0.0 );`
	`29`	`+`
`26`	`30`	`setSymbol( QgsLine3DSymbol() );`
`27`	`31`
`28`	`32`	`connect( spinWidth, static_cast<void ( QDoubleSpinBox::* )( double )>( &QDoubleSpinBox::valueChanged ), this, &QgsLine3DSymbolWidget::changed );`
Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,8 @@ QgsPolygon3DSymbolWidget::QgsPolygon3DSymbolWidget( QWidget *parent )`
`22`	`22`	`: QWidget( parent )`
`23`	`23`	`{`
`24`	`24`	`setupUi( this );`
	`25`	`+ spinHeight->setClearValue( 0.0 );`
	`26`	`+ spinExtrusion->setClearValue( 0.0 );`
`25`	`27`
`26`	`28`	`setSymbol( QgsPolygon3DSymbol(), nullptr );`
`27`	`29`