Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 2562


Ignore:
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
Files:
2 added
9 edited

Legend:

Unmodified
Added
Removed

  • code/branches/presentation/src/orxonox/OrxonoxPrereqs.h

    r2495 r2562  
    203203    class CompoundCollisionShape;
    204204    class PlaneCollisionShape;
     205    class WorldEntityCollisionShape;
    205206
    206207    // tools

  • code/branches/presentation/src/orxonox/objects/collisionshapes/CMakeLists.txt

    r2486 r2562  
    66  PlaneCollisionShape.cc
    77  SphereCollisionShape.cc
     8  WorldEntityCollisionShape.cc
    89)
    910

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

    r2527 r2562  
    3737#include "tools/BulletConversions.h"
    3838
     39#include "objects/worldentities/WorldEntity.h"
    3940#include "CompoundCollisionShape.h"
    40 #include "objects/worldentities/WorldEntity.h"
     41#include "WorldEntityCollisionShape.h"
    4142
    4243namespace orxonox
    … …  
    8586    void CollisionShape::parentChanged()
    8687    {
    87         CompoundCollisionShape* parent = dynamic_cast<CompoundCollisionShape*>(Synchronisable::getSynchronisable(this->parentID_));
    88         if (parent)
    89             parent->attach(this);
     88        Synchronisable* parent = Synchronisable::getSynchronisable(this->parentID_);
     89        // Parent can either be a WorldEntity or a CompoundCollisionShape. The reason is that the
     90        // internal collision shape (which is compound) of a WE doesn't get synchronised.
     91        CompoundCollisionShape* parentCCS = dynamic_cast<CompoundCollisionShape*>(parent);
     92        if (parentCCS)
     93            parentCCS->attach(this);
     94        else
     95        {
     96            WorldEntity* parentWE = dynamic_cast<WorldEntity*>(parent);
     97            if (parentWE)
     98                parentWE->attachCollisionShape(this);
     99        }
     100    }
     101
     102    bool CollisionShape::notifyBeingAttached(CompoundCollisionShape* newParent)
     103    {
     104        if (this->parent_)
     105            this->parent_->detach(this);
     106
     107        this->parent_ = newParent;
     108
     109        WorldEntityCollisionShape* parentWECCS = dynamic_cast<WorldEntityCollisionShape*>(newParent);
     110        if (parentWECCS)
     111            this->parentID_ = parentWECCS->getWorldEntityOwner()->getObjectID();
     112        else
     113            this->parentID_ = newParent->getObjectID();
     114
     115        return true;
     116    }
     117
     118    void CollisionShape::notifyDetached()
     119    {
     120        this->parent_ = 0;
     121        this->parentID_ = OBJECTID_UNKNOWN;
    90122    }
    91123

  • code/branches/presentation/src/orxonox/objects/collisionshapes/CollisionShape.h

    r2515 r2562  
    7575            bool hasTransform() const;
    7676
    77             inline void setParent(CompoundCollisionShape* shape, unsigned int ID)
    78                 { this->parent_ = shape; this->parentID_ = ID; }
     77            bool notifyBeingAttached(CompoundCollisionShape* newParent);
     78            void notifyDetached();
    7979
    8080        protected:
    … …  
    8585            btCollisionShape*       collisionShape_;
    8686            CompoundCollisionShape* parent_;
     87            unsigned int            parentID_;
    8788
    8889        private:
    … …  
    9091            Quaternion              orientation_;
    9192            Vector3                 scale_;
    92             unsigned int            parentID_;
    9393    };
    9494}

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

    r2527 r2562  
    3636#include "core/XMLPort.h"
    3737#include "tools/BulletConversions.h"
    38 #include "objects/worldentities/WorldEntity.h"
    3938
    4039namespace orxonox
    … …  
    4746
    4847        this->compoundShape_  = new btCompoundShape();
    49         this->worldEntityParent_ = 0;
    5048    }
    5149
    … …  
    5957            {
    6058                // make sure that the child doesn't want to detach itself --> speedup because of the missing update
    61                 it->first->setParent(0, OBJECTID_UNKNOWN);
     59                it->first->notifyDetached();
    6260                delete it->first;
    6361            }
    … …  
    7472    }
    7573
    76     void CompoundCollisionShape::setWorldEntityParent(WorldEntity* parent)
    77     {
    78         // suppress synchronisation
    79         this->setObjectMode(0x0);
    80 
    81         this->worldEntityParent_ = parent;
    82     }
    83 
    8474    void CompoundCollisionShape::attach(CollisionShape* shape)
    8575    {
    … …  
    9181            return;
    9282        }
     83
     84        if (!shape->notifyBeingAttached(this))
     85            return;
     86
    9387        this->attachedShapes_[shape] = shape->getCollisionShape();
    9488
    … …  
    10195            this->updatePublicShape();
    10296        }
    103 
    104         // network synchro
    105         if (this->worldEntityParent_)
    106         {
    107             // This compound collision shape belongs to a WE and doesn't get synchronised
    108             // So set our parent to be the WE
    109             shape->setParent(this, this->worldEntityParent_->getObjectID());
    110         }
    111         else
    112             shape->setParent(this, this->getObjectID());
    11397    }
    11498
    … …  
    117101        if (this->attachedShapes_.find(shape) != this->attachedShapes_.end())
    118102        {
    119             shape->setParent(0, OBJECTID_UNKNOWN);
    120103            this->attachedShapes_.erase(shape);
    121104            if (shape->getCollisionShape())
    122105                this->compoundShape_->removeChildShape(shape->getCollisionShape());
     106            shape->notifyDetached();
    123107
    124108            this->updatePublicShape();
    … …  
    197181    }
    198182
    199     void CompoundCollisionShape::updateParent()
    200     {
    201         if (this->parent_)
    202             this->parent_->updateAttachedShape(this);
    203         if (this->worldEntityParent_)
    204             this->worldEntityParent_->notifyCollisionShapeChanged();
    205     }
    206 
    207     void CompoundCollisionShape::parentChanged()
    208     {
    209         if (!this->worldEntityParent_)
    210             CollisionShape::parentChanged();
    211     }
    212 
    213183    CollisionShape* CompoundCollisionShape::getAttachedShape(unsigned int index) const
    214184    {

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

    r2527 r2562  
    5353            void updateAttachedShape(CollisionShape* shape);
    5454
    55             void setWorldEntityParent(WorldEntity* parent);
    56 
    57         protected:
    58             virtual void updateParent();
    59 
    6055        private:
    6156            void updatePublicShape();
    62             void parentChanged();
    6357            inline virtual btCollisionShape* createNewShape() const
    6458                { assert(false); return 0; }
    … …  
    6660            btCompoundShape* compoundShape_;
    6761            std::map<CollisionShape*, btCollisionShape*> attachedShapes_;
    68             WorldEntity* worldEntityParent_;
    6962    };
    7063}

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

    r2540 r2562  
    4242
    4343#include "objects/Scene.h"
     44#include "objects/collisionshapes/WorldEntityCollisionShape.h"
    4445
    4546namespace orxonox
    … …  
    5758        All the default values are being set here.
    5859    */
    59     WorldEntity::WorldEntity(BaseObject* creator) : BaseObject(creator), Synchronisable(creator), collisionShape_(0)
     60    WorldEntity::WorldEntity(BaseObject* creator) : BaseObject(creator), Synchronisable(creator)
    6061    {
    6162        RegisterObject(WorldEntity);
    … …  
    7475
    7576        // Default behaviour does not include physics
    76         // Note: CompoundCollisionShape is a Synchronisable, but must not be synchronised.
    77         //       All objects will get attached on the client anyway, so we don't need synchronisation.
    78         this->collisionShape_.setWorldEntityParent(this);
    7977        this->physicalBody_   = 0;
    8078        this->bPhysicsActive_ = false;
    8179        this->bPhysicsActiveSynchronised_    = false;
    8280        this->bPhysicsActiveBeforeAttaching_ = false;
     81        this->collisionShape_ = new WorldEntityCollisionShape(this);
    8382        this->collisionType_             = None;
    8483        this->collisionTypeSynchronised_ = None;
    … …  
    115114                delete this->physicalBody_;
    116115            }
     116            delete this->collisionShape_;
    117117
    118118            this->node_->detachAllObjects();
    … …  
    291291        this->children_.insert(object);
    292292
    293         this->attachCollisionShape(&object->collisionShape_);
     293        this->attachCollisionShape(object->collisionShape_);
    294294        // mass
    295295        this->childrenMass_ += object->getMass();
    … …  
    345345
    346346        // apply transform to collision shape
    347         this->collisionShape_.setPosition(this->getPosition());
    348         this->collisionShape_.setOrientation(this->getOrientation());
     347        this->collisionShape_->setPosition(this->getPosition());
     348        this->collisionShape_->setOrientation(this->getOrientation());
    349349        // TODO: Scale
    350350       
    … …  
    365365
    366366        // collision shapes
    367         this->detachCollisionShape(&object->collisionShape_);
     367        this->detachCollisionShape(object->collisionShape_);
    368368
    369369        // mass
    … …  
    390390
    391391        // reset orientation of the collisionShape (cannot be set within a WE usually)
    392         this->collisionShape_.setPosition(Vector3::ZERO);
    393         this->collisionShape_.setOrientation(Quaternion::IDENTITY);
     392        this->collisionShape_->setPosition(Vector3::ZERO);
     393        this->collisionShape_->setOrientation(Quaternion::IDENTITY);
    394394        // TODO: Scale
    395395
    … …  
    451451    void WorldEntity::attachCollisionShape(CollisionShape* shape)
    452452    {
    453         this->collisionShape_.attach(shape);
     453        this->collisionShape_->attach(shape);
    454454        // Note: this->collisionShape_ already notifies us of any changes.
    455455    }
    … …  
    458458    void WorldEntity::detachCollisionShape(CollisionShape* shape)
    459459    {
    460         this->collisionShape_.detach(shape);
     460        // Note: The collision shapes may not be detached with this function!
     461        this->collisionShape_->detach(shape);
    461462        // Note: this->collisionShape_ already notifies us of any changes.
    462463    }
    … …  
    465466    CollisionShape* WorldEntity::getAttachedCollisionShape(unsigned int index)
    466467    {
    467         return this->collisionShape_.getAttachedShape(index);
     468        return this->collisionShape_->getAttachedShape(index);
    468469    }
    469470
    … …  
    718719*/
    719720            // Create new rigid body
    720             btRigidBody::btRigidBodyConstructionInfo bodyConstructionInfo(0, this, this->collisionShape_.getCollisionShape());
     721            btRigidBody::btRigidBodyConstructionInfo bodyConstructionInfo(0, this, this->collisionShape_->getCollisionShape());
    721722            this->physicalBody_ = new btRigidBody(bodyConstructionInfo);
    722723            this->physicalBody_->setUserPointer(this);
    … …  
    851852            {
    852853                this->deactivatePhysics();
    853                 this->physicalBody_->setCollisionShape(this->collisionShape_.getCollisionShape());
     854                this->physicalBody_->setCollisionShape(this->collisionShape_->getCollisionShape());
    854855                this->activatePhysics();
    855856            }
    856857            else
    857                 this->physicalBody_->setCollisionShape(this->collisionShape_.getCollisionShape());
     858                this->physicalBody_->setCollisionShape(this->collisionShape_->getCollisionShape());
    858859        }
    859860        recalculateMassProps();
    … …  
    865866        // Store local inertia for faster access. Evaluates to (0,0,0) if there is no collision shape.
    866867        float totalMass = this->mass_ + this->childrenMass_;
    867         this->collisionShape_.calculateLocalInertia(totalMass, this->localInertia_);
     868        this->collisionShape_->calculateLocalInertia(totalMass, this->localInertia_);
    868869        if (this->hasPhysics())
    869870        {
    … …  
    878879                CCOUT(4) << "Warning: Setting the internal physical mass to 1.0 because mass_ is 0.0" << std::endl;
    879880                btVector3 inertia(0, 0, 0);
    880                 this->collisionShape_.calculateLocalInertia(1.0f, inertia);
     881                this->collisionShape_->calculateLocalInertia(1.0f, inertia);
    881882                this->physicalBody_->setMassProps(1.0f, inertia);
    882883            }

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

    r2540 r2562  
    4343#include "core/BaseObject.h"
    4444#include "network/synchronisable/Synchronisable.h"
    45 #include "objects/collisionshapes/CompoundCollisionShape.h"
    4645
    4746namespace orxonox
    … …  
    6968        You can get more information at the corresponding set function.
    7069
    71         Collision shapes: These are controlled by the internal CompoundCollisionShape. @see CompoundCollisionShape.
     70        Collision shapes: These are controlled by the internal WorldEntityCollisionShape. @see WorldEntityCollisionShape.
    7271    */
    7372    class _OrxonoxExport WorldEntity : public BaseObject, public Synchronisable, public btMotionState
    … …  
    399398            //! When attaching objects hierarchically this variable tells this object (as child) whether physics was activated before attaching (because the deactivate physics while being attached).
    400399            bool                         bPhysicsActiveBeforeAttaching_;
    401             CompoundCollisionShape       collisionShape_;                //!< Attached collision shapes go here
     400            WorldEntityCollisionShape*   collisionShape_;                //!< Attached collision shapes go here
    402401            btScalar                     mass_;                          //!< @see setMass
    403402            btVector3                    localInertia_;                  //!< @see getLocalInertia

  • code/branches/presentation/visual_studio/vc8/orxonox.vcproj

    r2538 r2562  
    524524                                                >
    525525                                        </File>
     526                                        <File
     527                                                RelativePath="..\..\src\orxonox\objects\collisionshapes\WorldEntityCollisionShape.cc"
     528                                                >
     529                                        </File>
    526530                                </Filter>
    527531                                <Filter
    … …  
    12941298                                        <File
    12951299                                                RelativePath="..\..\src\orxonox\objects\collisionshapes\SphereCollisionShape.h"
     1300                                                >
     1301                                        </File>
     1302                                        <File
     1303                                                RelativePath="..\..\src\orxonox\objects\collisionshapes\WorldEntityCollisionShape.h"
    12961304                                                >
    12971305                                        </File>
Note: See TracChangeset for help on using the changeset viewer.