Skip to content

Commit fd9ee8b

Browse files
javizqhjavizqh
authored
Merge pull request #560 from Arcane-01/drone_gymkhana_migration
Drone Gymkhana migration to gz harmonic
2 parents d9cab05 + d6d02d0 commit fd9ee8b

21 files changed

Lines changed: 337 additions & 99 deletions

File tree

‎CustomRobots/drone_assets/models/arrow/materials/textures/arrow_black.png‎

14.1 KB
Loading

‎CustomRobots/drone_assets/models/arrow/model.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@
1414
Arrow
1515
</description>
1616

17-
</model>
17+
</model>

‎CustomRobots/drone_assets/models/arrow/model.sdf‎

Lines changed: 22 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,45 @@
1-
<?xml version='1.0'?>
2-
<sdf version='1.4'>
3-
<model name='arrow'>
1+
<?xml version="1.0"?>
2+
<sdf version="1.4">
3+
<model name="arrow">
44
<static>true</static>
5-
<link name='link'>
6-
<collision name='collision'>
5+
<link name="link">
6+
<collision name="collision">
77
<geometry>
88
<plane>
99
<normal>0 0 1</normal>
1010
<size>1 1</size>
11-
</plane>
12-
</geometry>
11+
</plane>
12+
</geometry>
1313
<surface>
1414
<friction>
1515
<ode>
1616
<mu>0.5</mu>
1717
<mu2>.5</mu2>
18-
</ode>
19-
</friction>
20-
</surface>
21-
</collision>
18+
</ode>
19+
</friction>
20+
</surface>
21+
</collision>
2222

23-
<visual name='visual_0'>
23+
<visual name="visual_0">
2424
<pose>0 0 0 0 0 0</pose>
25-
2625
<cast_shadows>false</cast_shadows>
2726
<geometry>
2827
<plane>
2928
<normal>0 0 1</normal>
3029
<size>1 1</size>
31-
</plane>
32-
</geometry>
30+
</plane>
31+
</geometry>
3332
<material>
3433
<ambient>0.8 1.0 0.8 1.0</ambient>
3534
<diffuse>0.8 1.0 0.8 1.0</diffuse>
3635
<specular>0.1 0.1 0.1 1.0</specular>
3736
<pbr>
38-
<metal>
39-
<albedo_map>model://arrow/materials/textures/arrow.png</albedo_map>
40-
</metal>
37+
<metal>
38+
<albedo_map>model://arrow/materials/textures/arrow_black.png</albedo_map>
39+
</metal>
4140
</pbr>
42-
</material>
43-
</visual>
44-
</link>
45-
</model>
46-
</sdf>
47-
41+
</material>
42+
</visual>
43+
</link>
44+
</model>
45+
</sdf>

‎CustomRobots/drone_assets/models/custom_box_target_green/model.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@
1313
<description>
1414
A small green box target that can be used to mark a location.
1515
</description>
16-
</model>
16+
</model>

‎CustomRobots/drone_assets/models/custom_box_target_green/model.sdf‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" ?>
1+
<?xml version="1.0"?>
22
<sdf version="1.6">
33
<model name="custom_box_target_green">
44
<pose>0 0 0.5 0 0 0</pose>
@@ -16,10 +16,10 @@
1616
<geometry>
1717
<mesh>
1818
<uri>model://custom_box_target_green/meshes/mesh.dae</uri>
19-
<scale>0.16666 0.16666 0.5</scale>
19+
<scale>0.16666 0.16666 0.5</scale>
2020
</mesh>
2121
</geometry>
2222
</visual>
2323
</link>
2424
</model>
25-
</sdf>
25+
</sdf>

‎CustomRobots/drone_assets/models/custom_box_target_red/model.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@
1313
<description>
1414
A small red box target that can be used to mark a location.
1515
</description>
16-
</model>
16+
</model>

‎CustomRobots/drone_assets/models/custom_box_target_red/model.sdf‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" ?>
1+
<?xml version="1.0"?>
22
<sdf version="1.6">
33
<model name="custom_box_target_red">
44
<pose>0 0 0.5 0 0 0</pose>
@@ -16,10 +16,10 @@
1616
<geometry>
1717
<mesh>
1818
<uri>model://custom_box_target_red/meshes/mesh.dae</uri>
19-
<scale>0.16666 0.16666 0.5</scale>
19+
<scale>0.16666 0.16666 0.5</scale>
2020
</mesh>
2121
</geometry>
2222
</visual>
2323
</link>
2424
</model>
25-
</sdf>
25+
</sdf>

‎CustomRobots/drone_assets/models/hoop_red/model.config‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
<?xml version="1.0" ?>
1+
<?xml version="1.0"?>
22
<model>
3-
<name>Hoop (red)</name>
4-
<version>1.0</version>
5-
<sdf version="1.6">model.sdf</sdf>
6-
<author>
7-
<name>Jackie Kay</name>
8-
<email>jackie@osrfoundation.org</email>
9-
</author>
10-
<description>
11-
Approximately 2.0m diameter hoop mounted on a 5m pole.
12-
</description>
13-
</model>
3+
<name>Hoop (red)</name>
4+
<version>1.0</version>
5+
<sdf version="1.6">model.sdf</sdf>
6+
<author>
7+
<name>Jackie Kay</name>
8+
<email>jackie@osrfoundation.org</email>
9+
</author>
10+
<description>
11+
Approximately 2.0m diameter hoop mounted on a 5m pole.
12+
</description>
13+
</model>

‎CustomRobots/drone_assets/models/hoop_red/model.sdf‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
<?xml version='1.0'?>
2-
<sdf version='1.6'>
1+
<?xml version="1.0"?>
2+
<sdf version="1.6">
33

4-
<model name='hoop_red'>
4+
<model name="hoop_red">
55
<static>1</static>
6-
<link name='link'>
6+
<link name="link">
77
<pose>0 0 2.979342 0 0 0</pose>
88

9-
<visual name='visual'>
9+
<visual name="visual">
1010
<pose>0 0.05 3.83 1.57519 -0.165904 0</pose>
1111
<geometry>
1212
<polyline>
@@ -65,7 +65,7 @@
6565
</material>
6666
</visual>
6767

68-
<collision name='collision'>
68+
<collision name="collision">
6969
<pose>0 0.05 3.83 1.57519 -0.165904 -0.00102</pose>
7070
<geometry>
7171
<polyline>
@@ -119,7 +119,7 @@
119119
</geometry>
120120
</collision>
121121

122-
<visual name='pole_visual'>
122+
<visual name="pole_visual">
123123
<pose>0 0 0.134295 0.004331 -0.016759 0</pose>
124124
<geometry>
125125
<box>
@@ -133,7 +133,7 @@
133133
<specular>0.1 0.1 0.1 1</specular>
134134
</material>
135135
</visual>
136-
<collision name='pole_collision'>
136+
<collision name="pole_collision">
137137
<pose>0 0 0.134295 0.004331 -0.016759 0</pose>
138138
<geometry>
139139
<box>
@@ -144,4 +144,4 @@
144144
</link>
145145

146146
</model>
147-
</sdf>
147+
</sdf>

‎CustomRobots/drone_assets/models/logoJdeRobot/model.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@
1414
JdeRobot
1515
</description>
1616

17-
</model>
17+
</model>

0 commit comments

Comments
 (0)