Changeset 1993 for code/branches/objecthierarchy/src/orxonox/objects/worldentities

Timestamp:

Oct 22, 2008, 5:25:01 AM (16 years ago)

Author:

landauf

Message:

added several new classes

Location:

code/branches/objecthierarchy/src/orxonox/objects/worldentities

Files:

• ControllableEntity.cc (modified) (5 diffs)
• ControllableEntity.h (modified) (6 diffs)
• Model.cc (added)
• Model.h (added)
• MovableEntity.cc (modified) (1 diff)
• MovableEntity.h (modified) (1 diff)
• PositionableEntity.cc (modified) (1 diff)
• PositionableEntity.h (modified) (3 diffs)
• WorldEntity.cc (modified) (3 diffs)
• pawns (added)
• pawns/Spectator.cc (added)
• pawns/Spectator.h (added)

code/branches/objecthierarchy/src/orxonox/objects/worldentities/ControllableEntity.cc

@@ -53 +53 @@
         this->hud_ = 0;
         this->camera_ = 0;
-
+        this->bDestroyWhenPlayerLeft_ = false;
 
         this->velocity_ = Vector3::ZERO;
@@ -94 +94 @@
 
         if (this->bControlled_)
+        {
             this->startLocalControl();
+            this->setObjectMode(network::direction::bidirectional);
+        }
     }
 
@@ -105 +108 @@
         this->playerID_ = network::OBJECTID_UNKNOWN;
         this->bControlled_ = false;
+        this->setObjectMode(network::direction::toclient);
+
+        if (this->bDestroyWhenPlayerLeft_)
+            delete this;
     }
 
     void ControllableEntity::updatePlayer()
     {
-        this->player_ = dynamic_cast<PlayerInfo*>(network::Synchronisable::getSynchronisable(this->playerID_));
-        if (this->player_ && (this->player_->getPawn() != this))
-            this->player_->startControl(this);
+        if (this->playerID_ != network::OBJECTID_UNKNOWN)
+        {
+            this->player_ = dynamic_cast<PlayerInfo*>(network::Synchronisable::getSynchronisable(this->playerID_));
+            if (this->player_ && (this->player_->getPawn() != this))
+                this->player_->startControl(this);
+        }
     }
 
     void ControllableEntity::startLocalControl()
     {
+        std::cout << "###### start local control" << std::endl;
         this->camera_ = new Camera();
         this->camera_->requestFocus();
-
-        this->hud_ = new OverlayGroup();
-        this->hud_->addTemplate(this->hudtemplate_);
+        this->attach(this->camera_);
+
+        if (this->hudtemplate_ != "")
+        {
+            this->hud_ = new OverlayGroup();
+            this->hud_->addTemplate(this->hudtemplate_);
+        }
     }
 
     void ControllableEntity::stopLocalControl()
     {
+        std::cout << "###### stop local control" << std::endl;
+        this->detach(this->camera_);
         delete this->camera_;
         this->camera_ = 0;
@@ -137 +154 @@
         {
             this->velocity_ += (dt * this->acceleration_);
-            this->node_->translate(dt * this->velocity_);
+            this->node_->translate(dt * this->velocity_, Ogre::Node::TS_PARENT);
 
             if (Core::isMaster())
@@ -150 +167 @@
             }
         }
-
-//        std::cout << this->getPosition() << std::endl;
     }
 

code/branches/objecthierarchy/src/orxonox/objects/worldentities/ControllableEntity.h

@@ -52 +52 @@
                 { return this->player_; }
 
+            inline void setDestroyWhenPlayerLeft(bool bDestroy)
+                { this->bDestroyWhenPlayerLeft_ = bDestroy; }
+            inline bool getDestroyWhenPlayerLeft() const
+                { return this->bDestroyWhenPlayerLeft_; }
+
             virtual void startLocalControl();
             virtual void stopLocalControl();
@@ -70 +75 @@
             virtual void switchCamera() {}
 
+            inline const Vector3& getVelocity() const
+                { return this->velocity_; }
+            inline const Vector3& getAcceleration() const
+                { return this->acceleration_; }
+            inline const std::string& getHudTemplate() const
+                { return this->hudtemplate_; }
+
         protected:
             using WorldEntity::setPosition;
