Changeset 2442 for code/branches/physics_merge/src/orxonox/objects/collisionshapes

Timestamp:

Dec 14, 2008, 4:16:52 PM (16 years ago)

Author:

rgrieder

Message:

Finally merged physics stuff. Target is physics_merge because I'll have to do some testing first.

Location:

code/branches/physics_merge

Files:

• . (modified) (1 prop)
• src/orxonox/objects/collisionshapes (copied) (copied from code/branches/physics/src/orxonox/objects/collisionshapes) (1 prop)
• src/orxonox/objects/collisionshapes/CMakeLists.txt (added)
• src/orxonox/objects/collisionshapes/CollisionShape.cc (copied) (copied from code/branches/physics/src/orxonox/objects/collisionshapes/CollisionShape.cc) (2 diffs)
• src/orxonox/objects/collisionshapes/CollisionShape.h (copied) (copied from code/branches/physics/src/orxonox/objects/collisionshapes/CollisionShape.h) (1 diff)
• src/orxonox/objects/collisionshapes/CompoundCollisionShape.cc (copied) (copied from code/branches/physics/src/orxonox/objects/collisionshapes/CompoundCollisionShape.cc)
• src/orxonox/objects/collisionshapes/CompoundCollisionShape.h (copied) (copied from code/branches/physics/src/orxonox/objects/collisionshapes/CompoundCollisionShape.h)
• src/orxonox/objects/collisionshapes/PlaneCollisionShape.cc (copied) (copied from code/branches/physics/src/orxonox/objects/collisionshapes/PlaneCollisionShape.cc) (1 diff)
• src/orxonox/objects/collisionshapes/PlaneCollisionShape.h (copied) (copied from code/branches/physics/src/orxonox/objects/collisionshapes/PlaneCollisionShape.h)
• src/orxonox/objects/collisionshapes/SphereCollisionShape.cc (copied) (copied from code/branches/physics/src/orxonox/objects/collisionshapes/SphereCollisionShape.cc) (1 diff)
• src/orxonox/objects/collisionshapes/SphereCollisionShape.h (copied) (copied from code/branches/physics/src/orxonox/objects/collisionshapes/SphereCollisionShape.h)

code/branches/physics_merge/src/orxonox/objects/collisionshapes/CollisionShape.cc

@@ -45 +45 @@
     CollisionShape::CollisionShape(BaseObject* creator)
         : BaseObject(creator)
-        , network::Synchronisable(creator)
+        , Synchronisable(creator)
     {
         RegisterObject(CollisionShape);
@@ -76 +76 @@
     void CollisionShape::registerVariables()
     {
-        REGISTERDATA(this->parentID_, network::direction::toclient, new network::NetworkCallback<CollisionShape>(this, &CollisionShape::parentChanged));
+        registerVariable(this->parentID_, variableDirection::toclient, new NetworkCallback<CollisionShape>(this, &CollisionShape::parentChanged));
     }
 

code/branches/physics_merge/src/orxonox/objects/collisionshapes/CollisionShape.h

@@ -35 +35 @@
 #include "util/Math.h"
 #include "core/BaseObject.h"
-#include "network/Synchronisable.h"
+#include "network/synchronisable/Synchronisable.h"
 
 namespace orxonox
 {
-    class _OrxonoxExport CollisionShape : public BaseObject, public network::Synchronisable
+    class _OrxonoxExport CollisionShape : public BaseObject, public Synchronisable
     {
         public:

code/branches/physics_merge/src/orxonox/objects/collisionshapes/PlaneCollisionShape.cc

@@ -57 +57 @@
     void PlaneCollisionShape::registerVariables()
     {
-        REGISTERDATA(this->normal_, network::direction::toclient, new network::NetworkCallback<PlaneCollisionShape>(this, &PlaneCollisionShape::updatePlane));
-        REGISTERDATA(this->offset_, network::direction::toclient, new network::NetworkCallback<PlaneCollisionShape>(this, &PlaneCollisionShape::updatePlane));
+        registerVariable(this->normal_, variableDirection::toclient, new NetworkCallback<PlaneCollisionShape>(this, &PlaneCollisionShape::updatePlane));
+        registerVariable(this->offset_, variableDirection::toclient, new NetworkCallback<PlaneCollisionShape>(this, &PlaneCollisionShape::updatePlane));
     }
 

code/branches/physics_merge/src/orxonox/objects/collisionshapes/SphereCollisionShape.cc

@@ -58 +58 @@
     void SphereCollisionShape::registerVariables()
     {
-        REGISTERDATA(this->radius_, network::direction::toclient, new network::NetworkCallback<SphereCollisionShape>(this, &SphereCollisionShape::updateSphere));
+        registerVariable(this->radius_, variableDirection::toclient, new NetworkCallback<SphereCollisionShape>(this, &SphereCollisionShape::updateSphere));
     }