Skip to content

Commit 283c454

Browse files
authored
Merge pull request #3 from sahil-tgs/feature/mesh-extraction
PR review changes
2 parents e3b7185 + 97ddd08 commit 283c454

9 files changed

Lines changed: 727 additions & 770 deletions

File tree

examples/robosuite/custom_mjcf_table.scenic

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# examples/robosuite/custom_mjcf_table.scenic
12
"""Test with two XML tables and XML cubes on top, positioned in front of robot."""
23
model scenic.simulators.robosuite.model
34

@@ -68,19 +69,19 @@ green_cube_xml = """
6869

6970
# Create the first table (brown) - closer to robot
7071
table1 = new CustomObject on arena_floor,
71-
with mjcf_xml table_xml
72+
with mjcfXml table_xml
7273

7374
# Create the second table (blue) - farther from robot
7475
table2 = new CustomObject on arena_floor,
75-
with mjcf_xml table_xml
76+
with mjcfXml table_xml
7677

7778

7879
red_cube = new CustomObject on table1,
79-
with mjcf_xml red_cube_xml
80+
with mjcfXml red_cube_xml
8081

8182
# Place green cube on second table
8283
green_cube = new CustomObject on table2,
83-
with mjcf_xml green_cube_xml
84+
with mjcfXml green_cube_xml
8485

8586
# Robot at origin
8687
ego = new Panda at (0, 0, 0)

examples/robosuite/file_xml.scenic

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@ table1 = new Table on arena_floor
1212

1313
# Load bread object from XML file
1414
bread = new CustomObject on table1,
15-
with mjcf_xml "custom_object/bread.xml",
15+
with mjcfXml "custom_object/bread.xml",
1616
with color (0, 1, 1, 1)

examples/robosuite/four_table_workspace.scenic

Lines changed: 0 additions & 43 deletions
This file was deleted.

examples/robosuite/full_xml_test3.scenic

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ arena = new CustomArena,
6666

6767
# Create a yellow ball using custom XML
6868
yellow_ball = new CustomObject at (0.5, 0.0, 1.0),
69-
with mjcf_xml ball_object_xml
69+
with mjcfXml ball_object_xml
7070

7171
# Create a red box using built-in Box class for comparison
7272
red_box = new Box at (0.7, 0.2, 1.0),

examples/robosuite/mesh_test.scenic

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ table = new Table on arena_floor
4242

4343
# Create dragon - path in XML is relative to this .scenic file
4444
dragon = new CustomObject on table,
45-
with mjcf_xml dragon_object_xml,
45+
with mjcfXml dragon_object_xml,
4646
with color (1, 0, 1, 1)
4747

4848
# Add a simple ball for comparison

examples/robosuite/spatial_operators_demo.scenic

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ custom_xml = """
5757

5858
# Yellow block at table surface
5959
yellow_block = new CustomObject at (0.5, 0.2, 0.85),
60-
with mjcf_xml custom_xml
60+
with mjcfXml custom_xml
6161

6262
# Complex object (Milk carton) at table surface
6363
milk = new Milk at (0.8, -0.1, 0.85)
Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,18 @@
11
# examples/robosuite/stack_lift.scenic
22
model scenic.simulators.robosuite.model
33

4-
work_table = new Table at (0.6, 0, 0.8),
4+
work_table = new Table on (0.6, 0, 0.8),
55
with width 0.6,
66
with length 1.2,
77
with height 0.05
88

9-
bottom_cube = new Box at (0.6, 0, 0.83),
9+
bottom_cube = new Box on work_table,
1010
with color (0.2, 0.3, 0.8, 1),
1111
with width 0.06, with length 0.06, with height 0.06
1212

13-
top_cube = new Box at (0.6, 0, 0.89),
13+
top_cube = new Box on bottom_cube,
1414
with color (0.8, 0.2, 0.2, 1)
1515

16-
bottle = new Bottle at (0.6, 0.3, 0.83)
1716

1817
pickup_object = top_cube
1918

@@ -25,5 +24,7 @@ behavior StackLift():
2524
if pickup_object.position.z > 1.0:
2625
terminate simulation
2726
wait
28-
ego = new UR5e at (0, 0, 0),
27+
terminate simulation
28+
29+
ego = new UR5e on (0, 0, 0),
2930
with behavior StackLift()

0 commit comments

Comments
 (0)