@@ -75 +87 @@
             using WorldEntity::setOrientation;
             using WorldEntity::rotate;
+            using WorldEntity::yaw;
+            using WorldEntity::pitch;
+            using WorldEntity::roll;
             using WorldEntity::lookAt;
             using WorldEntity::setDirection;
@@ -91 +106 @@
             inline void setVelocity(float x, float y, float z)
                 { this->velocity_.x = x; this->velocity_.y = y; this->velocity_.z = z; }
-            inline const Vector3& getVelocity() const
-                { return this->velocity_; }
 
             inline void setAcceleration(const Vector3& acceleration)
@@ -98 +111 @@
             inline void setAcceleration(float x, float y, float z)
                 { this->acceleration_.x = x; this->acceleration_.y = y; this->acceleration_.z = z; }
-            inline const Vector3& getAcceleration() const
-                { return this->acceleration_; }
+
+            inline void setHudTemplate(const std::string& name)
+                { this->hudtemplate_ = name; }
 
         private:
-            inline void setHudTemplate(const std::string& name)
-                { this->hudtemplate_ = name; }
-            inline const std::string& getHudTemplate() const
-                { return this->hudtemplate_; }
-
             void overwrite();
             void processOverwrite();
@@ -139 +148 @@
             OverlayGroup* hud_;
             Camera* camera_;
+            bool bDestroyWhenPlayerLeft_;
     };
 }

code/branches/objecthierarchy/src/orxonox/objects/worldentities/MovableEntity.cc

@@ -79 +79 @@
             this->node_->rotate(this->rotationAxis_, this->rotationRate_  * dt);
         }
-
-        std::cout << this->getPosition() << std::endl;
     }
 

code/branches/objecthierarchy/src/orxonox/objects/worldentities/MovableEntity.h

@@ -52 +52 @@
             using WorldEntity::setOrientation;
             using WorldEntity::rotate;
+            using WorldEntity::yaw;
+            using WorldEntity::pitch;
+            using WorldEntity::roll;
             using WorldEntity::lookAt;
             using WorldEntity::setDirection;

code/branches/objecthierarchy/src/orxonox/objects/worldentities/PositionableEntity.cc

@@ -57 +57 @@
         REGISTERDATA(this->getOrientation().z, network::direction::toclient);
     }
+
+    void PositionableEntity::tick(float dt)
+    {
+        // I don't know why but this has to be done to update the position if attached to another Entity
+        this->node_->translate(Vector3::ZERO);
+        std::cout << this->getWorldPosition() << std::endl;
+    }
 }

code/branches/objecthierarchy/src/orxonox/objects/worldentities/PositionableEntity.h

@@ -32 +32 @@
 #include "OrxonoxPrereqs.h"
 #include "WorldEntity.h"
+#include "objects/Tickable.h"
 
 namespace orxonox
 {
-    class _OrxonoxExport PositionableEntity : public WorldEntity
+    class _OrxonoxExport PositionableEntity : public WorldEntity, public Tickable
     {
         public:
@@ -42 +43 @@
 
             void registerVariables();
+            virtual void tick(float dt);
 
             using WorldEntity::setPosition;
@@ -47 +49 @@
             using WorldEntity::setOrientation;
             using WorldEntity::rotate;
+            using WorldEntity::yaw;
+            using WorldEntity::pitch;
+            using WorldEntity::roll;
             using WorldEntity::lookAt;
             using WorldEntity::setDirection;

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

@@ -34 +34 @@
 #include "core/CoreIncludes.h"
 #include "core/XMLPort.h"
+#include "util/Convert.h"
 
 #include "GraphicsEngine.h"
@@ -110 +111 @@
         if (object->getParent())
             object->detachFromParent();
+        else
+        {
+            Ogre::Node* parent = object->node_->getParent();
+            if (parent)
+                parent->removeChild(object->node_);
+        }
 
         this->node_->addChild(object->node_);
@@ -123 +130 @@
         object->parent_ = 0;
         object->parentID_ = (unsigned int)-1;
+
+        GraphicsEngine::getInstance().getLevelSceneManager()->getRootSceneNode()->addChild(object->node_);
     }