@@ -1886,7 +1886,6 @@ def _sensor_tactile(
1886
1886
body_rootid : wp .array (dtype = int ),
1887
1887
body_weldid : wp .array (dtype = int ),
1888
1888
geom_bodyid : wp .array (dtype = int ),
1889
- geom_type : wp .array (dtype = int ),
1890
1889
mesh_vertadr : wp .array (dtype = int ),
1891
1890
mesh_vert : wp .array (dtype = wp .vec3 ),
1892
1891
mesh_normaladr : wp .array (dtype = int ),
@@ -1954,13 +1953,7 @@ def _sensor_tactile(
1954
1953
lpos = wp .transpose (geom_xmat_in [worldid , geom ]) @ tmp
1955
1954
1956
1955
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 :
1964
1957
volume_data = make_volume_data (wp .uint64 (0 ), wp .vec3 (0.0 ), wp .vec3 (0.0 ))
1965
1958
depth = wp .min (sdf (int (GeomType .SDF .value ), lpos , plugin_attr [plugin_id ], plugin [plugin_id ], volume_data ), 0.0 )
1966
1959
else :
@@ -1971,6 +1964,7 @@ def _sensor_tactile(
1971
1964
center = oct_aabb [mesh_id , 0 ]
1972
1965
half_size = oct_aabb [mesh_id , 1 ]
1973
1966
volume_data = make_volume_data (volume_id , center , half_size )
1967
+
1974
1968
depth = wp .min (sdf (int (GeomType .SDF .value ), lpos , wp .vec3 (0.0 ), - 1 , volume_data ), 0.0 )
1975
1969
if depth >= 0.0 :
1976
1970
return
@@ -2174,7 +2168,6 @@ def sensor_acc(m: Model, d: Data):
2174
2168
m .body_rootid ,
2175
2169
m .body_weldid ,
2176
2170
m .geom_bodyid ,
2177
- m .geom_type ,
2178
2171
m .mesh_vertadr ,
2179
2172
m .mesh_vert ,
2180
2173
m .mesh_normaladr ,
0 commit comments