-
Notifications
You must be signed in to change notification settings - Fork 3
Feature/lidar_proto #191
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Feature/lidar_proto #191
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
9975c82
Add FlagShip.proto and FlagShip slot
jonpg01 2720357
Add 2 Worlds for Zumo with FlagShip
jonpg01 cbdf58f
Update simulated lidar to be closer to hardware
jonpg01 e68e0ef
fix: correct FlagShip references and update versions to R2025a
jonpg01 02dd608
Fix Typo
jonpg01 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| #VRML_SIM R2025a utf8 | ||
|
|
||
| # FlagShip is an extension that is mounted on top of the ZumoComSystem (DroidControlShip). | ||
| # It provides 360-degree lidar scanning capabilities for the Zumo robot platform. | ||
| PROTO FlagShip [ | ||
| field SFString name "FlagShip" | ||
| field SFBool synchronization TRUE | ||
| ] | ||
| { | ||
| Slot { | ||
| type "FlagShip" | ||
| endPoint Robot { | ||
| children [ | ||
| Transform { | ||
| translation 0 0 0.03 | ||
| children [ | ||
| Shape { | ||
| appearance PBRAppearance { | ||
| baseColor 0.9 0.15 0.15 | ||
| roughness 0.4 | ||
| metalness 0 | ||
| } | ||
| geometry Cylinder { | ||
| height 0.01 | ||
| radius 0.03 | ||
| } | ||
| } | ||
| Lidar { | ||
| name "lidar" | ||
| horizontalResolution 1440 | ||
| fieldOfView 6.28318530718 | ||
| numberOfLayers 1 | ||
| minRange 0.15 | ||
| maxRange 12 | ||
| defaultFrequency 8 | ||
| minFrequency 5 | ||
| maxFrequency 20 | ||
| } | ||
| ] | ||
| } | ||
| ] | ||
| name IS name | ||
| controller "<extern>" | ||
| synchronization IS synchronization | ||
| } | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| #VRML_SIM R2025a utf8 | ||
|
|
||
| EXTERNPROTO "https://raw.githubusercontent.com/cyberbotics/webots/R2025a/projects/objects/floors/protos/RectangleArena.proto" | ||
|
|
||
| PROTO DcsMinTrack [ | ||
| field SFString contactMaterial "default" # Is `Solid.contactMaterial`. | ||
| ] | ||
| { | ||
| RectangleArena { | ||
| contactMaterial IS contactMaterial | ||
| floorSize 2 2 | ||
| floorTileSize 4 4 | ||
| floorAppearance PBRAppearance { | ||
| baseColorMap ImageTexture { | ||
| url [ | ||
| "./dcs.png" | ||
| ] | ||
| } | ||
| roughness 1 | ||
| roughnessMap ImageTexture { | ||
| url [ | ||
| "https://raw.githubusercontent.com/cyberbotics/webots/R2022a/projects/appearances/protos/textures/parquetry/chequered_parquetry_roughness.jpg" | ||
| ] | ||
| } | ||
| metalness 0 | ||
| normalMap ImageTexture { | ||
| url [ | ||
| "https://raw.githubusercontent.com/cyberbotics/webots/R2022a/projects/appearances/protos/textures/parquetry/chequered_parquetry_normal.jpg" | ||
| ] | ||
| } | ||
| occlusionMap ImageTexture { | ||
| url [ | ||
| "https://raw.githubusercontent.com/cyberbotics/webots/R2022a/projects/appearances/protos/textures/parquetry/chequered_parquetry_occlusion.jpg" | ||
| ] | ||
| } | ||
| } | ||
| wallThickness 0.001 | ||
| wallHeight 0.05 | ||
| } | ||
| } |
68 changes: 68 additions & 0 deletions
68
webots/worlds/zumo_with_flag_ship/DcsMinimalLidarExample.wbt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,68 @@ | ||
| #VRML_SIM R2025a utf8 | ||
|
|
||
| EXTERNPROTO "https://raw.githubusercontent.com/cyberbotics/webots/R2025a/projects/objects/backgrounds/protos/TexturedBackground.proto" | ||
| EXTERNPROTO "https://raw.githubusercontent.com/cyberbotics/webots/R2025a/projects/objects/backgrounds/protos/TexturedBackgroundLight.proto" | ||
| EXTERNPROTO "../../protos/ZumoComSystem.proto" | ||
| EXTERNPROTO "../../protos/Zumo32U4.proto" | ||
| EXTERNPROTO "../../protos/FlagShip.proto" | ||
| EXTERNPROTO "./DcsMinTrack.proto" | ||
|
|
||
| WorldInfo { | ||
| info [ | ||
| "World for testing DroidControlShip and a standalone native ROS2 LiDAR robot." | ||
| ] | ||
| title "DCS Demo Track LiDAR Example" | ||
| basicTimeStep 8 | ||
| } | ||
|
|
||
| Viewpoint { | ||
| orientation 0.3787583266277594 0.09714544028170935 -0.9203830145339561 2.677946076660944 | ||
| position 1.2569587324159737 0.7945022889765716 1.5111964909293643 | ||
| } | ||
|
|
||
| TexturedBackground { | ||
| } | ||
| TexturedBackgroundLight { | ||
| } | ||
|
|
||
| DcsMinTrack { | ||
| contactMaterial "cardboard" | ||
| } | ||
|
|
||
| Zumo32U4 { | ||
| name "Zumo" | ||
| performanceMode TRUE | ||
| zumoComSystemSlot ZumoComSystem { | ||
| name "ZumoComSystem" | ||
| performanceMode TRUE | ||
| flagShipSlot FlagShip { | ||
| name "FlagShip" | ||
| } | ||
| } | ||
| } | ||
|
|
||
| Solid { | ||
| name "LidarTarget" | ||
| translation 0.6 0.02 0.0 | ||
| children [ | ||
| Shape { | ||
| appearance PBRAppearance { | ||
| baseColor 0.1 0.6 0.9 | ||
| roughness 0.5 | ||
| metalness 0 | ||
| } | ||
| geometry Box { | ||
| size 0.12 0.2 0.12 | ||
| } | ||
| } | ||
| ] | ||
| boundingObject Box { | ||
| size 0.12 0.2 0.12 | ||
| } | ||
| } | ||
|
|
||
| Robot { | ||
| name "Ros2Supervisor" | ||
| controller "<extern>" | ||
| supervisor TRUE | ||
| } |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.