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

Timestamp:

Jan 1, 2009, 7:34:44 PM (16 years ago)

Author:

rgrieder

Message:

• Added WorldEntityCollisionShape to clarify when a CompoundCollisionShape belongs to a WE.
• Also fixed problems with the synchronisation of the CollisionShape hierarchy.

Location:

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

Files:

• WorldEntity.cc (modified) (15 diffs)
• WorldEntity.h (modified) (3 diffs)

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

@@ -42 +42 @@
 
 #include "objects/Scene.h"
+#include "objects/collisionshapes/WorldEntityCollisionShape.h"
 
 namespace orxonox
@@ -57 +58 @@
         All the default values are being set here.
     */
-    WorldEntity::WorldEntity(BaseObject* creator) : BaseObject(creator), Synchronisable(creator), collisionShape_(0)
+    WorldEntity::WorldEntity(BaseObject* creator) : BaseObject(creator), Synchronisable(creator)
     {
         RegisterObject(WorldEntity);
@@ -74 +75 @@
 
         // Default behaviour does not include physics
-        // 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_.setWorldEntityParent(this);
         this->physicalBody_   = 0;
         this->bPhysicsActive_ = false;
         this->bPhysicsActiveSynchronised_    = false;
         this->bPhysicsActiveBeforeAttaching_ = false;
+        this->collisionShape_ = new WorldEntityCollisionShape(this);
         this->collisionType_             = None;
         this->collisionTypeSynchronised_ = None;
@@ -115 +114 @@
                 delete this->physicalBody_;
             }
+            delete this->collisionShape_;
 
             this->node_->detachAllObjects();
@@ -291 +291 @@
         this->children_.insert(object);
 
-        this->attachCollisionShape(&object->collisionShape_);
+        this->attachCollisionShape(object->collisionShape_);
         // mass
         this->childrenMass_ += object->getMass();
@@ -345 +345 @@
 
         // apply transform to collision shape
-        this->collisionShape_.setPosition(this->getPosition());
-        this->collisionShape_.setOrientation(this->getOrientation());
+        this->collisionShape_->setPosition(this->getPosition());
+        this->collisionShape_->setOrientation(this->getOrientation());
         // TODO: Scale
         
@@ -365 +365 @@
 
         // collision shapes
-        this->detachCollisionShape(&object->collisionShape_);
+        this->detachCollisionShape(object->collisionShape_);
 
         // mass
@@ -390 +390 @@
 
         // reset orientation of the collisionShape (cannot be set within a WE usually)
-        this->collisionShape_.setPosition(Vector3::ZERO);
-        this->collisionShape_.setOrientation(Quaternion::IDENTITY);
+        this->collisionShape_->setPosition(Vector3::ZERO);
+        this->collisionShape_->setOrientation(Quaternion::IDENTITY);
         // TODO: Scale
 
@@ -451 +451 @@
     void WorldEntity::attachCollisionShape(CollisionShape* shape)
     {
-        this->collisionShape_.attach(shape);
+        this->collisionShape_->attach(shape);
         // Note: this->collisionShape_ already notifies us of any changes.
     }
@@ -458 +458 @@
     void WorldEntity::detachCollisionShape(CollisionShape* shape)
     {
-        this->collisionShape_.detach(shape);
+        // Note: The collision shapes may not be detached with this function!
+        this->collisionShape_->detach(shape);
         // Note: this->collisionShape_ already notifies us of any changes.
     }
@@ -465 +466 @@
     CollisionShape* WorldEntity::getAttachedCollisionShape(unsigned int index)
     {
-        return this->collisionShape_.getAttachedShape(index);
+        return this->collisionShape_->getAttachedShape(index);
     }
 
@@ -718 +719 @@
 */
             // Create new rigid body
-            btRigidBody::btRigidBodyConstructionInfo bodyConstructionInfo(0, this, this->collisionShape_.getCollisionShape());
+            btRigidBody::btRigidBodyConstructionInfo bodyConstructionInfo(0, this, this->collisionShape_->getCollisionShape());
             this->physicalBody_ = new btRigidBody(bodyConstructionInfo);
             this->physicalBody_->setUserPointer(this);
@@ -851 +852 @@
             {
                 this->deactivatePhysics();
-                this->physicalBody_->setCollisionShape(this->collisionShape_.getCollisionShape());
+                this->physicalBody_->setCollisionShape(this->collisionShape_->getCollisionShape());
                 this->activatePhysics();
             }
             else
-                this->physicalBody_->setCollisionShape(this->collisionShape_.getCollisionShape());
+                this->physicalBody_->setCollisionShape(this->collisionShape_->getCollisionShape());
         }
         recalculateMassProps();
@@ -865 +866 @@
         // Store local inertia for faster access. Evaluates to (0,0,0) if there is no collision shape.
         float totalMass = this->mass_ + this->childrenMass_;
-        this->collisionShape_.calculateLocalInertia(totalMass, this->localInertia_);
+        this->collisionShape_->calculateLocalInertia(totalMass, this->localInertia_);
         if (this->hasPhysics())
         {
@@ -878 +879 @@
                 CCOUT(4) << "Warning: Setting the internal physical mass to 1.0 because mass_ is 0.0" << std::endl;
                 btVector3 inertia(0, 0, 0);
-                this->collisionShape_.calculateLocalInertia(1.0f, inertia);
+                this->collisionShape_->calculateLocalInertia(1.0f, inertia);
                 this->physicalBody_->setMassProps(1.0f, inertia);
             }

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

@@ -43 +43 @@
 #include "core/BaseObject.h"
 #include "network/synchronisable/Synchronisable.h"
-#include "objects/collisionshapes/CompoundCollisionShape.h"
 
 namespace orxonox
@@ -69 +68 @@
         You can get more information at the corresponding set function.
 
-        Collision shapes: These are controlled by the internal CompoundCollisionShape. @see CompoundCollisionShape.
+        Collision shapes: These are controlled by the internal WorldEntityCollisionShape. @see WorldEntityCollisionShape.
     */
     class _OrxonoxExport WorldEntity : public BaseObject, public Synchronisable, public btMotionState
@@ -399 +398 @@
             //! When attaching objects hierarchically this variable tells this object (as child) whether physics was activated before attaching (because the deactivate physics while being attached).
             bool                         bPhysicsActiveBeforeAttaching_;
-            CompoundCollisionShape       collisionShape_;                //!< Attached collision shapes go here
+            WorldEntityCollisionShape*   collisionShape_;                //!< Attached collision shapes go here
             btScalar                     mass_;                          //!< @see setMass
             btVector3                    localInertia_;                  //!< @see getLocalInertia