qgs3dutils: Factor out culling mode enum conversion

ptitjano · nyalldawson · commit 66a8120f5ef7 · 2023-10-06T16:14:06.000+10:00
This will be used by `QgsMesh3DMaterial` in the next commmit.
diff --git a/src/3d/qgs3dutils.cpp b/src/3d/qgs3dutils.cpp
@@ -890,3 +890,15 @@ void Qgs3DUtils::computeBoundingBoxNearFarPlanes( const QgsAABB &bbox, const QMa
     ffar = std::max( ffar, dst );
   }
 }
+
+Qt3DRender::QCullFace::CullingMode Qgs3DUtils::qt3DcullingMode( Qgs3DTypes::CullingMode mode )
+{
+  switch ( mode )
+  {
+    case Qgs3DTypes::NoCulling:    return Qt3DRender::QCullFace::NoCulling;
+    case Qgs3DTypes::Front:        return Qt3DRender::QCullFace::Front;
+    case Qgs3DTypes::Back:         return Qt3DRender::QCullFace::Back;
+    case Qgs3DTypes::FrontAndBack: return Qt3DRender::QCullFace::FrontAndBack;
+  }
+  return Qt3DRender::QCullFace::NoCulling;
+}
diff --git a/src/3d/qgs3dutils.h b/src/3d/qgs3dutils.h
@@ -40,6 +40,7 @@ namespace Qt3DExtras
 
 #include <QSize>
 #include <Qt3DRender/QCamera>
+#include <Qt3DRender/QCullFace>
 
 #include <memory>
 
@@ -295,6 +296,15 @@ class _3D_EXPORT Qgs3DUtils
      * \since QGIS 3.34
      */
     static void computeBoundingBoxNearFarPlanes( const QgsAABB &bbox, const QMatrix4x4 &viewMatrix, float &fnear, float &ffar );
+
+    /**
+     * Converts Qgs3DTypes::CullingMode \a mode into its Qt3D equivalent.
+     *
+     * \param mode culling mode
+     *
+     * \since QGIS 3.34
+     */
+    static Qt3DRender::QCullFace::CullingMode qt3DcullingMode( Qgs3DTypes::CullingMode mode );
 };
 
 #endif // QGS3DUTILS_H
diff --git a/src/3d/symbols/qgspolygon3dsymbol_p.cpp b/src/3d/symbols/qgspolygon3dsymbol_p.cpp
@@ -286,19 +286,6 @@ void QgsPolygon3DSymbolHandler::makeEntity( Qt3DCore::QEntity *parent, const Qgs
 // cppcheck-suppress memleak
 }
 
-
-static Qt3DRender::QCullFace::CullingMode _qt3DcullingMode( Qgs3DTypes::CullingMode mode )
-{
-  switch ( mode )
-  {
-    case Qgs3DTypes::NoCulling:    return Qt3DRender::QCullFace::NoCulling;
-    case Qgs3DTypes::Front:        return Qt3DRender::QCullFace::Front;
-    case Qgs3DTypes::Back:         return Qt3DRender::QCullFace::Back;
-    case Qgs3DTypes::FrontAndBack: return Qt3DRender::QCullFace::FrontAndBack;
-  }
-  return Qt3DRender::QCullFace::NoCulling;
-}
-
 // front/back side culling
 static void applyCullingMode( Qgs3DTypes::CullingMode cullingMode, Qt3DRender::QMaterial *material )
 {
@@ -309,7 +296,7 @@ static void applyCullingMode( Qgs3DTypes::CullingMode cullingMode, Qt3DRender::Q
     for ( auto rpit = renderPasses.begin(); rpit != renderPasses.end(); ++rpit )
     {
       Qt3DRender::QCullFace *cullFace = new Qt3DRender::QCullFace;
-      cullFace->setMode( _qt3DcullingMode( cullingMode ) );
+      cullFace->setMode( Qgs3DUtils::qt3DcullingMode( cullingMode ) );
       ( *rpit )->addRenderState( cullFace );
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -286,19 +286,6 @@ void QgsPolygon3DSymbolHandler::makeEntity( Qt3DCore::QEntity *parent, const Qgs`
`286`	`286`	`// cppcheck-suppress memleak`
`287`	`287`	`}`
`288`	`288`
`289`		`-`
`290`		`-static Qt3DRender::QCullFace::CullingMode _qt3DcullingMode( Qgs3DTypes::CullingMode mode )`
`291`		`-{`
`292`		`- switch ( mode )`
`293`		`- {`
`294`		`- case Qgs3DTypes::NoCulling: return Qt3DRender::QCullFace::NoCulling;`
`295`		`- case Qgs3DTypes::Front: return Qt3DRender::QCullFace::Front;`
`296`		`- case Qgs3DTypes::Back: return Qt3DRender::QCullFace::Back;`
`297`		`- case Qgs3DTypes::FrontAndBack: return Qt3DRender::QCullFace::FrontAndBack;`
`298`		`- }`
`299`		`- return Qt3DRender::QCullFace::NoCulling;`
`300`		`-}`
`301`		`-`
`302`	`289`	`// front/back side culling`
`303`	`290`	`static void applyCullingMode( Qgs3DTypes::CullingMode cullingMode, Qt3DRender::QMaterial *material )`
`304`	`291`	`{`
`@@ -309,7 +296,7 @@ static void applyCullingMode( Qgs3DTypes::CullingMode cullingMode, Qt3DRender::Q`
`309`	`296`	`for ( auto rpit = renderPasses.begin(); rpit != renderPasses.end(); ++rpit )`
`310`	`297`	`{`
`311`	`298`	`Qt3DRender::QCullFace *cullFace = new Qt3DRender::QCullFace;`
`312`		`- cullFace->setMode( _qt3DcullingMode( cullingMode ) );`
	`299`	`+ cullFace->setMode( Qgs3DUtils::qt3DcullingMode( cullingMode ) );`
`313`	`300`	`( *rpit )->addRenderState( cullFace );`
`314`	`301`	`}`
`315`	`302`	`}`