German Larrain avatar German Larrain committed 5aff0ce

model:
-removed incomplete implementation of Cone in ODE collision adapter,
-removed incomplete implementation of Cone in ODE physics adapter,
-removed commented out method 'Simulation.add_cone'.

Comments (0)

Files changed (3)

ars/model/collision/adapters.py

 			space.inner_object, normal, dist)
 
 
-class Cone(OdeBasicShape, base.Cone):
-	"""Cone"""
-
-	def __init__(self):
-		super(Cone, self).__init__()
-		raise exc.ArsError("Not available in ODE")
-
-
 class NearCallbackArgs(base.NearCallbackArgs):
 	pass

ars/model/physics/adapters.py

 		self._inner_object = body
 		self.attach_geom(geom)
 
-
-class Cone(OdeBody, base.Cone):
-	def __init__(self, world, space, height, radius, mass=None, density=None):
-		OdeBody.__init__(self, world, space, mass, density)
-		base.Cone.__init__(self, height, radius, mass, density)
-		raise exc.ArsError("Not available in ODE")
-
 #==============================================================================
 # Private functions
 #==============================================================================

ars/model/simulator/__init__.py

 		name = "box" + str(center) #FIXME
 		return self.add_object(SimulatedBody(name, body, g_box))
 
-	#===========================================================================
-	# def add_cone(self, height, radius, center, mass=None, density=None):
-	#	 body, geom = phs.createConeBodyAndGeom(self._world, self._space, density, height, radius)
-	#	 body.setPosition(center)
-	#	
-	#	 g_object = gp.Cone(height, radius, center)
-	#	 self.graphicBodies.append((body, g_object))
-	#	 return graphicObject
-	#	raise exc.ArsError("Not available in ODE")
-	#===========================================================================
-
 	def add_cylinder(self, length, radius, center, mass=None, density=None):
 		body = phs.Cylinder(self._world, self._space, length, radius, mass, density)
 		body.set_position(center)
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.