Compare commits
3 Commits
multi_clip
...
throw_obje
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a2d2a8edc0 | ||
|
|
a09f71758c | ||
|
|
9b68deb6eb |
@@ -144,6 +144,7 @@ class HumanoidStablePD(object):
|
|||||||
self.setSimTime(0)
|
self.setSimTime(0)
|
||||||
|
|
||||||
self.resetPose()
|
self.resetPose()
|
||||||
|
self.thrown_body_ids = []
|
||||||
|
|
||||||
def resetPose(self):
|
def resetPose(self):
|
||||||
#print("resetPose with self._frame=", self._frame, " and self._frameFraction=",self._frameFraction)
|
#print("resetPose with self._frame=", self._frame, " and self._frameFraction=",self._frameFraction)
|
||||||
@@ -590,6 +591,9 @@ class HumanoidStablePD(object):
|
|||||||
#ignore self-collision
|
#ignore self-collision
|
||||||
if (p[1] == p[2]):
|
if (p[1] == p[2]):
|
||||||
continue
|
continue
|
||||||
|
# ignore collisions with thrown objects
|
||||||
|
if p[1] in self.thrown_body_ids or p[2] in self.thrown_body_ids:
|
||||||
|
continue
|
||||||
if (p[1] == self._sim_model):
|
if (p[1] == self._sim_model):
|
||||||
part = p[3]
|
part = p[3]
|
||||||
if (p[2] == self._sim_model):
|
if (p[2] == self._sim_model):
|
||||||
@@ -795,3 +799,7 @@ class HumanoidStablePD(object):
|
|||||||
#print("com_reward=",com_reward)
|
#print("com_reward=",com_reward)
|
||||||
|
|
||||||
return reward
|
return reward
|
||||||
|
|
||||||
|
def getSimModelBasePosition(self):
|
||||||
|
return self._pybullet_client\
|
||||||
|
.getBasePositionAndOrientation(self._sim_model)
|
||||||
@@ -82,6 +82,9 @@ class PyBulletDeepMimicEnv(Env):
|
|||||||
startTime = float(rn) / rnrange * self._humanoid.getCycleTime()
|
startTime = float(rn) / rnrange * self._humanoid.getCycleTime()
|
||||||
self.t = startTime
|
self.t = startTime
|
||||||
|
|
||||||
|
# Remove all the thrown objects
|
||||||
|
self.removeThrownObjects()
|
||||||
|
|
||||||
self._humanoid.setSimTime(startTime)
|
self._humanoid.setSimTime(startTime)
|
||||||
|
|
||||||
self._humanoid.resetPose()
|
self._humanoid.resetPose()
|
||||||
@@ -319,3 +322,49 @@ class PyBulletDeepMimicEnv(Env):
|
|||||||
if o in keys:
|
if o in keys:
|
||||||
return keys[ord(key)] & self._pybullet_client.KEY_WAS_TRIGGERED
|
return keys[ord(key)] & self._pybullet_client.KEY_WAS_TRIGGERED
|
||||||
return False
|
return False
|
||||||
|
|
||||||
|
def hitWithObject(self):
|
||||||
|
# Spawn an object with velocity hitting the model
|
||||||
|
r = random.random()
|
||||||
|
distance = 3.0
|
||||||
|
rand_angle = r * 2 * math.pi - math.pi
|
||||||
|
|
||||||
|
position, orientation = \
|
||||||
|
self._humanoid.getSimModelBasePosition()
|
||||||
|
|
||||||
|
# Remember, in bullet: Y direction is "up". X and Z direction are
|
||||||
|
# in the horizontal plane.
|
||||||
|
ball_position = [ distance * math.cos(rand_angle) + position[0],
|
||||||
|
position[1],
|
||||||
|
distance * math.sin(rand_angle)+ position[2]]
|
||||||
|
|
||||||
|
visualShapeId = self._pybullet_client.createVisualShape(
|
||||||
|
shapeType=self._pybullet_client.GEOM_SPHERE,
|
||||||
|
radius=0.1)
|
||||||
|
|
||||||
|
collisionShapeId = self._pybullet_client.createCollisionShape(
|
||||||
|
shapeType=self._pybullet_client.GEOM_SPHERE,
|
||||||
|
radius=0.1)
|
||||||
|
|
||||||
|
body = self._pybullet_client.createMultiBody(
|
||||||
|
baseMass=1,
|
||||||
|
baseCollisionShapeIndex=collisionShapeId,
|
||||||
|
baseVisualShapeIndex=visualShapeId,
|
||||||
|
basePosition=ball_position)
|
||||||
|
|
||||||
|
distance_scale = 10
|
||||||
|
ball_velocity = [distance_scale * (position[i] - ball_position[i]) for i in range(3)]
|
||||||
|
self._pybullet_client.resetBaseVelocity(body, linearVelocity=ball_velocity)
|
||||||
|
|
||||||
|
self._humanoid.thrown_body_ids.append(body)
|
||||||
|
|
||||||
|
def removeThrownObjects(self):
|
||||||
|
# Disable gui so that object removal does not cause stutter
|
||||||
|
self._pybullet_client.configureDebugVisualizer(self._pybullet_client.COV_ENABLE_RENDERING,0)
|
||||||
|
|
||||||
|
for objectId in self._humanoid.thrown_body_ids:
|
||||||
|
self._pybullet_client.removeBody(objectId)
|
||||||
|
|
||||||
|
self._humanoid.thrown_body_ids = []
|
||||||
|
|
||||||
|
self._pybullet_client.configureDebugVisualizer(self._pybullet_client.COV_ENABLE_RENDERING,1)
|
||||||
@@ -87,6 +87,9 @@ if __name__ == '__main__':
|
|||||||
|
|
||||||
if world.env.isKeyTriggered(keys, ' '):
|
if world.env.isKeyTriggered(keys, ' '):
|
||||||
animating = not animating
|
animating = not animating
|
||||||
|
if world.env.isKeyTriggered(keys, 'x'):
|
||||||
|
# print("Throwing object.")
|
||||||
|
world.env.hitWithObject()
|
||||||
if (animating):
|
if (animating):
|
||||||
update_world(world, timeStep)
|
update_world(world, timeStep)
|
||||||
#animating=False
|
#animating=False
|
||||||
|
|||||||
Reference in New Issue
Block a user