Merge branch 'main' into caguero/spawn_robot

osrf · Dec 20, 2023 · 5a2e683 · 5a2e683
2 parents 915cbee + 1d525ac
commit 5a2e683
Show file tree

Hide file tree

Showing 19 changed files with 47,761 additions and 0 deletions.
diff --git a/vrx_gz/models/roboboat01/materials/scripts/model.material b/vrx_gz/models/roboboat01/materials/scripts/model.material
@@ -0,0 +1,14 @@
+
+material Fallback/Boat01_Diffuse
+{
+  technique
+  {
+    pass
+    {
+      texture_unit
+      {
+        texture Boat01_Albedo.png
+        }
+      }
+    }
+  }
diff --git a/vrx_gz/models/roboboat01/materials/textures/Boat01_Albedo.png b/vrx_gz/models/roboboat01/materials/textures/Boat01_Albedo.png
diff --git a/vrx_gz/models/roboboat01/materials/textures/Boat01_Metallic.png b/vrx_gz/models/roboboat01/materials/textures/Boat01_Metallic.png
diff --git a/vrx_gz/models/roboboat01/materials/textures/Boat01_Normal.png b/vrx_gz/models/roboboat01/materials/textures/Boat01_Normal.png
diff --git a/vrx_gz/models/roboboat01/materials/textures/Boat01_Roughness.png b/vrx_gz/models/roboboat01/materials/textures/Boat01_Roughness.png
diff --git a/vrx_gz/models/roboboat01/materials/textures/Thruster_Albedo.png b/vrx_gz/models/roboboat01/materials/textures/Thruster_Albedo.png
diff --git a/vrx_gz/models/roboboat01/materials/textures/Thruster_Roughness.png b/vrx_gz/models/roboboat01/materials/textures/Thruster_Roughness.png