Skip to content

Commit 61cbb5f

Browse files
committed
Revert "sensor"
This reverts commit 0799ec0.
1 parent 0799ec0 commit 61cbb5f

File tree

1 file changed

+2
-9
lines changed

1 file changed

+2
-9
lines changed

mujoco_warp/_src/sensor.py

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1886,7 +1886,6 @@ def _sensor_tactile(
18861886
body_rootid: wp.array(dtype=int),
18871887
body_weldid: wp.array(dtype=int),
18881888
geom_bodyid: wp.array(dtype=int),
1889-
geom_type: wp.array(dtype=int),
18901889
mesh_vertadr: wp.array(dtype=int),
18911890
mesh_vert: wp.array(dtype=wp.vec3),
18921891
mesh_normaladr: wp.array(dtype=int),
@@ -1954,13 +1953,7 @@ def _sensor_tactile(
19541953
lpos = wp.transpose(geom_xmat_in[worldid, geom]) @ tmp
19551954

19561955
plugin_id = geom_plugin_index[geom]
1957-
1958-
contact_type = geom_type[geom]
1959-
1960-
if contact_type != int(GeomType.SDF.value):
1961-
volume_data = make_volume_data(wp.uint64(0), wp.vec3(0.0), wp.vec3(0.0))
1962-
depth = wp.min(sdf(contact_type, lpos, wp.vec3(0.0), -1, volume_data), 0.0)
1963-
elif plugin_id != -1:
1956+
if plugin_id != -1:
19641957
volume_data = make_volume_data(wp.uint64(0), wp.vec3(0.0), wp.vec3(0.0))
19651958
depth = wp.min(sdf(int(GeomType.SDF.value), lpos, plugin_attr[plugin_id], plugin[plugin_id], volume_data), 0.0)
19661959
else:
@@ -1971,6 +1964,7 @@ def _sensor_tactile(
19711964
center = oct_aabb[mesh_id, 0]
19721965
half_size = oct_aabb[mesh_id, 1]
19731966
volume_data = make_volume_data(volume_id, center, half_size)
1967+
19741968
depth = wp.min(sdf(int(GeomType.SDF.value), lpos, wp.vec3(0.0), -1, volume_data), 0.0)
19751969
if depth >= 0.0:
19761970
return
@@ -2174,7 +2168,6 @@ def sensor_acc(m: Model, d: Data):
21742168
m.body_rootid,
21752169
m.body_weldid,
21762170
m.geom_bodyid,
2177-
m.geom_type,
21782171
m.mesh_vertadr,
21792172
m.mesh_vert,
21802173
m.mesh_normaladr,

0 commit comments

Comments
 (0)