Commits

German Larrain committed 0575a22

collision.adapters: renamed 'OdeGeom' to 'Geom' and 'OdeBasicShape' to 'BasicShape'.

Comments (0)

Files changed (1)

ars/model/collision/adapters.py

 #==============================================================================
 
 
-class OdeGeom(base.Geom):
+class Geom(base.Geom):
 
 	"""Abstract class, sort of equivalent to :class:`ode.GeomObject`."""
 
 	def attach_body(self, body):
-		super(OdeGeom, self).attach_body(body)
+		super(Geom, self).attach_body(body)
 		self._inner_object.setBody(body.inner_object)
 
 	#==========================================================================
 		self._inner_object.setRotation(rot)
 
 
-class OdeBasicShape(OdeGeom):
+class BasicShape(Geom):
 
 	__metaclass__ = ABCMeta
 
 #==============================================================================
 
 
-class Plane(OdeBasicShape, base.Plane):
+class Plane(BasicShape, base.Plane):
 
 	"""Plane, different from a box"""
 
 	def __init__(self, space, normal, dist):
-		OdeBasicShape.__init__(self)
+		BasicShape.__init__(self)
 		base.Plane.__init__(self, space, normal, dist)
 
 		self._inner_object = ode_objects_factories.create_ode_plane(
 			space.inner_object, normal, dist)
 
 
-class Ray(OdeGeom, base.Ray):
+class Ray(Geom, base.Ray):
 
 	def __init__(self, space, length):
-		OdeGeom.__init__(self)
+		Geom.__init__(self)
 		base.Ray.__init__(self, space, length)
 		self._inner_object = ode_objects_factories.create_ode_ray(
 			space.inner_object, length)
 		self._inner_object.setLength(length)
 
 
-class Trimesh(OdeGeom, base.Trimesh):
+class Trimesh(Geom, base.Trimesh):
 
 	def __init__(self, space, vertices, faces, center):
-		OdeGeom.__init__(self)
+		Geom.__init__(self)
 		base.Trimesh.__init__(self, space, vertices, faces, center)
 
 		self._inner_object = ode_objects_factories.create_ode_trimesh(
 #==============================================================================
 
 
-class Box(OdeBasicShape, base.Box):
+class Box(BasicShape, base.Box):
 	"""Box shape, aligned along the X, Y and Z axii by default"""
 
 	def __init__(self, space, size):
-		OdeBasicShape.__init__(self)
+		BasicShape.__init__(self)
 		base.Box.__init__(self, space, size)
 
 		self._inner_object = ode_objects_factories.create_ode_box(
 			space.inner_object, size)
 
 
-class Sphere(OdeBasicShape, base.Sphere):
+class Sphere(BasicShape, base.Sphere):
 	"""Spherical shape"""
 
 	def __init__(self, space, radius):
-		OdeBasicShape.__init__(self)
+		BasicShape.__init__(self)
 		base.Sphere.__init__(self, space, radius)
 
 		self._inner_object = ode_objects_factories.create_ode_sphere(
 			space.inner_object, radius)
 
 
-class Capsule(OdeBasicShape, base.Capsule):
+class Capsule(BasicShape, base.Capsule):
 	"""Capsule shape, aligned along the Z-axis by default"""
 
 	def __init__(self, space, length, radius):
-		OdeBasicShape.__init__(self)
+		BasicShape.__init__(self)
 		base.Capsule.__init__(self, space, length, radius)
 
 		self._inner_object = ode_objects_factories.create_ode_capsule(
 			space.inner_object, length, radius)
 
 
-class Cylinder(OdeBasicShape, base.Cylinder):
+class Cylinder(BasicShape, base.Cylinder):
 	"""Cylinder shape, aligned along the Z-axis by default"""
 
 	def __init__(self, space, length, radius):
-		OdeBasicShape.__init__(self)
+		BasicShape.__init__(self)
 		base.Cylinder.__init__(self, space, length, radius)
 
 		self._inner_object = ode_objects_factories.create_ode_cylinder(