Fix Heron Warnings (Port #6717) (#6742)

* Fix Heron warnings (#6717) Fix Heron warnings * print more info * use absolute path for heron protos * Revert "print more info" This reverts commit f9d5e51. * directly use water bounding boxes --------- Co-authored-by: MNikoliCC <[email protected]>
cyberbotics · Dec 27, 2024 · 65094da · 65094da
1 parent 58242dd
commit 65094da
Show file tree

Hide file tree

Showing 4 changed files with 59 additions and 27 deletions.
diff --git a/projects/robots/clearpath/heron/protos/Heron.proto b/projects/robots/clearpath/heron/protos/Heron.proto
@@ -158,15 +158,55 @@ PROTO Heron [
         viscousResistanceTorqueCoefficient 0.1
       }
     ]
-    boundingObject Transform {
-        scale 0.1 0.1 0.1
-        children [
-          Mesh {
-            url [
-              "../stl/heron_collision.stl"
-            ]
-          }
-        ]
+    boundingObject Group {
+      children [
+        Pose {
+          translation 0 -0.135 0.32
+          children [
+            Cylinder {
+              height 0.47
+              radius 0.01
+            }
+          ]
+        }
+        Pose {
+          translation 0 0.135 0.32
+          children [
+            Cylinder {
+              height 0.47
+              radius 0.01
+            }
+          ]
+        }
+        Pose {
+          translation 0 0 0.02
+          children [
+            Box {
+              size 0.9 0.6 0.12
+            }
+          ]
+        }
+        Pose {
+          translation 0.0299998 0.37 -0.09
+          rotation 0 1 0 1.5708
+          children [
+            Cylinder {
+              height 1.3
+              radius 0.14
+            }
+          ]
+        }
+        Pose {
+          translation 0.0299998 -0.37 -0.09
+          rotation 0 1 0 1.5708
+          children [
+            Cylinder {
+              height 1.3
+              radius 0.14
+            }
+          ]
+        }
+      ]
     }
     physics Physics {
       density 400

diff --git a/projects/robots/clearpath/heron/stl/heron_base.stl b/projects/robots/clearpath/heron/stl/heron_base.stl
diff --git a/projects/robots/clearpath/heron/worlds/ocean.wbt b/projects/robots/clearpath/heron/worlds/ocean.wbt
@@ -1,9 +1,9 @@
 #VRML_SIM R2024a utf8
 
-EXTERNPROTO "https://raw.githubusercontent.com/cyberbotics/webots/R2024a/projects/objects/backgrounds/protos/TexturedBackground.proto"
-EXTERNPROTO "https://raw.githubusercontent.com/cyberbotics/webots/R2024a/projects/objects/backgrounds/protos/TexturedBackgroundLight.proto"
-EXTERNPROTO "https://raw.githubusercontent.com/cyberbotics/webots/R2024a/projects/objects/obstacles/protos/OilBarrel.proto"
-EXTERNPROTO "../protos/Heron.proto"
+EXTERNPROTO "webots://projects/objects/backgrounds/protos/TexturedBackground.proto"
+EXTERNPROTO "webots://projects/objects/backgrounds/protos/TexturedBackgroundLight.proto"
+EXTERNPROTO "webots://projects/objects/obstacles/protos/OilBarrel.proto"
+EXTERNPROTO "webots://projects/robots/clearpath/heron/protos/Heron.proto"
 
 WorldInfo {
 }
@@ -30,11 +30,7 @@ DEF WATER Fluid {
     }
   ]
   viscosity 0.01
-  boundingObject Transform {
-    children [
-      USE WATER_BOX
-    ]
-  }
+  boundingObject USE WATER_BOX
   locked TRUE
 }
 Heron {

diff --git a/projects/robots/clearpath/heron/worlds/swarm.wbt b/projects/robots/clearpath/heron/worlds/swarm.wbt
@@ -1,9 +1,9 @@
 #VRML_SIM R2024a utf8
 
-EXTERNPROTO "https://raw.githubusercontent.com/cyberbotics/webots/R2024a/projects/objects/backgrounds/protos/TexturedBackground.proto"
-EXTERNPROTO "https://raw.githubusercontent.com/cyberbotics/webots/R2024a/projects/objects/backgrounds/protos/TexturedBackgroundLight.proto"
-EXTERNPROTO "https://raw.githubusercontent.com/cyberbotics/webots/R2024a/projects/objects/obstacles/protos/OilBarrel.proto"
-EXTERNPROTO "../protos/Heron.proto"
+EXTERNPROTO "webots://projects/objects/backgrounds/protos/TexturedBackground.proto"
+EXTERNPROTO "webots://projects/objects/backgrounds/protos/TexturedBackgroundLight.proto"
+EXTERNPROTO "webots://projects/objects/obstacles/protos/OilBarrel.proto"
+EXTERNPROTO "webots://projects/robots/clearpath/heron/protos/Heron.proto"
 
 WorldInfo {
 }
@@ -30,11 +30,7 @@ DEF WATER Fluid {
     }
   ]
   viscosity 0.01
-  boundingObject Transform {
-    children [
-      USE WATER_BOX
-    ]
-  }
+  boundingObject USE WATER_BOX
   locked TRUE
 }
 OilBarrel {