Skip to content

Commit e76b957

Browse files
ndunkelb-nasandunkelb-nasa
committed
switching to trimesh and adding on the fly stuff
1 parent d61f007 commit e76b957

File tree

554 files changed

+2436
-2692
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

554 files changed

+2436
-2692
lines changed

‎clr_mujoco_config/description/assets/decomposed/bench_lid/bench_lid.mtl‎

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

‎clr_mujoco_config/description/assets/decomposed/bench_lid/bench_lid.obj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:fc96eb8169d9fc584ac938243fa81f0567460968abe01d196c7833ebfe4199df
3-
size 1128
2+
oid sha256:343289de75aa78cb59747db3e98ceb1eb6f4d96c4be7e3bd0cabaa95d12e9405
3+
size 673

‎clr_mujoco_config/description/assets/decomposed/bench_lid/bench_lid/bench_lid.obj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:6f1d93c2ce6b02da31eaff9cde9e84aefae7649c4eb28c769da88db6d29a767a
3-
size 1294
2+
oid sha256:1bf2f67d24c865f4f90c7beaec910eef54dab4c8ff7420bf62a7cf5438a3de14
3+
size 642

‎clr_mujoco_config/description/assets/decomposed/bench_lid/bench_lid/bench_lid.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,16 @@
88
</default>
99
</default>
1010
<asset>
11-
<material name="new_mat_color.018" specular="0.5" shininess="0.36" rgba="0.000000 0.000000 1.000000 1.000000"/>
11+
<material name="mtl_m41" specular="0.20000000000000004" shininess="1.0" rgba="0.00000000 0.00000000 1.00000000 1.0"/>
1212
<mesh file="bench_lid.obj"/>
1313
<mesh file="bench_lid_collision_0.obj"/>
1414
<mesh file="bench_lid_collision_1.obj"/>
1515
</asset>
1616
<worldbody>
1717
<body name="bench_lid">
18-
<geom material="new_mat_color.018" mesh="bench_lid" class="visual"/>
19-
<geom mesh="bench_lid_collision_0" rgba="0.6408841346898948 0.9624971502092844 0.8542106431875939 1" class="collision"/>
20-
<geom mesh="bench_lid_collision_1" rgba="0.45440685128070946 0.14827356645042877 0.23688825093635257 1" class="collision"/>
18+
<geom material="mtl_m41" mesh="bench_lid" class="visual"/>
19+
<geom mesh="bench_lid_collision_0" rgba="0.3477557655261836 0.31217824458571464 0.37770337384496533 1" class="collision"/>
20+
<geom mesh="bench_lid_collision_1" rgba="0.8129790046183153 0.8417423331776721 0.07745317508581062 1" class="collision"/>
2121
</body>
2222
</worldbody>
23-
</mujoco>
23+
</mujoco>

‎clr_mujoco_config/description/assets/decomposed/bench_lid/bench_lid/bench_lid_collision_0.obj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:98f3abf5fe4f1f974ecdf3959f32e5f6c243c560981e10f5d77f62dda58b16ca
2+
oid sha256:d5075fdb21775d88b6933aca7d3170ae6fe8bb76e1e406eb2fecbb46b037cfe4
33
size 413

‎clr_mujoco_config/description/assets/decomposed/bench_lid/bench_lid/bench_lid_collision_1.obj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:63557ec9f6b01c0eff5efea0ae90b23cd1cfd74466d4f78eb075f8a28b932e21
2+
oid sha256:b958e6ffb3771ab4189b10646f145f1f34a034c414f1c0f5b5c068d269c253e3
33
size 525

‎clr_mujoco_config/description/assets/decomposed/bench_lid/bench_lid/material.mtl‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
newmtl new_mat_color.018
2-
Ka 1.00000000 1.00000000 1.00000000
1+
newmtl mtl_m41
2+
Ka 0.40000000 0.40000000 0.40000000
33
Kd 0.00000000 0.00000000 1.00000000
4-
Ks 0.50196078 0.50196078 0.50196078
5-
Ns 360.00000000
4+
Ks 0.20000000 0.20000000 0.20000000
5+
Ns 1000.00000000

‎clr_mujoco_config/description/assets/decomposed/bench_lid/mtl_m41‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# https://github.com/mikedh/trimesh
2+
3+
newmtl mtl_m41
4+
Ka 0.40000000 0.40000000 0.40000000
5+
Kd 0.00000000 0.00000000 1.00000000
6+
Ks 0.20000000 0.20000000 0.20000000
7+
Ns 1000.00000000

‎clr_mujoco_config/description/assets/decomposed/clr_base/clr_base.mtl‎

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

‎clr_mujoco_config/description/assets/decomposed/clr_base/clr_base.obj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:966257a8cd46e1f06bc89f8fd18c758691b57930d42fcf4bd77826f777109e5d
3-
size 88941
2+
oid sha256:dc88f2e7cdd6388381146f86c273e241a708e7ce5a91ba93443f2e3079a107f1
3+
size 110565

0 commit comments

Comments
 (0)