Changeset 2465 for code/branches/presentation/src/orxonox

Timestamp:

Dec 15, 2008, 3:16:07 PM (16 years ago)

Author:

rgrieder

Message:

Bugfix in WorldEntity: It creates a CompoundCollisionShape in its c'tor, which is also a synchronisable —> setObjectMode(0x0) to suppress synchronisation.

Location:

code/branches/presentation/src/orxonox/objects

Files:

• collisionshapes/CompoundCollisionShape.h (modified) (1 diff)
• worldentities/WorldEntity.cc (modified) (1 diff)

code/branches/presentation/src/orxonox/objects/collisionshapes/CompoundCollisionShape.h

@@ -52 +52 @@
             void updateChildShape(CollisionShape* shape);
 
+            inline void suppressSynchronisation()
+                { this->setObjectMode(0x0); }
+
         protected:
             virtual void updateParent();

code/branches/presentation/src/orxonox/objects/worldentities/WorldEntity.cc

@@ -72 +72 @@
         this->bPhysicsActive_ = false;
         this->collisionShape_ = new CompoundCollisionShape(this);
+        // Note: CompoundCollisionShape is a Synchronisable, but must not be synchronised.
+        //       All objects will get attached on the client anyway, so we don't need synchronisation.
+        this->collisionShape_->suppressSynchronisation();
         this->collisionType_ = None;
         this->collisionTypeSynchronised_ = None;