Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 2408


Ignore:
Timestamp:
Dec 11, 2008, 2:18:34 PM (16 years ago)
Author:
rgrieder
Message:

Renamed MovableEntity to MobileEntity and LinearEntity to MovableEntity.

Location:
code/branches/physics
Files:
2 deleted
10 edited
2 copied

Legend:

Unmodified
Added
Removed
  • code/branches/physics/src/orxonox/CMakeLists.txt

    r2405 r2408  
    5757  objects/worldentities/StaticEntity.cc
    5858  objects/worldentities/MovableEntity.cc
    59   objects/worldentities/LinearEntity.cc
     59  objects/worldentities/MobileEntity.cc
    6060  objects/worldentities/ControllableEntity.cc
    6161  objects/worldentities/Model.cc
  • code/branches/physics/src/orxonox/OrxonoxPrereqs.h

    r2374 r2408  
    104104    class WorldEntity;
    105105    class StaticEntity;
     106    class MobileEntity;
     107    class ControllableEntity;
    106108    class MovableEntity;
    107     class ControllableEntity;
    108     class LinearEntity;
    109109    class Sublevel;
    110110
  • code/branches/physics/src/orxonox/objects/weaponSystem/projectiles/Projectile.cc

    r2100 r2408  
    4646    float Projectile::speed_s = 5000;
    4747
    48     Projectile::Projectile(BaseObject* creator, Weapon* owner) : MovableEntity(creator), owner_(owner)
     48    Projectile::Projectile(BaseObject* creator, Weapon* owner) : MobileEntity(creator), owner_(owner)
    4949    {
    5050        RegisterObject(Projectile);
  • code/branches/physics/src/orxonox/objects/weaponSystem/projectiles/Projectile.h

    r2099 r2408  
    3232#include "OrxonoxPrereqs.h"
    3333
    34 #include "objects/worldentities/MovableEntity.h"
     34#include "objects/worldentities/MobileEntity.h"
    3535#include "tools/Timer.h"
    3636
    3737namespace orxonox
    3838{
    39     class _OrxonoxExport Projectile : public MovableEntity
     39    class _OrxonoxExport Projectile : public MobileEntity
    4040    {
    4141        public:
  • code/branches/physics/src/orxonox/objects/worldentities/ControllableEntity.cc

    r2407 r2408  
    4444    CreateFactory(ControllableEntity);
    4545
    46     ControllableEntity::ControllableEntity(BaseObject* creator) : MovableEntity(creator)
     46    ControllableEntity::ControllableEntity(BaseObject* creator) : MobileEntity(creator)
    4747    {
    4848        RegisterObject(ControllableEntity);
     
    226226    void ControllableEntity::tick(float dt)
    227227    {
    228         MovableEntity::tick(dt);
     228        MobileEntity::tick(dt);
    229229
    230230        if (this->isActive())
  • code/branches/physics/src/orxonox/objects/worldentities/ControllableEntity.h

    r2407 r2408  
    3232#include "OrxonoxPrereqs.h"
    3333
    34 #include "MovableEntity.h"
     34#include "MobileEntity.h"
    3535
    3636namespace orxonox
    3737{
    38     class _OrxonoxExport ControllableEntity : public MovableEntity
     38    class _OrxonoxExport ControllableEntity : public MobileEntity
    3939    {
    4040        public:
  • code/branches/physics/src/orxonox/objects/worldentities/MobileEntity.cc

    r2407 r2408  
    2828
    2929#include "OrxonoxStableHeaders.h"
    30 #include "MovableEntity.h"
     30#include "MobileEntity.h"
    3131
    3232#include "BulletDynamics/Dynamics/btRigidBody.h"
     
    4242namespace orxonox
    4343{
    44     MovableEntity::MovableEntity(BaseObject* creator) : WorldEntity(creator)
    45     {
    46         RegisterObject(MovableEntity);
     44    MobileEntity::MobileEntity(BaseObject* creator) : WorldEntity(creator)
     45    {
     46        RegisterObject(MobileEntity);
    4747
    4848        this->linearAcceleration_  = Vector3::ZERO;
     
    5454    }
    5555
    56     MovableEntity::~MovableEntity()
    57     {
    58     }
    59 
    60     void MovableEntity::XMLPort(Element& xmlelement, XMLPort::Mode mode)
    61     {
    62         SUPER(MovableEntity, XMLPort, xmlelement, mode);
    63 
    64         XMLPortParamTemplate(MovableEntity, "velocity",     setVelocity,     getVelocity,     xmlelement, mode, const Vector3&);
    65         XMLPortParamTemplate(MovableEntity, "rotationaxis", setRotationAxis, getRotationAxis, xmlelement, mode, const Vector3&);
    66         XMLPortParam(MovableEntity, "rotationrate", setRotationRate, getRotationRate, xmlelement, mode);
    67     }
    68 
    69     void MovableEntity::registerVariables()
    70     {
    71     }
    72 
    73     void MovableEntity::tick(float dt)
     56    MobileEntity::~MobileEntity()
     57    {
     58    }
     59
     60    void MobileEntity::XMLPort(Element& xmlelement, XMLPort::Mode mode)
     61    {
     62        SUPER(MobileEntity, XMLPort, xmlelement, mode);
     63
     64        XMLPortParamTemplate(MobileEntity, "velocity",     setVelocity,     getVelocity,     xmlelement, mode, const Vector3&);
     65        XMLPortParamTemplate(MobileEntity, "rotationaxis", setRotationAxis, getRotationAxis, xmlelement, mode, const Vector3&);
     66        XMLPortParam(MobileEntity, "rotationrate", setRotationRate, getRotationRate, xmlelement, mode);
     67    }
     68
     69    void MobileEntity::registerVariables()
     70    {
     71    }
     72
     73    void MobileEntity::tick(float dt)
    7474    {
    7575        if (this->isActive())
     
    104104    }
    105105
    106     void MovableEntity::setPosition(const Vector3& position)
     106    void MobileEntity::setPosition(const Vector3& position)
    107107    {
    108108        if (this->isDynamic())
     
    117117    }
    118118
    119     void MovableEntity::translate(const Vector3& distance, Ogre::Node::TransformSpace relativeTo)
     119    void MobileEntity::translate(const Vector3& distance, Ogre::Node::TransformSpace relativeTo)
    120120    {
    121121        if (this->isDynamic())
     
    130130    }
    131131
    132     void MovableEntity::setOrientation(const Quaternion& orientation)
     132    void MobileEntity::setOrientation(const Quaternion& orientation)
    133133    {
    134134        if (this->isDynamic())
     
    143143    }
    144144
    145     void MovableEntity::rotate(const Quaternion& rotation, Ogre::Node::TransformSpace relativeTo)
     145    void MobileEntity::rotate(const Quaternion& rotation, Ogre::Node::TransformSpace relativeTo)
    146146    {
    147147        if (this->isDynamic())
     
    157157    }
    158158
    159     void MovableEntity::yaw(const Degree& angle, Ogre::Node::TransformSpace relativeTo)
     159    void MobileEntity::yaw(const Degree& angle, Ogre::Node::TransformSpace relativeTo)
    160160    {
    161161        if (this->isDynamic())
     
    172172    }
    173173
    174     void MovableEntity::pitch(const Degree& angle, Ogre::Node::TransformSpace relativeTo)
     174    void MobileEntity::pitch(const Degree& angle, Ogre::Node::TransformSpace relativeTo)
    175175    {
    176176        if (this->isDynamic())
     
    187187    }
    188188
    189     void MovableEntity::roll(const Degree& angle, Ogre::Node::TransformSpace relativeTo)
     189    void MobileEntity::roll(const Degree& angle, Ogre::Node::TransformSpace relativeTo)
    190190    {
    191191        if (this->isDynamic())
     
    202202    }
    203203
    204     void MovableEntity::lookAt(const Vector3& target, Ogre::Node::TransformSpace relativeTo, const Vector3& localDirectionVector)
     204    void MobileEntity::lookAt(const Vector3& target, Ogre::Node::TransformSpace relativeTo, const Vector3& localDirectionVector)
    205205    {
    206206        if (this->isDynamic())
     
    215215    }
    216216
    217     void MovableEntity::setDirection(const Vector3& direction, Ogre::Node::TransformSpace relativeTo, const Vector3& localDirectionVector)
     217    void MobileEntity::setDirection(const Vector3& direction, Ogre::Node::TransformSpace relativeTo, const Vector3& localDirectionVector)
    218218    {
    219219        if (this->isDynamic())
     
    228228    }
    229229
    230     void MovableEntity::setVelocity(const Vector3& velocity)
     230    void MobileEntity::setVelocity(const Vector3& velocity)
    231231    {
    232232        if (this->isDynamic())
     
    237237    }
    238238
    239     void MovableEntity::setAngularVelocity(const Vector3& velocity)
     239    void MobileEntity::setAngularVelocity(const Vector3& velocity)
    240240    {
    241241        if (this->isDynamic())
     
    246246    }
    247247
    248     void MovableEntity::setAcceleration(const Vector3& acceleration)
     248    void MobileEntity::setAcceleration(const Vector3& acceleration)
    249249    {
    250250        if (this->isDynamic())
     
    254254    }
    255255
    256     void MovableEntity::setAngularAcceleration(const Vector3& acceleration)
     256    void MobileEntity::setAngularAcceleration(const Vector3& acceleration)
    257257    {
    258258        if (this->isDynamic())
     
    265265    }
    266266
    267     bool MovableEntity::isCollisionTypeLegal(WorldEntity::CollisionType type) const
     267    bool MobileEntity::isCollisionTypeLegal(WorldEntity::CollisionType type) const
    268268    {
    269269        if (type == WorldEntity::Static)
    270270        {
    271             ThrowException(PhysicsViolation, "Cannot tell a MovableEntity to have static collision type");
     271            ThrowException(PhysicsViolation, "Cannot tell a MobileEntity to have static collision type");
    272272            return false;
    273273        }
     
    276276    }
    277277
    278     void MovableEntity::setWorldTransform(const btTransform& worldTrans)
     278    void MobileEntity::setWorldTransform(const btTransform& worldTrans)
    279279    {
    280280        // We use a dynamic body. So we translate our node accordingly.
     
    293293    }
    294294
    295     void MovableEntity::getWorldTransform(btTransform& worldTrans) const
     295    void MobileEntity::getWorldTransform(btTransform& worldTrans) const
    296296    {
    297297        // We use a kinematic body
  • code/branches/physics/src/orxonox/objects/worldentities/MobileEntity.h

    r2407 r2408  
    2727 */
    2828
    29 #ifndef _MovableEntity_H__
    30 #define _MovableEntity_H__
     29#ifndef _MobileEntity_H__
     30#define _MobileEntity_H__
    3131
    3232#include "OrxonoxPrereqs.h"
     
    3737namespace orxonox
    3838{
    39     class _OrxonoxExport MovableEntity : public WorldEntity, public Tickable
     39    class _OrxonoxExport MobileEntity : public WorldEntity, public Tickable
    4040    {
    4141        public:
    42             MovableEntity(BaseObject* creator);
    43             virtual ~MovableEntity();
     42            MobileEntity(BaseObject* creator);
     43            virtual ~MobileEntity();
    4444
    4545            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
     
    121121}
    122122
    123 #endif /* _MovableEntity_H__ */
     123#endif /* _MobileEntity_H__ */
  • code/branches/physics/src/orxonox/objects/worldentities/MovableEntity.cc

    r2407 r2408  
    2121 *
    2222 *   Author:
    23  *      Reto Grieder
     23 *      Fabian 'x3n' Landau
    2424 *   Co-authors:
    25  *      Martin Stypinski
     25 *      ...
    2626 *
    2727 */
     
    3030#include "MovableEntity.h"
    3131
    32 #include "BulletDynamics/Dynamics/btRigidBody.h"
    33 
    34 #include "util/Debug.h"
    35 #include "util/MathConvert.h"
    36 #include "util/Exception.h"
    3732#include "core/CoreIncludes.h"
    3833#include "core/XMLPort.h"
    39 
    40 #include "objects/Scene.h"
     34#include "core/Executor.h"
     35#include "tools/Timer.h"
    4136
    4237namespace orxonox
    4338{
    44     MovableEntity::MovableEntity(BaseObject* creator) : WorldEntity(creator)
     39    static const float MAX_RESYNCHRONIZE_TIME = 3.0f;
     40
     41    CreateFactory(MovableEntity);
     42
     43    MovableEntity::MovableEntity(BaseObject* creator) : MobileEntity(creator)
    4544    {
    4645        RegisterObject(MovableEntity);
    4746
    48         this->linearAcceleration_  = Vector3::ZERO;
    49         this->linearVelocity_      = Vector3::ZERO;
    50         this->angularAcceleration_ = Vector3::ZERO;
    51         this->angularVelocity_     = Vector3::ZERO;
     47        this->overwrite_position_    = Vector3::ZERO;
     48        this->overwrite_orientation_ = Quaternion::IDENTITY;
    5249
    5350        this->registerVariables();
     
    6158    {
    6259        SUPER(MovableEntity, XMLPort, xmlelement, mode);
    63 
    64         XMLPortParamTemplate(MovableEntity, "velocity",     setVelocity,     getVelocity,     xmlelement, mode, const Vector3&);
    65         XMLPortParamTemplate(MovableEntity, "rotationaxis", setRotationAxis, getRotationAxis, xmlelement, mode, const Vector3&);
    66         XMLPortParam(MovableEntity, "rotationrate", setRotationRate, getRotationRate, xmlelement, mode);
    6760    }
    6861
    6962    void MovableEntity::registerVariables()
    7063    {
     64        REGISTERDATA(this->linearVelocity_,        network::direction::toclient, new network::NetworkCallback<MovableEntity>(this, &MovableEntity::processLinearVelocity));
     65        REGISTERDATA(this->angularVelocity_,       network::direction::toclient, new network::NetworkCallback<MovableEntity>(this, &MovableEntity::processAngularVelocity));
     66
     67        REGISTERDATA(this->overwrite_position_,    network::direction::toclient, new network::NetworkCallback<MovableEntity>(this, &MovableEntity::overwritePosition));
     68        REGISTERDATA(this->overwrite_orientation_, network::direction::toclient, new network::NetworkCallback<MovableEntity>(this, &MovableEntity::overwriteOrientation));
    7169    }
    7270
    7371    void MovableEntity::tick(float dt)
    7472    {
     73        MobileEntity::tick(dt);
     74
    7575        if (this->isActive())
    7676        {
    77             // Check whether Bullet doesn't do the physics for us
    78             if (!this->isDynamic())
    79             {
    80                 // Linear part
    81                 this->linearVelocity_.x += this->linearAcceleration_.x * dt;
    82                 this->linearVelocity_.y += this->linearAcceleration_.y * dt;
    83                 this->linearVelocity_.z += this->linearAcceleration_.z * dt;
    84                 linearVelocityChanged(true);
    85                 this->node_->translate(this->linearVelocity_ * dt);
    86                 positionChanged(true);
    87 
    88                 // Angular part
    89                 // Note: angularVelocity_ is a Quaternion with w = 0 while angularAcceleration_ is a Vector3
    90                 this->angularVelocity_.x += angularAcceleration_.x * dt;
    91                 this->angularVelocity_.y += angularAcceleration_.y * dt;
    92                 this->angularVelocity_.z += angularAcceleration_.z * dt;
    93                 angularVelocityChanged(true);
    94                 // Calculate new orientation with quaternion derivative. This is about 30% faster than with angle/axis method.
    95                 float mult = dt * 0.5;
    96                 // TODO: this could be optimized by writing it out. The calls currently create 4 new Quaternions!
    97                 Quaternion newOrientation(0.0f, this->angularVelocity_.x * mult, this->angularVelocity_.y * mult, this->angularVelocity_.z * mult);
    98                 newOrientation = this->node_->getOrientation() + newOrientation * this->node_->getOrientation();
    99                 newOrientation.normalise();
    100                 this->node_->setOrientation(newOrientation);
    101                 orientationChanged(true);
    102             }
    10377        }
    10478    }
    10579
    106     void MovableEntity::setPosition(const Vector3& position)
     80    void MovableEntity::overwritePosition()
    10781    {
    108         if (this->isDynamic())
    109         {
    110             btTransform transf = this->physicalBody_->getWorldTransform();
    111             transf.setOrigin(btVector3(position.x, position.y, position.z));
    112             this->physicalBody_->setWorldTransform(transf);
    113         }
    114 
    115         this->node_->setPosition(position);
    116         positionChanged(false);
     82        this->setPosition(this->overwrite_position_);
    11783    }
    11884
    119     void MovableEntity::translate(const Vector3& distance, Ogre::Node::TransformSpace relativeTo)
     85    void MovableEntity::overwriteOrientation()
    12086    {
    121         if (this->isDynamic())
    122         {
    123             OrxAssert(relativeTo == Ogre::Node::TS_LOCAL, "Cannot translate physical object relative \
    124                                                           to any other space than TS_LOCAL.");
    125             this->physicalBody_->translate(btVector3(distance.x, distance.y, distance.z));
    126         }
    127 
    128         this->node_->translate(distance, relativeTo);
    129         positionChanged(false);
     87        this->setOrientation(this->overwrite_orientation_);
    13088    }
    13189
    132     void MovableEntity::setOrientation(const Quaternion& orientation)
     90    void MovableEntity::clientConnected(unsigned int clientID)
    13391    {
    134         if (this->isDynamic())
    135         {
    136             btTransform transf = this->physicalBody_->getWorldTransform();
    137             transf.setRotation(btQuaternion(orientation.x, orientation.y, orientation.z, orientation.w));
    138             this->physicalBody_->setWorldTransform(transf);
    139         }
     92        resynchronize();
     93        new Timer<MovableEntity>(rnd() * MAX_RESYNCHRONIZE_TIME, true, this, createExecutor(createFunctor(&MovableEntity::resynchronize)), false);
     94    }
    14095
    141         this->node_->setOrientation(orientation);
     96    void MovableEntity::clientDisconnected(unsigned int clientID)
     97    {
     98    }
     99
     100    void MovableEntity::resynchronize()
     101    {
     102        positionChanged(false);
    142103        orientationChanged(false);
    143104    }
    144105
    145     void MovableEntity::rotate(const Quaternion& rotation, Ogre::Node::TransformSpace relativeTo)
     106    void MovableEntity::positionChanged(bool bContinuous)
    146107    {
    147         if (this->isDynamic())
    148         {
    149             OrxAssert(relativeTo == Ogre::Node::TS_LOCAL, "Cannot rotate physical object relative \
    150                                                           to any other space than TS_LOCAL.");
    151             btTransform transf = this->physicalBody_->getWorldTransform();
    152             this->physicalBody_->setWorldTransform(transf * btTransform(btQuaternion(rotation.x, rotation.y, rotation.z, rotation.w)));
    153         }
    154 
    155         this->node_->rotate(rotation, relativeTo);
    156         orientationChanged(false);
     108        if (!bContinuous)
     109            this->overwrite_position_ = this->getPosition();
    157110    }
    158111
    159     void MovableEntity::yaw(const Degree& angle, Ogre::Node::TransformSpace relativeTo)
     112    void MovableEntity::orientationChanged(bool bContinuous)
    160113    {
    161         if (this->isDynamic())
    162         {
    163             OrxAssert(relativeTo == Ogre::Node::TS_LOCAL, "Cannot yaw physical object relative \
    164                                                           to any other space than TS_LOCAL.");
    165             btTransform transf = this->physicalBody_->getWorldTransform();
    166             btTransform rotation(btQuaternion(angle.valueRadians(), 0.0f, 0.0f));
    167             this->physicalBody_->setWorldTransform(transf * rotation);
    168         }
    169 
    170         this->node_->yaw(angle, relativeTo);
    171         orientationChanged(false);
    172     }
    173 
    174     void MovableEntity::pitch(const Degree& angle, Ogre::Node::TransformSpace relativeTo)
    175     {
    176         if (this->isDynamic())
    177         {
    178             OrxAssert(relativeTo == Ogre::Node::TS_LOCAL, "Cannot pitch physical object relative \
    179                                                           to any other space than TS_LOCAL.");
    180             btTransform transf = this->physicalBody_->getWorldTransform();
    181             btTransform rotation(btQuaternion(0.0f, angle.valueRadians(), 0.0f));
    182             this->physicalBody_->setWorldTransform(transf * rotation);
    183         }
    184 
    185         this->node_->pitch(angle, relativeTo);
    186         orientationChanged(false);
    187     }
    188 
    189     void MovableEntity::roll(const Degree& angle, Ogre::Node::TransformSpace relativeTo)
    190     {
    191         if (this->isDynamic())
    192         {
    193             OrxAssert(relativeTo == Ogre::Node::TS_LOCAL, "Cannot roll physical object relative \
    194                                                           to any other space than TS_LOCAL.");
    195             btTransform transf = this->physicalBody_->getWorldTransform();
    196             btTransform rotation(btQuaternion(angle.valueRadians(), 0.0f, 0.0f));
    197             this->physicalBody_->setWorldTransform(transf * rotation);
    198         }
    199 
    200         this->node_->roll(angle, relativeTo);
    201         orientationChanged(false);
    202     }
    203 
    204     void MovableEntity::lookAt(const Vector3& target, Ogre::Node::TransformSpace relativeTo, const Vector3& localDirectionVector)
    205     {
    206         if (this->isDynamic())
    207         {
    208             ThrowException(NotImplemented, "ControllableEntity::lookAt() is not yet supported for physical objects.");
    209             OrxAssert(relativeTo == Ogre::Node::TS_LOCAL, "Cannot align physical object relative \
    210                                                           to any other space than TS_LOCAL.");
    211         }
    212 
    213         this->node_->lookAt(target, relativeTo, localDirectionVector);
    214         orientationChanged(false);
    215     }
    216 
    217     void MovableEntity::setDirection(const Vector3& direction, Ogre::Node::TransformSpace relativeTo, const Vector3& localDirectionVector)
    218     {
    219         if (this->isDynamic())
    220         {
    221             ThrowException(NotImplemented, "ControllableEntity::setDirection() is not yet supported for physical objects.");
    222             OrxAssert(relativeTo == Ogre::Node::TS_LOCAL, "Cannot align physical object relative \
    223                                                           to any other space than TS_LOCAL.");
    224         }
    225 
    226         this->node_->setDirection(direction, relativeTo, localDirectionVector);
    227         orientationChanged(false);
    228     }
    229 
    230     void MovableEntity::setVelocity(const Vector3& velocity)
    231     {
    232         if (this->isDynamic())
    233             this->physicalBody_->setLinearVelocity(btVector3(velocity.x, velocity.y, velocity.z));
    234 
    235         this->linearVelocity_ = velocity;
    236         linearVelocityChanged(false);
    237     }
    238 
    239     void MovableEntity::setAngularVelocity(const Vector3& velocity)
    240     {
    241         if (this->isDynamic())
    242             this->physicalBody_->setAngularVelocity(btVector3(velocity.x, velocity.y, velocity.z));
    243 
    244         this->angularVelocity_ = velocity;
    245         angularVelocityChanged(false);
    246     }
    247 
    248     void MovableEntity::setAcceleration(const Vector3& acceleration)
    249     {
    250         if (this->isDynamic())
    251             this->physicalBody_->applyCentralForce(btVector3(acceleration.x * this->getMass(), acceleration.y * this->getMass(), acceleration.z * this->getMass()));
    252 
    253         this->linearAcceleration_ = acceleration;
    254     }
    255 
    256     void MovableEntity::setAngularAcceleration(const Vector3& acceleration)
    257     {
    258         if (this->isDynamic())
    259         {
    260             btVector3 inertia(btVector3(1, 1, 1) / this->physicalBody_->getInvInertiaDiagLocal());
    261             this->physicalBody_->applyTorque(btVector3(acceleration.x, acceleration.y, acceleration.z) * inertia);
    262         }
    263 
    264         this->angularAcceleration_ = acceleration;
    265     }
    266 
    267     bool MovableEntity::isCollisionTypeLegal(WorldEntity::CollisionType type) const
    268     {
    269         if (type == WorldEntity::Static)
    270         {
    271             ThrowException(PhysicsViolation, "Cannot tell a MovableEntity to have static collision type");
    272             return false;
    273         }
    274         else
    275             return true;
    276     }
    277 
    278     void MovableEntity::setWorldTransform(const btTransform& worldTrans)
    279     {
    280         // We use a dynamic body. So we translate our node accordingly.
    281         this->node_->setPosition(Vector3(worldTrans.getOrigin().x(), worldTrans.getOrigin().y(), worldTrans.getOrigin().z()));
    282         this->node_->setOrientation(Quaternion(worldTrans.getRotation().w(), worldTrans.getRotation().x(), worldTrans.getRotation().y(), worldTrans.getRotation().z()));
    283         this->linearVelocity_.x = this->physicalBody_->getLinearVelocity().x();
    284         this->linearVelocity_.y = this->physicalBody_->getLinearVelocity().y();
    285         this->linearVelocity_.z = this->physicalBody_->getLinearVelocity().z();
    286         this->angularVelocity_.x = this->physicalBody_->getAngularVelocity().x();
    287         this->angularVelocity_.y = this->physicalBody_->getAngularVelocity().y();
    288         this->angularVelocity_.z = this->physicalBody_->getAngularVelocity().z();
    289         linearVelocityChanged(true);
    290         angularVelocityChanged(true);
    291         positionChanged(true);
    292         orientationChanged(true);
    293     }
    294 
    295     void MovableEntity::getWorldTransform(btTransform& worldTrans) const
    296     {
    297         // We use a kinematic body
    298         worldTrans.setOrigin(btVector3(node_->getPosition().x, node_->getPosition().y, node_->getPosition().z));
    299         worldTrans.setRotation(btQuaternion(node_->getOrientation().x, node_->getOrientation().y, node_->getOrientation().z, node_->getOrientation().w));
    300         if (this->isDynamic())
    301         {
    302             // This function gets called only once for dynamic objects to set the initial conditions
    303             // We have to set the velocities too.
    304             this->physicalBody_->setLinearVelocity(btVector3(linearVelocity_.x, linearVelocity_.y, linearVelocity_.z));
    305             this->physicalBody_->setAngularVelocity(btVector3(angularVelocity_.x, angularVelocity_.y, angularVelocity_.z));
    306         }
     114        if (!bContinuous)
     115            this->overwrite_orientation_ = this->getOrientation();
    307116    }
    308117}
  • code/branches/physics/src/orxonox/objects/worldentities/MovableEntity.h

    r2407 r2408  
    2121 *
    2222 *   Author:
    23  *      Reto Grieder
     23 *      Fabian 'x3n' Landau
    2424 *   Co-authors:
    25  *      Martin Stypinski
     25 *      ...
    2626 *
    2727 */
     
    3232#include "OrxonoxPrereqs.h"
    3333
    34 #include "WorldEntity.h"
    35 #include "objects/Tickable.h"
     34#include "MobileEntity.h"
     35#include "network/ClientConnectionListener.h"
    3636
    3737namespace orxonox
    3838{
    39     class _OrxonoxExport MovableEntity : public WorldEntity, public Tickable
     39    class _OrxonoxExport MovableEntity : public MobileEntity, public network::ClientConnectionListener
    4040    {
    4141        public:
     
    4747            void registerVariables();
    4848
    49             using WorldEntity::setPosition;
    50             using WorldEntity::translate;
    51             using WorldEntity::setOrientation;
    52             using WorldEntity::rotate;
    53             using WorldEntity::yaw;
    54             using WorldEntity::pitch;
    55             using WorldEntity::roll;
    56             using WorldEntity::lookAt;
    57             using WorldEntity::setDirection;
     49        private:
     50            void clientConnected(unsigned int clientID);
     51            void clientDisconnected(unsigned int clientID);
     52            void resynchronize();
    5853
    59             void setPosition(const Vector3& position);
    60             void translate(const Vector3& distance, Ogre::Node::TransformSpace relativeTo = Ogre::Node::TS_LOCAL);
    61             void setOrientation(const Quaternion& orientation);
    62             void rotate(const Quaternion& rotation, Ogre::Node::TransformSpace relativeTo = Ogre::Node::TS_LOCAL);
    63             void yaw(const Degree& angle, Ogre::Node::TransformSpace relativeTo = Ogre::Node::TS_LOCAL);
    64             void pitch(const Degree& angle, Ogre::Node::TransformSpace relativeTo = Ogre::Node::TS_LOCAL);
    65             void roll(const Degree& angle, Ogre::Node::TransformSpace relativeTo = Ogre::Node::TS_LOCAL);
    66             void lookAt(const Vector3& target, Ogre::Node::TransformSpace relativeTo = Ogre::Node::TS_LOCAL, const Vector3& localDirectionVector = Vector3::NEGATIVE_UNIT_Z);
    67             void setDirection(const Vector3& direction, Ogre::Node::TransformSpace relativeTo = Ogre::Node::TS_LOCAL, const Vector3& localDirectionVector = Vector3::NEGATIVE_UNIT_Z);
     54            inline void processLinearVelocity()
     55                { this->setVelocity(this->linearVelocity_); }
     56            inline void processAngularVelocity()
     57                { this->setAngularVelocity(this->angularVelocity_); }
    6858
    69             void setVelocity(const Vector3& velocity);
    70             inline void setVelocity(float x, float y, float z)
    71                 { this->setVelocity(Vector3(x, y, z)); }
    72             inline const Vector3& getVelocity() const
    73                 { return this->linearVelocity_; }
     59            void overwritePosition();
     60            void overwriteOrientation();
    7461
    75             void setAngularVelocity(const Vector3& velocity);
    76             inline void setAngularVelocity(float x, float y, float z)
    77                 { this->setAngularVelocity(Vector3(x, y, z)); }
    78             inline const Vector3& getAngularVelocity() const
    79                 { return this->linearAcceleration_; }
     62            void positionChanged(bool bContinuous);
     63            void orientationChanged(bool bContinuous);
    8064
    81             void setAcceleration(const Vector3& acceleration);
    82             inline void setAcceleration(float x, float y, float z)
    83                 { this->setAcceleration(Vector3(x, y, z)); }
    84             inline const Vector3& getAcceleration() const
    85                 { return this->linearAcceleration_; }
    86 
    87             void setAngularAcceleration(const Vector3& acceleration);
    88             inline void setAngularAcceleration(float x, float y, float z)
    89                 { this->setAngularAcceleration(Vector3(x, y, z)); }
    90             inline const Vector3& getAngularAcceleration() const
    91                 { return this->angularAcceleration_; }
    92 
    93             inline void setRotationRate(Degree rate)
    94                 { this->setAngularVelocity(this->getAngularVelocity().normalisedCopy() * rate.valueRadians()); }
    95             inline Degree getRotationRate() const
    96                 { return Degree(this->getAngularVelocity().length()); }
    97 
    98             inline void setRotationAxis(const Vector3& axis)
    99                 { this->setAngularVelocity(axis * this->getAngularVelocity().length()); }
    100             inline Vector3 getRotationAxis() const
    101                 { return this->getAngularVelocity().normalisedCopy(); }
    102 
    103         protected:
    104             Vector3 linearAcceleration_;
    105             Vector3 linearVelocity_;
    106             Vector3 angularAcceleration_;
    107             Vector3 angularVelocity_;
    108 
    109         private:
    110             virtual void positionChanged       (bool bContinuous) = 0;
    111             virtual void orientationChanged    (bool bContinuous) = 0;
    112             virtual void linearVelocityChanged (bool bContinuous) { }
    113             virtual void angularVelocityChanged(bool bContinuous) { }
    114 
    115             virtual bool isCollisionTypeLegal(WorldEntity::CollisionType type) const;
    116 
    117             // Bullet btMotionState related
    118             void setWorldTransform(const btTransform& worldTrans);
    119             void getWorldTransform(btTransform& worldTrans) const;
     65            Vector3 overwrite_position_;
     66            Quaternion overwrite_orientation_;
    12067    };
    12168}
  • code/branches/physics/src/orxonox/objects/worldentities/WorldEntity.cc

    r2407 r2408  
    344344            ThrowException(PhysicsViolation, "Warning: Cannot set the collision type at run time.");
    345345
    346         // Check for type legality. Could be StaticEntity or MovableEntity
     346        // Check for type legality. Could be StaticEntity or MobileEntity
    347347        if (!this->isCollisionTypeLegal(type))
    348348            return; // exception gets issued anyway
  • code/branches/physics/visual_studio/vc8/orxonox.vcproj

    r2405 r2408  
    281281                                        </File>
    282282                                        <File
    283                                                 RelativePath="..\..\src\orxonox\objects\worldentities\LinearEntity.cc"
     283                                                RelativePath="..\..\src\orxonox\objects\worldentities\MobileEntity.cc"
    284284                                                >
    285285                                        </File>
     
    12011201                                        </File>
    12021202                                        <File
    1203                                                 RelativePath="..\..\src\orxonox\objects\worldentities\LinearEntity.h"
     1203                                                RelativePath="..\..\src\orxonox\objects\worldentities\MobileEntity.h"
    12041204                                                >
    12051205                                        </File>
Note: See TracChangeset for help on using the changeset viewer.