Skip to content

Commit 65094da

Browse files
CoolSpy3MNikoliCC
andauthored
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]>
1 parent 58242dd commit 65094da

File tree

4 files changed

+59
-27
lines changed

4 files changed

+59
-27
lines changed

projects/robots/clearpath/heron/protos/Heron.proto

Lines changed: 49 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -158,15 +158,55 @@ PROTO Heron [
158158
viscousResistanceTorqueCoefficient 0.1
159159
}
160160
]
161-
boundingObject Transform {
162-
scale 0.1 0.1 0.1
163-
children [
164-
Mesh {
165-
url [
166-
"../stl/heron_collision.stl"
167-
]
168-
}
169-
]
161+
boundingObject Group {
162+
children [
163+
Pose {
164+
translation 0 -0.135 0.32
165+
children [
166+
Cylinder {
167+
height 0.47
168+
radius 0.01
169+
}
170+
]
171+
}
172+
Pose {
173+
translation 0 0.135 0.32
174+
children [
175+
Cylinder {
176+
height 0.47
177+
radius 0.01
178+
}
179+
]
180+
}
181+
Pose {
182+
translation 0 0 0.02
183+
children [
184+
Box {
185+
size 0.9 0.6 0.12
186+
}
187+
]
188+
}
189+
Pose {
190+
translation 0.0299998 0.37 -0.09
191+
rotation 0 1 0 1.5708
192+
children [
193+
Cylinder {
194+
height 1.3
195+
radius 0.14
196+
}
197+
]
198+
}
199+
Pose {
200+
translation 0.0299998 -0.37 -0.09
201+
rotation 0 1 0 1.5708
202+
children [
203+
Cylinder {
204+
height 1.3
205+
radius 0.14
206+
}
207+
]
208+
}
209+
]
170210
}
171211
physics Physics {
172212
density 400
-80 KB
Binary file not shown.

projects/robots/clearpath/heron/worlds/ocean.wbt

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#VRML_SIM R2024a utf8
22

3-
EXTERNPROTO "https://raw.githubusercontent.com/cyberbotics/webots/R2024a/projects/objects/backgrounds/protos/TexturedBackground.proto"
4-
EXTERNPROTO "https://raw.githubusercontent.com/cyberbotics/webots/R2024a/projects/objects/backgrounds/protos/TexturedBackgroundLight.proto"
5-
EXTERNPROTO "https://raw.githubusercontent.com/cyberbotics/webots/R2024a/projects/objects/obstacles/protos/OilBarrel.proto"
6-
EXTERNPROTO "../protos/Heron.proto"
3+
EXTERNPROTO "webots://projects/objects/backgrounds/protos/TexturedBackground.proto"
4+
EXTERNPROTO "webots://projects/objects/backgrounds/protos/TexturedBackgroundLight.proto"
5+
EXTERNPROTO "webots://projects/objects/obstacles/protos/OilBarrel.proto"
6+
EXTERNPROTO "webots://projects/robots/clearpath/heron/protos/Heron.proto"
77

88
WorldInfo {
99
}
@@ -30,11 +30,7 @@ DEF WATER Fluid {
3030
}
3131
]
3232
viscosity 0.01
33-
boundingObject Transform {
34-
children [
35-
USE WATER_BOX
36-
]
37-
}
33+
boundingObject USE WATER_BOX
3834
locked TRUE
3935
}
4036
Heron {

projects/robots/clearpath/heron/worlds/swarm.wbt

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#VRML_SIM R2024a utf8
22

3-
EXTERNPROTO "https://raw.githubusercontent.com/cyberbotics/webots/R2024a/projects/objects/backgrounds/protos/TexturedBackground.proto"
4-
EXTERNPROTO "https://raw.githubusercontent.com/cyberbotics/webots/R2024a/projects/objects/backgrounds/protos/TexturedBackgroundLight.proto"
5-
EXTERNPROTO "https://raw.githubusercontent.com/cyberbotics/webots/R2024a/projects/objects/obstacles/protos/OilBarrel.proto"
6-
EXTERNPROTO "../protos/Heron.proto"
3+
EXTERNPROTO "webots://projects/objects/backgrounds/protos/TexturedBackground.proto"
4+
EXTERNPROTO "webots://projects/objects/backgrounds/protos/TexturedBackgroundLight.proto"
5+
EXTERNPROTO "webots://projects/objects/obstacles/protos/OilBarrel.proto"
6+
EXTERNPROTO "webots://projects/robots/clearpath/heron/protos/Heron.proto"
77

88
WorldInfo {
99
}
@@ -30,11 +30,7 @@ DEF WATER Fluid {
3030
}
3131
]
3232
viscosity 0.01
33-
boundingObject Transform {
34-
children [
35-
USE WATER_BOX
36-
]
37-
}
33+
boundingObject USE WATER_BOX
3834
locked TRUE
3935
}
4036
OilBarrel {

0 commit comments

Comments
 (0)