Context Navigation

collisionshapes

Timestamp:

Oct 4, 2015, 9:12:21 PM (9 years ago)

Author:

landauf

Message:

merged branch core7 back to trunk

Location:

code/trunk

Files:

Property svn:mergeinfo changed

r10189	r10624
40	40	namespace orxonox
41	41	{
42		RegisterAbstractClass(AbstractRadiusHeightCollisionShape).inheritsFrom~~(Class(CollisionShape)~~);
	42	RegisterAbstractClass(AbstractRadiusHeightCollisionShape).inheritsFrom<CollisionShape>();
43	43
44	44	/**

-                      r9667
+                      r10624
+    }
-    BoxCollisionShape::~BoxCollisionShape()
+    {
-        // TODO: Move to CollisionShape?
-        if (this->isInitialized())
-            delete this->collisionShape_;
+    }
     void BoxCollisionShape::registerVariables()
+    {

r9667	r10624
58	58	public:
59	59	BoxCollisionShape(Context* context);
60		~~virtual ~BoxCollisionShape();~~
61	60
62	61	virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);

-                      r10189
+                      r10624
+    }
-    ConeCollisionShape::~ConeCollisionShape()
+    {
-        if (this->isInitialized())
-            delete this->collisionShape_;
+    }
     /**
     @brief

r10189	r10624
56	56	public:
57	57	ConeCollisionShape(Context* context);
58		~~virtual ~ConeCollisionShape();~~
59	58
60	59	private:

-                      r10262
+                      r10624
+    }
-    CylinderCollisionShape::~CylinderCollisionShape()
+    {
-        if (this->isInitialized())
-            delete this->collisionShape_;
+    }
     /**
     @brief

r10262	r10624
53	53	public:
54	54	CylinderCollisionShape(Context* context);
55		~~virtual ~CylinderCollisionShape();~~
56	55
57	56	private:

r9667	r10624
59	59	}
60	60
61		~~PlaneCollisionShape::~PlaneCollisionShape()~~
62		{
63		~~if (this->isInitialized())~~
64		~~delete this->collisionShape_;~~
65		}
66
67	61	void PlaneCollisionShape::registerVariables()
68	62	{

r9667	r10624
58	58	public:
59	59	PlaneCollisionShape(Context* context);
60		~~virtual ~PlaneCollisionShape();~~
61	60
62	61	virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);

r9667	r10624
58	58	}
59	59
60		~~SphereCollisionShape::~SphereCollisionShape()~~
61		{
62		~~if (this->isInitialized())~~
63		~~delete this->collisionShape_;~~
64		}
65
66	60	void SphereCollisionShape::registerVariables()
67	61	{

r9667	r10624
56	56	public:
57	57	SphereCollisionShape(Context* context);
58		~~virtual ~SphereCollisionShape();~~
59	58
60	59	virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);

Note: See TracChangeset for help on using the changeset viewer.