Change to std::get_if for gz::rendering::Variant for throwless behaviour (#1124)

dheerubhai-101 · web-flow · commit 99031b74bd8b · 2025-05-02T14:38:01.000-07:00
Signed-off-by: kurohane &lt;dheerusatya.01@gmail.com&gt;
diff --git a/ogre/src/OgreThermalCamera.cc b/ogre/src/OgreThermalCamera.cc
@@ -24,6 +24,7 @@
 #endif
 
 #include <limits>
+#include <variant>
 
 #include <gz/math/Helpers.hh>
 #include "gz/rendering/ShaderParams.hh"
@@ -218,29 +219,23 @@ Ogre::Technique *OgreThermalCameraMaterialSwitcher::handleSchemeNotFound(
   Variant tempAny = ogreVisual->UserData(tempKey);
   if (tempAny.index() != 0)
   {
-    float temp = -1;
-    try
+    float temp = -1.0f;
+    if (const float* floatPtr = std::get_if<float>(&tempAny))
+    {
+      temp = *floatPtr;
+    }
+    else if (const double* doublePtr = std::get_if<double>(&tempAny))
+    {
+      temp = static_cast<float>(*doublePtr);
+    }
+    else if (const int* intPtr = std::get_if<int>(&tempAny))
     {
-      temp = std::get<float>(tempAny);
+      temp = static_cast<float>(*intPtr);
     }
-    catch(...)
+    else
     {
-      try
-      {
-        temp = static_cast<float>(std::get<double>(tempAny));
-      }
-      catch(...)
-      {
-        try
-        {
-          temp = static_cast<float>(std::get<int>(tempAny));
-        }
-        catch(std::bad_variant_access &e)
-        {
-          gzerr << "Error casting user data: " << e.what() << "\n";
-          temp = -1.0;
-        }
-      }
+      gzerr << "Error casting user data: variant containers unexpected type\n";
+      temp = -1.0;
     }
 
     // only accept positive temperature (in kelvin)
diff --git a/ogre2/src/Ogre2BoundingBoxMaterialSwitcher.cc b/ogre2/src/Ogre2BoundingBoxMaterialSwitcher.cc
@@ -14,6 +14,9 @@
  * limitations under the License.
  *
 */
+
+#include <variant>
+
 #include "Ogre2BoundingBoxMaterialSwitcher.hh"
 
 #include "gz/rendering/ogre2/Ogre2Scene.hh"
@@ -115,16 +118,12 @@ void Ogre2BoundingBoxMaterialSwitcher::cameraPreRenderScene(
 
       // get class user data
       Variant labelAny = ogreVisual->UserData(this->labelKey);
-
+      // set default label to background
       int label = this->backgroundLabel;
-      try
-      {
-        label = std::get<int>(labelAny);
-      }
-      catch(std::bad_variant_access &e)
+      // if not background, then modify to label
+      if (const int* labelPtr = std::get_if<int>(&labelAny))
       {
-        // items with no class are considered background
-        label = this->backgroundLabel;
+        label = *labelPtr;
       }
 
       // for full bbox, each pixel contains 1 channel for label
diff --git a/ogre2/src/Ogre2GpuRays.cc b/ogre2/src/Ogre2GpuRays.cc
@@ -15,6 +15,8 @@
  *
 */
 
+#include <variant>
+
 #include <gz/math/Vector2.hh>
 #include <gz/math/Vector3.hh>
 
@@ -326,18 +328,17 @@ void Ogre2LaserRetroMaterialSwitcher::passPreExecute(
       {
         // get laser_retro
         Variant tempLaserRetro = ogreVisual->UserData(laserRetroKey);
-
-        if (std::holds_alternative<float>(tempLaserRetro))
+        if (const float* floatPtr = std::get_if<float>(&tempLaserRetro))
         {
-          retroValue = std::get<float>(tempLaserRetro);
+          retroValue = *floatPtr;
         }
-        else if (std::holds_alternative<double>(tempLaserRetro))
+        else if (const double* doublePtr = std::get_if<double>(&tempLaserRetro))
         {
-          retroValue = static_cast<float>(std::get<double>(tempLaserRetro));
+          retroValue = static_cast<float>(*doublePtr);
         }
-        else if (std::holds_alternative<int>(tempLaserRetro))
+        else if (const int* intPtr = std::get_if<int>(&tempLaserRetro))
         {
-          retroValue = static_cast<float>(std::get<int>(tempLaserRetro));
+          retroValue = static_cast<float>(*intPtr);
         }
         else
         {
@@ -442,17 +443,17 @@ void Ogre2LaserRetroMaterialSwitcher::passPreExecute(
         // get laser_retro
         Variant tempLaserRetro = visual->UserData(laserRetroKey);
 
-        if (std::holds_alternative<float>(tempLaserRetro))
+        if (const float* floatPtr = std::get_if<float>(&tempLaserRetro))
         {
-          retroValue = std::get<float>(tempLaserRetro);
+          retroValue = *floatPtr;
         }
-        else if (std::holds_alternative<double>(tempLaserRetro))
+        else if (const double* doublePtr = std::get_if<double>(&tempLaserRetro))
         {
-          retroValue = static_cast<float>(std::get<double>(tempLaserRetro));
+          retroValue = static_cast<float>(*doublePtr);
         }
-        else if (std::holds_alternative<int>(tempLaserRetro))
+        else if (const int* intPtr = std::get_if<int>(&tempLaserRetro))
         {
-          retroValue = static_cast<float>(std::get<int>(tempLaserRetro));
+          retroValue = static_cast<float>(*intPtr);
         }
         else
         {
diff --git a/ogre2/src/Ogre2SegmentationMaterialSwitcher.cc b/ogre2/src/Ogre2SegmentationMaterialSwitcher.cc
@@ -20,6 +20,7 @@
 #include <algorithm>
 #include <utility>
 #include <vector>
+#include <variant>
 
 #include <gz/common/Console.hh>
 
@@ -86,11 +87,11 @@ Ogre::Vector4 Ogre2SegmentationMaterialSwitcher::ColorForVisual(
   // get class user data
   Variant labelAny = _visual->UserData("label");
   int label;
-  try
+  if (const int* labelPtr = std::get_if<int>(&labelAny))
   {
-    label = std::get<int>(labelAny);
+    label = *labelPtr;
   }
-  catch (std::bad_variant_access &)
+  else
   {
     // items with no class are considered background
     label = this->segmentationCamera->BackgroundLabel();
diff --git a/ogre2/src/Ogre2ThermalCamera.cc b/ogre2/src/Ogre2ThermalCamera.cc
@@ -281,17 +281,17 @@ void Ogre2ThermalCameraMaterialSwitcher::cameraPreRenderScene(
       {
         float temp = -1.0f;
         bool foundTemp = true;
-        if (std::holds_alternative<float>(tempAny))
+        if (const float* floatPtr = std::get_if<float>(&tempAny))
         {
-          temp = std::get<float>(tempAny);
+          temp = *floatPtr;
         }
-        else if (std::holds_alternative<double>(tempAny))
+        else if (const double* doublePtr = std::get_if<double>(&tempAny))
         {
-          temp = static_cast<float>(std::get<double>(tempAny));
+          temp = static_cast<float>(*doublePtr);
         }
-        else if (std::holds_alternative<int>(tempAny))
+        else if (const int* intPtr = std::get_if<int>(&tempAny))
         {
-          temp = static_cast<float>(std::get<int>(tempAny));
+          temp = static_cast<float>(*intPtr);
         }
         else
         {
@@ -554,17 +554,17 @@ void Ogre2ThermalCameraMaterialSwitcher::cameraPreRenderScene(
       {
         float temp = -1.0;
         bool foundTemp = true;
-        if (std::holds_alternative<float>(tempAny))
+        if (const float* floatPtr = std::get_if<float>(&tempAny))
         {
-          temp = std::get<float>(tempAny);
+          temp = *floatPtr;
         }
-        else if (std::holds_alternative<double>(tempAny))
+        else if (const double* doublePtr = std::get_if<double>(&tempAny))
         {
-          temp = static_cast<float>(std::get<double>(tempAny));
+          temp = static_cast<float>(*doublePtr);
         }
-        else if (std::holds_alternative<int>(tempAny))
+        else if (const int* intPtr = std::get_if<int>(&tempAny))
         {
-          temp = static_cast<float>(std::get<int>(tempAny));
+          temp = static_cast<float>(*intPtr);
         }
         else
         {

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,8 @@`
`15`	`15`	`*`
`16`	`16`	`*/`
`17`	`17`
	`18`	`+#include <variant>`
	`19`	`+`
`18`	`20`	`#include <gz/math/Vector2.hh>`
`19`	`21`	`#include <gz/math/Vector3.hh>`
`20`	`22`
`@@ -326,18 +328,17 @@ void Ogre2LaserRetroMaterialSwitcher::passPreExecute(`
`326`	`328`	`{`
`327`	`329`	`// get laser_retro`
`328`	`330`	`Variant tempLaserRetro = ogreVisual->UserData(laserRetroKey);`
`329`		`-`
`330`		`- if (std::holds_alternative<float>(tempLaserRetro))`
	`331`	`+ if (const float* floatPtr = std::get_if<float>(&tempLaserRetro))`
`331`	`332`	`{`
`332`		`- retroValue = std::get<float>(tempLaserRetro);`
	`333`	`+ retroValue = *floatPtr;`
`333`	`334`	`}`
`334`		`- else if (std::holds_alternative<double>(tempLaserRetro))`
	`335`	`+ else if (const double* doublePtr = std::get_if<double>(&tempLaserRetro))`
`335`	`336`	`{`
`336`		`- retroValue = static_cast<float>(std::get<double>(tempLaserRetro));`
	`337`	`+ retroValue = static_cast<float>(*doublePtr);`
`337`	`338`	`}`
`338`		`- else if (std::holds_alternative<int>(tempLaserRetro))`
	`339`	`+ else if (const int* intPtr = std::get_if<int>(&tempLaserRetro))`
`339`	`340`	`{`
`340`		`- retroValue = static_cast<float>(std::get<int>(tempLaserRetro));`
	`341`	`+ retroValue = static_cast<float>(*intPtr);`
`341`	`342`	`}`
`342`	`343`	`else`
`343`	`344`	`{`
`@@ -442,17 +443,17 @@ void Ogre2LaserRetroMaterialSwitcher::passPreExecute(`
`442`	`443`	`// get laser_retro`
`443`	`444`	`Variant tempLaserRetro = visual->UserData(laserRetroKey);`
`444`	`445`
`445`		`- if (std::holds_alternative<float>(tempLaserRetro))`
	`446`	`+ if (const float* floatPtr = std::get_if<float>(&tempLaserRetro))`
`446`	`447`	`{`
`447`		`- retroValue = std::get<float>(tempLaserRetro);`
	`448`	`+ retroValue = *floatPtr;`
`448`	`449`	`}`
`449`		`- else if (std::holds_alternative<double>(tempLaserRetro))`
	`450`	`+ else if (const double* doublePtr = std::get_if<double>(&tempLaserRetro))`
`450`	`451`	`{`
`451`		`- retroValue = static_cast<float>(std::get<double>(tempLaserRetro));`
	`452`	`+ retroValue = static_cast<float>(*doublePtr);`
`452`	`453`	`}`
`453`		`- else if (std::holds_alternative<int>(tempLaserRetro))`
	`454`	`+ else if (const int* intPtr = std::get_if<int>(&tempLaserRetro))`
`454`	`455`	`{`
`455`		`- retroValue = static_cast<float>(std::get<int>(tempLaserRetro));`
	`456`	`+ retroValue = static_cast<float>(*intPtr);`
`456`	`457`	`}`
`457`	`458`	`else`
`458`	`459`	`{`
Original file line number	Diff line number	Diff line change
`@@ -281,17 +281,17 @@ void Ogre2ThermalCameraMaterialSwitcher::cameraPreRenderScene(`
`281`	`281`	`{`
`282`	`282`	`float temp = -1.0f;`
`283`	`283`	`bool foundTemp = true;`
`284`		`- if (std::holds_alternative<float>(tempAny))`
	`284`	`+ if (const float* floatPtr = std::get_if<float>(&tempAny))`
`285`	`285`	`{`
`286`		`- temp = std::get<float>(tempAny);`
	`286`	`+ temp = *floatPtr;`
`287`	`287`	`}`
`288`		`- else if (std::holds_alternative<double>(tempAny))`
	`288`	`+ else if (const double* doublePtr = std::get_if<double>(&tempAny))`
`289`	`289`	`{`
`290`		`- temp = static_cast<float>(std::get<double>(tempAny));`
	`290`	`+ temp = static_cast<float>(*doublePtr);`
`291`	`291`	`}`
`292`		`- else if (std::holds_alternative<int>(tempAny))`
	`292`	`+ else if (const int* intPtr = std::get_if<int>(&tempAny))`
`293`	`293`	`{`
`294`		`- temp = static_cast<float>(std::get<int>(tempAny));`
	`294`	`+ temp = static_cast<float>(*intPtr);`
`295`	`295`	`}`
`296`	`296`	`else`
`297`	`297`	`{`
`@@ -554,17 +554,17 @@ void Ogre2ThermalCameraMaterialSwitcher::cameraPreRenderScene(`
`554`	`554`	`{`
`555`	`555`	`float temp = -1.0;`
`556`	`556`	`bool foundTemp = true;`
`557`		`- if (std::holds_alternative<float>(tempAny))`
	`557`	`+ if (const float* floatPtr = std::get_if<float>(&tempAny))`
`558`	`558`	`{`
`559`		`- temp = std::get<float>(tempAny);`
	`559`	`+ temp = *floatPtr;`
`560`	`560`	`}`
`561`		`- else if (std::holds_alternative<double>(tempAny))`
	`561`	`+ else if (const double* doublePtr = std::get_if<double>(&tempAny))`
`562`	`562`	`{`
`563`		`- temp = static_cast<float>(std::get<double>(tempAny));`
	`563`	`+ temp = static_cast<float>(*doublePtr);`
`564`	`564`	`}`
`565`		`- else if (std::holds_alternative<int>(tempAny))`
	`565`	`+ else if (const int* intPtr = std::get_if<int>(&tempAny))`
`566`	`566`	`{`
`567`		`- temp = static_cast<float>(std::get<int>(tempAny));`
	`567`	`+ temp = static_cast<float>(*intPtr);`
`568`	`568`	`}`
`569`	`569`	`else`
`570`	`570`	`{`