mirror of
https://github.com/bulletphysics/bullet3
synced 2024-12-13 13:20:07 +00:00
Merge remote-tracking branch 'bp/master'
This commit is contained in:
commit
a721f1cdb3
@ -26,7 +26,7 @@ class MJCFBaseBulletEnv(gym.Env):
|
||||
self.scene = None
|
||||
self.physicsClientId = -1
|
||||
self.ownsPhysicsClient = 0
|
||||
self.camera = Camera()
|
||||
self.camera = Camera(self)
|
||||
self.isRender = render
|
||||
self.robot = robot
|
||||
self.seed()
|
||||
@ -160,11 +160,12 @@ class MJCFBaseBulletEnv(gym.Env):
|
||||
|
||||
class Camera:
|
||||
|
||||
def __init__(self):
|
||||
def __init__(self, env):
|
||||
self.env = env
|
||||
pass
|
||||
|
||||
def move_and_look_at(self, i, j, k, x, y, z):
|
||||
lookat = [x, y, z]
|
||||
distance = 10
|
||||
yaw = 10
|
||||
self._p.resetDebugVisualizerCamera(distance, yaw, -20, lookat)
|
||||
self.env._p.resetDebugVisualizerCamera(distance, yaw, -20, lookat)
|
||||
|
@ -125,7 +125,7 @@ class WalkerBaseBulletEnv(MJCFBaseBulletEnv):
|
||||
return state, sum(self.rewards), bool(done), {}
|
||||
|
||||
def camera_adjust(self):
|
||||
x, y, z = self.body_xyz
|
||||
x, y, z = self.robot.body_xyz
|
||||
self.camera_x = 0.98 * self.camera_x + (1 - 0.98) * x
|
||||
self.camera.move_and_look_at(self.camera_x, y - 2.0, 1.4, x, y, 1.0)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user