Commits

German Larrain committed 6e9f4a3

collision.adapters: renamed 'OdeEngine' to 'Engine'.

  • Participants
  • Parent commits d1a7c37

Comments (0)

Files changed (2)

File ars/model/collision/adapters.py

 #==============================================================================
 
 
-class OdeEngine(base.Engine):
+class Engine(base.Engine):
 
 	"""Adapter to the ODE collision engine."""
 
 		ray_geom = None
 		other_geom = None
 
-		if args.ignore_connected and OdeEngine.are_geoms_connected(geom1,
+		if args.ignore_connected and Engine.are_geoms_connected(geom1,
 			geom2):
 			return
 
 		#======================================================================
 		# Ray's special case
 		#======================================================================
-		if OdeEngine.is_ray(geom1):
-			if OdeEngine.is_ray(geom2):
+		if Engine.is_ray(geom1):
+			if Engine.is_ray(geom2):
 				print('Weird, ODE says two rays may collide. '
 				      'That case is not handled.')
 				return
 				ray_geom = geom1
 				other_geom = geom2
 
-		elif OdeEngine.is_ray(geom2):
+		elif Engine.is_ray(geom2):
 			ray_geom = geom2
 			other_geom = geom1
 
 		for c in contacts:
 
 			if ray_geom is not None:
-				OdeEngine.handle_ray_collision(ray_geom, other_geom, c)
+				Engine.handle_ray_collision(ray_geom, other_geom, c)
 			else:  # we create a ContactJoint only if both geoms are not rays
 				# set contact parameters
 				c.setBounce(c_joint_bounce)
 
 	def collide(self, args, callback=None):
 		if callback is None:
-			self._inner_object.collide(args, OdeEngine.near_callback)
+			self._inner_object.collide(args, Engine.near_callback)
 		else:
 			self._inner_object.collide(args, callback)
 

File ars/model/simulator/__init__.py

 		# e.g. addTorque
 		self.all_frame_steps_callbacks = []
 
-		self.coll_engine = coll.OdeEngine()
+		self.coll_engine = coll.Engine()
 		self.phs_engine = phs.OdeEngine()
 
 	def add_basic_simulation_objects(self, gravity=G_VECTOR):