Changeset 7153 for code/branches/presentation3/src/orxonox/collisionshapes

Timestamp:

Jul 12, 2010, 1:08:58 PM (15 years ago)

Author:

scheusso

Message:

• merged network2 branch into presentation3 branch (lots of network traffic and cpu load improvements)
• fixed network related bugs in BigExplosion

Location:

code/branches/presentation3

Files:

• . (modified) (1 prop)
• src/orxonox/collisionshapes/CollisionShape.h (modified) (2 diffs)

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

@@ -45 +45 @@
 
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
-            void registerVariables();
 
             inline void setPosition(const Vector3& position)
@@ -88 +87 @@
 
         private:
+            void registerVariables();
+
             Vector3                 position_;
             Quaternion              orientation_;