Changeset 9629 for code/branches/core6/src/orxonox/collisionshapes

Timestamp:

Aug 9, 2013, 9:26:46 PM (11 years ago)

Author:

landauf

Message:

BaseObject now requires a Context instead of a creator (BaseObject*) in its constructor.
Namespace, Level, and Scene inherit from Context

Location:

code/branches/core6/src/orxonox/collisionshapes

Files:

• CollisionShape.cc (modified) (1 diff)
• CollisionShape.h (modified) (1 diff)
• CompoundCollisionShape.cc (modified) (1 diff)
• CompoundCollisionShape.h (modified) (1 diff)
• WorldEntityCollisionShape.cc (modified) (1 diff)
• WorldEntityCollisionShape.h (modified) (1 diff)

code/branches/core6/src/orxonox/collisionshapes/CollisionShape.cc

@@ -49 +49 @@
         Constructor. Registers and initializes the object.
     */
-    CollisionShape::CollisionShape(BaseObject* creator)
-        : BaseObject(creator)
-        , Synchronisable(creator)
+    CollisionShape::CollisionShape(Context* context)
+        : BaseObject(context)
+        , Synchronisable(context)
     {
         RegisterObject(CollisionShape);

code/branches/core6/src/orxonox/collisionshapes/CollisionShape.h

@@ -58 +58 @@
     {
         public:
-            CollisionShape(BaseObject* creator);
+            CollisionShape(Context* context);
             virtual ~CollisionShape();
 

code/branches/core6/src/orxonox/collisionshapes/CompoundCollisionShape.cc

@@ -48 +48 @@
         Constructor. Registers and initializes the object.
     */
-    CompoundCollisionShape::CompoundCollisionShape(BaseObject* creator) : CollisionShape(creator)
+    CompoundCollisionShape::CompoundCollisionShape(Context* context) : CollisionShape(context)
     {
         RegisterObject(CompoundCollisionShape);

code/branches/core6/src/orxonox/collisionshapes/CompoundCollisionShape.h

@@ -58 +58 @@
     {
         public:
-            CompoundCollisionShape(BaseObject* creator);
+            CompoundCollisionShape(Context* context);
             virtual ~CompoundCollisionShape();
 

code/branches/core6/src/orxonox/collisionshapes/WorldEntityCollisionShape.cc

@@ -37 +37 @@
 namespace orxonox
 {
-    WorldEntityCollisionShape::WorldEntityCollisionShape(BaseObject* creator) : CompoundCollisionShape(creator)
+    WorldEntityCollisionShape::WorldEntityCollisionShape(Context* context) : CompoundCollisionShape(context)
     {
         RegisterObject(WorldEntityCollisionShape);

code/branches/core6/src/orxonox/collisionshapes/WorldEntityCollisionShape.h

@@ -38 +38 @@
     {
         public:
-            WorldEntityCollisionShape(BaseObject* creator);
+            WorldEntityCollisionShape(Context* context);
             virtual ~WorldEntityCollisionShape();