qgsterraingenerator: Use Qgs3DUtils

ptitjano · troopa81 · commit 50f3420bced9 · 2023-03-20T15:06:25.000+01:00
diff --git a/src/3d/terrain/qgsterraingenerator.cpp b/src/3d/terrain/qgsterraingenerator.cpp
@@ -26,8 +26,7 @@ QgsAABB QgsTerrainGenerator::rootChunkBbox( const Qgs3DMapSettings &map ) const
 
   float hMin, hMax;
   rootChunkHeightRange( hMin, hMax );
-  return QgsAABB( te.xMinimum() - map.origin().x(), hMin * map.terrainVerticalScale(), -te.yMaximum() + map.origin().y(),
-                  te.xMaximum() - map.origin().x(), hMax * map.terrainVerticalScale(), -te.yMinimum() + map.origin().y() );
+  return Qgs3DUtils::mapToWorldExtent( te, hMin * map.terrainVerticalScale(), hMax * map.terrainVerticalScale(), map.origin() );
 }
 
 float QgsTerrainGenerator::rootChunkError( const Qgs3DMapSettings &map ) const

Original file line number	Diff line number	Diff line change
`@@ -26,8 +26,7 @@ QgsAABB QgsTerrainGenerator::rootChunkBbox( const Qgs3DMapSettings &map ) const`
`26`	`26`
`27`	`27`	`float hMin, hMax;`
`28`	`28`	`rootChunkHeightRange( hMin, hMax );`
`29`		`- return QgsAABB( te.xMinimum() - map.origin().x(), hMin * map.terrainVerticalScale(), -te.yMaximum() + map.origin().y(),`
`30`		`- te.xMaximum() - map.origin().x(), hMax * map.terrainVerticalScale(), -te.yMinimum() + map.origin().y() );`
	`29`	`+ return Qgs3DUtils::mapToWorldExtent( te, hMin * map.terrainVerticalScale(), hMax * map.terrainVerticalScale(), map.origin() );`
`31`	`30`	`}`
`32`	`31`
`33`	`32`	`float QgsTerrainGenerator::rootChunkError( const Qgs3DMapSettings &map ) const`