diff --git a/models/dave_object_models/models/niskin/model.config b/models/dave_object_models/models/niskin/model.config new file mode 100644 index 00000000..f6346a43 --- /dev/null +++ b/models/dave_object_models/models/niskin/model.config @@ -0,0 +1,9 @@ + + + Niskin + 1.0 + model.sdf + + Niskin sampling bottle + + diff --git a/models/dave_object_models/models/niskin/model.sdf b/models/dave_object_models/models/niskin/model.sdf new file mode 100644 index 00000000..972e4aef --- /dev/null +++ b/models/dave_object_models/models/niskin/model.sdf @@ -0,0 +1,55 @@ + + + + false + + + 0.001636 -0.004927 0.001843 + 0.008183 + + 0.000173 + 0.000172 + 0.000022 + + + + 0 0 0 0 0 0 + + + https://fuel.ignitionrobotics.org/1.0/cole/models/niskin/3/files/meshes/niskin.dae + 1.0 1.0 1.0 + + + + + + + https://fuel.ignitionrobotics.org/1.0/cole/models/niskin/3/files/meshes/niskin.dae + + Niskin +
false
+
+
+
+ + 1.0 1.0 1.0 + 1.0 1.0 1.0 + + + https://fuel.ignitionrobotics.org/1.0/cole/models/niskin/3/files/materials/textures/Niskin_Albedo.png + https://fuel.ignitionrobotics.org/1.0/cole/models/niskin/3/files/materials/textures/Niskin_Normal.png + https://fuel.ignitionrobotics.org/1.0/cole/models/niskin/3/files/materials/textures/Niskin_Metalness.png + https://fuel.ignitionrobotics.org/1.0/cole/models/niskin/3/files/materials/textures/Niskin_Roughness.png + + + + + +
+ +
+
diff --git a/models/dave_object_models/models/sunken_vase/model.config b/models/dave_object_models/models/sunken_vase/model.config new file mode 100644 index 00000000..197af9e0 --- /dev/null +++ b/models/dave_object_models/models/sunken_vase/model.config @@ -0,0 +1,15 @@ + + + + Vase + 1.0 + model.sdf + + + Cole Biesemeyer + cole@openrobotics.org + + + + + diff --git a/models/dave_object_models/models/sunken_vase/model.sdf b/models/dave_object_models/models/sunken_vase/model.sdf new file mode 100644 index 00000000..ce726694 --- /dev/null +++ b/models/dave_object_models/models/sunken_vase/model.sdf @@ -0,0 +1,54 @@ + + + + false + + + 0.000000 0.00014473 0.28908009 + 0.047262 + + 0.002228 + 0.002315 + 0.002557 + + + + 0 0 0 0 0 0 + + + https://fuel.ignitionrobotics.org/1.0/cole/models/sunken vase/3/files/meshes/Pot01.dae + 1.0 1.0 1.0 + + + + + + + https://fuel.ignitionrobotics.org/1.0/cole/models/sunken vase/3/files/meshes/Pot01.dae + + Pot01 +
false
+
+
+
+ + 1.0 1.0 1.0 + 1.0 1.0 1.0 + + + https://fuel.ignitionrobotics.org/1.0/cole/models/sunken vase/3/files/materials/textures/Pot01_Albedo.png + https://fuel.ignitionrobotics.org/1.0/cole/models/sunken vase/3/files/materials/textures/Pot01_Normal.png + https://fuel.ignitionrobotics.org/1.0/cole/models/sunken vase/3/files/materials/textures/Pot01_Roughness.png + + + + + +
+ +
+
diff --git a/models/dave_worlds/worlds/dave_ocean_models.world b/models/dave_worlds/worlds/dave_ocean_models.world index 98fc34fa..810956ce 100644 --- a/models/dave_worlds/worlds/dave_ocean_models.world +++ b/models/dave_worlds/worlds/dave_ocean_models.world @@ -168,5 +168,35 @@ model://uxo_c + + 13 -7 -94 0 0 0 + + + model://sunken_vase + + + + + + + 13 -9 -94 0 0 0 + + + model://niskin + + + + 13 -12 -94 0 0 0 + https://fuel.ignitionrobotics.org/1.0/Cole/models/Lionfish + + + + 35 -10 -94 0 0 0 + https://fuel.ignitionrobotics.org/1.0/Cole/models/Sunken Ship + +