Changeset 2442 for code/branches/physics_merge/src/orxonox/objects/collisionshapes/CollisionShape.h

Timestamp:

Dec 14, 2008, 4:16:52 PM (17 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/CollisionShape.h (copied) (copied from code/branches/physics/src/orxonox/objects/collisionshapes/CollisionShape.h) (1 diff)

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: