check assimp ver

Signed-off-by: Ian Chen <ichen@openrobotics.org>
gazebosim · Mar 1, 2024 · eac2ef0 · eac2ef0
1 parent 98a9aaf
commit eac2ef0
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/graphics/src/AssimpLoader.cc b/graphics/src/AssimpLoader.cc
@@ -363,6 +363,7 @@ MaterialPtr AssimpLoader::Implementation::CreateMaterial(
     mat->SetBlendFactors(opacity, 1.0 - opacity);
   }
 
+#ifndef GZ_ASSIMP_PRE_5_1_0
   // basic support for transmission - currently just overrides opacity
   // \todo(iche033) The transmission factor can be used with volume
   // material extension to simulate effects like refraction
@@ -374,6 +375,7 @@ MaterialPtr AssimpLoader::Implementation::CreateMaterial(
   {
     mat->SetTransparency(transmission);
   }
+#endif
 
   // TODO(luca) more than one texture, Gazebo assumes UV index 0
   Pbr pbr;

diff --git a/graphics/src/AssimpLoader_TEST.cc b/graphics/src/AssimpLoader_TEST.cc
@@ -669,6 +669,7 @@ TEST_F(AssimpLoader, LoadGlTF2BoxExternalTexture)
 // Open a gltf mesh with transmission extension
 TEST_F(AssimpLoader, LoadGlTF2BoxTransmission)
 {
+#ifdef GZ_ASSIMP_PRE_5_1_0
   common::AssimpLoader loader;
   common::Mesh *mesh = loader.Load(
       common::testing::TestFile("data", "box_transmission.glb"));
@@ -685,6 +686,7 @@ TEST_F(AssimpLoader, LoadGlTF2BoxTransmission)
   // transmission currently modeled as transparency
   EXPECT_FLOAT_EQ(0.1, mat->Transparency());
   delete mesh;
+#endif
 }
 
 /////////////////////////////////////////////////

diff --git a/graphics/src/CMakeLists.txt b/graphics/src/CMakeLists.txt
@@ -29,16 +29,22 @@ gz_build_tests(
 )
 
 # Assimp doesn't offer preprocessor version, use cmake to set a compatibility
-# mode for versions below 5.2.0
+# mode for versions below 5.2.0 and 5.1.0
 if(${GzAssimp_VERSION} STRLESS "5.2.0")
   message("Warning, assimp below 5.2.0 detected, setting compatibility mode")
   target_compile_definitions(${graphics_target} PRIVATE GZ_ASSIMP_PRE_5_2_0)
   if(TARGET UNIT_AssimpLoader_TEST)
     target_compile_definitions(UNIT_AssimpLoader_TEST PRIVATE GZ_ASSIMP_PRE_5_2_0)
   endif()
+  if(${GzAssimp_VERSION} STRLESS "5.1.0")
+    message("Warning, assimp below 5.1.0 detected, setting compatibility mode")
+    target_compile_definitions(${graphics_target} PRIVATE GZ_ASSIMP_PRE_5_1_0)
+    if(TARGET UNIT_AssimpLoader_TEST)
+      target_compile_definitions(UNIT_AssimpLoader_TEST PRIVATE GZ_ASSIMP_PRE_5_1_0)
+    endif()
+  endif()
 endif()
 
-
 if(USE_EXTERNAL_TINYXML2)
 
   # If we are using an external copy of tinyxml2, add its imported target