Skip to content

Commit b3de3a9

Browse files
committed
Fixed the crashin self._rasterizer.render_camera(camera)
1 parent 3e30137 commit b3de3a9

File tree

3 files changed

+12
-16
lines changed

3 files changed

+12
-16
lines changed

genesis/utils/geom.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1235,7 +1235,7 @@ def pos_lookat_up_to_T(pos, lookat, up, *, dtype=np.float32):
12351235
z = pos - lookat
12361236
R = z_up_to_R(z, up=up)
12371237
return trans_R_to_T(pos, R)
1238-
elif all(isinstance(e, np.ndarray) for e in (pos, lookat, up) if e is not None):
1238+
elif all(isinstance(e, tuple) for e in (pos, lookat, up) if e is not None):
12391239
pos = np.asarray(pos, dtype=dtype)
12401240
lookat = np.asarray(lookat, dtype=dtype)
12411241
up = np.asarray(up, dtype=dtype)

genesis/vis/camera.py

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -113,22 +113,18 @@ def __init__(
113113
self._focus_dist = np.linalg.norm(np.array(lookat) - np.array(pos))
114114

115115
def build(self):
116-
if self._visualizer._use_batch_renderer:
117-
self._batch_renderer = self._visualizer.batch_renderer
118-
self._rasterizer = None
119-
self._raytracer = None
120-
else:
121-
self._rasterizer = self._visualizer.rasterizer
122-
self._raytracer = self._visualizer.raytracer
116+
self._batch_renderer = self._visualizer.batch_renderer
117+
self._rasterizer = self._visualizer.rasterizer
118+
self._raytracer = self._visualizer.raytracer
123119

124-
self._rgb_stacked = self._visualizer._context.env_separate_rigid
125-
self._other_stacked = self._visualizer._context.env_separate_rigid
120+
self._rgb_stacked = self._visualizer._context.env_separate_rigid
121+
self._other_stacked = self._visualizer._context.env_separate_rigid
126122

127-
if self._rasterizer is not None:
128-
self._rasterizer.add_camera(self)
129-
if self._raytracer is not None:
130-
self._raytracer.add_camera(self)
131-
self._rgb_stacked = False # TODO: Raytracer currently does not support batch rendering
123+
if self._rasterizer is not None:
124+
self._rasterizer.add_camera(self)
125+
if self._raytracer is not None:
126+
self._raytracer.add_camera(self)
127+
self._rgb_stacked = False # TODO: Raytracer currently does not support batch rendering
132128

133129
self._is_built = True
134130
self.setup_initial_env_poses()

genesis/vis/visualizer.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ def reset(self):
151151

152152
# Ideally the code below should be skipped when viewer_lock is a DummyViewerLock.
153153
# Temporary workaround: Skip when using batch renderer.
154-
if self.viewer_lock is not None and not self._use_batch_renderer:
154+
if self.viewer_lock is not None:
155155
for camera in self._cameras:
156156
self._rasterizer.render_camera(camera)
157157

0 commit comments

Comments
 (0)