From d8166cc985d91855b71307d56e99eb2c3a6fb234 Mon Sep 17 00:00:00 2001 From: Nicolas Schodet Date: Wed, 8 May 2013 15:43:52 +0200 Subject: digital/io-hub, digital/mimot, host/simu/robots: update robot size --- host/simu/robots/apbirthday/model/__init__.py | 3 +++ host/simu/robots/apbirthday/model/cannon.py | 3 ++- host/simu/robots/apbirthday/model/gifts_arm.py | 3 ++- 3 files changed, 7 insertions(+), 2 deletions(-) (limited to 'host/simu/robots/apbirthday/model') diff --git a/host/simu/robots/apbirthday/model/__init__.py b/host/simu/robots/apbirthday/model/__init__.py index e69de29b..692091c7 100644 --- a/host/simu/robots/apbirthday/model/__init__.py +++ b/host/simu/robots/apbirthday/model/__init__.py @@ -0,0 +1,3 @@ +front = 96 +back = 126 +side = 142 diff --git a/host/simu/robots/apbirthday/model/cannon.py b/host/simu/robots/apbirthday/model/cannon.py index 4fc78fd8..c42feb94 100644 --- a/host/simu/robots/apbirthday/model/cannon.py +++ b/host/simu/robots/apbirthday/model/cannon.py @@ -27,6 +27,7 @@ from simu.utils.trans_matrix import TransMatrix from simu.utils.vector import vector import random from math import pi +from simu.robots.apbirthday.model import back class Cannon (Observable): @@ -55,7 +56,7 @@ class Cannon (Observable): m = TransMatrix () m.translate (self.robot_position.pos) m.rotate (self.robot_position.angle) - x = -108 + x = -back y = (50, -50) for i, c in enumerate (self.contacts): s = True diff --git a/host/simu/robots/apbirthday/model/gifts_arm.py b/host/simu/robots/apbirthday/model/gifts_arm.py index 0f43bc6a..7f9c5247 100644 --- a/host/simu/robots/apbirthday/model/gifts_arm.py +++ b/host/simu/robots/apbirthday/model/gifts_arm.py @@ -25,6 +25,7 @@ from utils.observable import Observable from simu.utils.vector import vector from math import pi +from simu.robots.apbirthday.model import side class GiftsArm (Observable): @@ -38,7 +39,7 @@ class GiftsArm (Observable): def __arm_notified (self): if self.arm_cyl.pos > .9: push_point = (vector (self.robot_position.pos) - + vector.polar (self.robot_position.angle - pi / 2, 140 + 100) + + vector.polar (self.robot_position.angle - pi / 2, side + 100) - vector.polar (self.robot_position.angle, 100)) gift = self.table.nearest (push_point, level = 0, max = 150) if gift is not None and hasattr (gift, 'state'): -- cgit v1.2.3