Changeset 9667 for code/trunk/src/modules/objects/collisionshapes

Timestamp:

Aug 25, 2013, 9:08:42 PM (11 years ago)

Author:

landauf

Message:

merged core6 back to trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/modules/objects/collisionshapes/BoxCollisionShape.cc (modified) (2 diffs)
• src/modules/objects/collisionshapes/BoxCollisionShape.h (modified) (1 diff)
• src/modules/objects/collisionshapes/ConeCollisionShape.cc (modified) (2 diffs)
• src/modules/objects/collisionshapes/ConeCollisionShape.h (modified) (1 diff)
• src/modules/objects/collisionshapes/PlaneCollisionShape.cc (modified) (2 diffs)
• src/modules/objects/collisionshapes/PlaneCollisionShape.h (modified) (1 diff)
• src/modules/objects/collisionshapes/SphereCollisionShape.cc (modified) (2 diffs)
• src/modules/objects/collisionshapes/SphereCollisionShape.h (modified) (1 diff)

code/trunk/src/modules/objects/collisionshapes/BoxCollisionShape.cc

@@ -42 +42 @@
 namespace orxonox
 {
-    CreateFactory(BoxCollisionShape);
+    RegisterClass(BoxCollisionShape);
 
     /**
@@ -48 +48 @@
         Constructor. Registers and initializes the object.
     */
-    BoxCollisionShape::BoxCollisionShape(BaseObject* creator) : CollisionShape(creator)
+    BoxCollisionShape::BoxCollisionShape(Context* context) : CollisionShape(context)
     {
         RegisterObject(BoxCollisionShape);

code/trunk/src/modules/objects/collisionshapes/BoxCollisionShape.h

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

code/trunk/src/modules/objects/collisionshapes/ConeCollisionShape.cc

@@ -42 +42 @@
 namespace orxonox
 {
-    CreateFactory(ConeCollisionShape);
+    RegisterClass(ConeCollisionShape);
 
     /**
@@ -48 +48 @@
         Constructor. Registers and initializes the object.
     */
-    ConeCollisionShape::ConeCollisionShape(BaseObject* creator) : CollisionShape(creator)
+    ConeCollisionShape::ConeCollisionShape(Context* context) : CollisionShape(context)
     {
         RegisterObject(ConeCollisionShape);

code/trunk/src/modules/objects/collisionshapes/ConeCollisionShape.h

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

code/trunk/src/modules/objects/collisionshapes/PlaneCollisionShape.cc

@@ -42 +42 @@
 namespace orxonox
 {
-    CreateFactory(PlaneCollisionShape);
+    RegisterClass(PlaneCollisionShape);
 
     /**
@@ -48 +48 @@
         Constructor. Registers and initializes the object.
     */
-    PlaneCollisionShape::PlaneCollisionShape(BaseObject* creator) : CollisionShape(creator)
+    PlaneCollisionShape::PlaneCollisionShape(Context* context) : CollisionShape(context)
     {
         RegisterObject(PlaneCollisionShape);

code/trunk/src/modules/objects/collisionshapes/PlaneCollisionShape.h

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

code/trunk/src/modules/objects/collisionshapes/SphereCollisionShape.cc

@@ -42 +42 @@
 namespace orxonox
 {
-    CreateFactory(SphereCollisionShape);
+    RegisterClass(SphereCollisionShape);
 
     /**
@@ -48 +48 @@
         Constructor. registers and initializes the object.
     */
-    SphereCollisionShape::SphereCollisionShape(BaseObject* creator) : CollisionShape(creator)
+    SphereCollisionShape::SphereCollisionShape(Context* context) : CollisionShape(context)
     {
         RegisterObject(SphereCollisionShape);

code/trunk/src/modules/objects/collisionshapes/SphereCollisionShape.h

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