Changeset 2469 for code/branches/presentation

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

Files:

• collisionshapes/CollisionShape.cc (modified) (3 diffs)
• collisionshapes/CompoundCollisionShape.cc (modified) (4 diffs)
• collisionshapes/CompoundCollisionShape.h (modified) (2 diffs)
• worldentities/MobileEntity.cc (modified) (1 diff)
• worldentities/WorldEntity.cc (modified) (2 diffs)

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

@@ -38 +38 @@
 
 #include "CompoundCollisionShape.h"
+#include "objects/worldentities/WorldEntity.h"
 
 namespace orxonox
@@ -55 +56 @@
         this->orientation_ = Quaternion::IDENTITY;
         this->scale_ = Vector3::UNIT_SCALE;
+
+        this->registerVariables();
     }
 
@@ -81 +84 @@
     void CollisionShape::parentChanged()
     {
-        CompoundCollisionShape* parent = dynamic_cast<CompoundCollisionShape*>(Synchronisable::getSynchronisable(this->parentID_));
-        if (parent)
-            parent->addChildShape(this);
+        Synchronisable* synchronisable = Synchronisable::getSynchronisable(this->parentID_);
+        CompoundCollisionShape* CCSparent = dynamic_cast<CompoundCollisionShape*>(synchronisable);
+        if (CCSparent)
+            CCSparent->addChildShape(this);
+        else
+        {
+            WorldEntity* WEparent = dynamic_cast<WorldEntity*>(synchronisable);
+            if (WEparent)
+                WEparent->attachCollisionShape(this);
+        }
     }
 

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

@@ -47 +47 @@
 
         this->compoundShape_  = new btCompoundShape();
+        this->worldEntityParent_ = 0;
     }
 
@@ -66 +67 @@
     }
 
+    void CompoundCollisionShape::setWorldEntityParent(WorldEntity* parent)
+    {
+        // suppress synchronisation
+        this->setObjectMode(0x0);
+
+        this->worldEntityParent_ = parent;
+    }
+
     void CompoundCollisionShape::addChildShape(CollisionShape* shape)
     {
@@ -87 +96 @@
 
         // network synchro
-        shape->setParent(this, this->getObjectID());
+        if (this->worldEntityParent_)
+        {
+            // This compound collision shape belongs to a WE and doesn't get synchronised
+            // So set our parent to be the WE
+            shape->setParent(this, this->worldEntityParent_->getObjectID());
+        }
+        else
+            shape->setParent(this, this->getObjectID());
     }
 
@@ -176 +192 @@
         if (this->parent_)
             this->parent_->updateChildShape(this);
-        else
-        {
-            // We can do this, because the CompoundCollisionShape of a WorldEntity always belongs to it,
-            // as long as its lifetime.
-            WorldEntity* parent = dynamic_cast<WorldEntity*>(this->getCreator());
-            if (parent)
-                parent->notifyCollisionShapeChanged();
-        }
+        else if (this->worldEntityParent_)
+            this->worldEntityParent_->notifyCollisionShapeChanged();
     }
 

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

@@ -52 +52 @@
             void updateChildShape(CollisionShape* shape);
 
-            inline void suppressSynchronisation()
-                { this->setObjectMode(0x0); }
+            void setWorldEntityParent(WorldEntity* parent);
 
         protected:
@@ -63 +62 @@
             btCompoundShape* compoundShape_;
             std::map<CollisionShape*, btCollisionShape*> childShapes_;
+            WorldEntity* worldEntityParent_;
     };
 }

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;