Changeset 2469 for code/branches/presentation/src/orxonox/objects/worldentities

Timestamp:

Dec 15, 2008, 7:57:48 PM (16 years ago)

Author:

rgrieder

Message:

Resolved the issue with the collision shape synchronisation.

Location:

code/branches/presentation/src/orxonox/objects/worldentities

Files:

• MobileEntity.cc (modified) (1 diff)
• WorldEntity.cc (modified) (2 diffs)

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

@@ -51 +51 @@
         this->angularAcceleration_ = Vector3::ZERO;
         this->angularVelocity_     = Vector3::ZERO;
+
+        this->registerVariables();
     }
 

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

@@ -74 +74 @@
         // 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->collisionShape_->setWorldEntityParent(this);
         this->collisionType_ = None;
         this->collisionTypeSynchronised_ = None;
@@ -459 +459 @@
     void WorldEntity::setScale3D(const Vector3& scale)
     {
-        if (this->hasPhysics())
+        if (this->hasPhysics() && scale != Vector3::UNIT_SCALE)
         {
             CCOUT(2) << "Warning: Cannot set the scale of a physical object: Not yet implemented." << std::endl;