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

Timestamp:

Oct 24, 2008, 2:48:43 AM (16 years ago)

Author:

landauf

Message:

many changes, can't remember everything, but these are the most important:

• attaching entities to other entities works
• displaying models, lights and shadows works
• controlling a spectator works
• removed an update hack in PositionableEntity because I've found a much better solution

and with "works" I mean: it works on client, server and standalone

Location:

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

Files:

• ControllableEntity.cc (modified) (2 diffs)
• ControllableEntity.h (modified) (1 diff)
• Model.cc (modified) (2 diffs)
• Model.h (modified) (1 diff)
• PositionableEntity.cc (modified) (1 diff)
• PositionableEntity.h (modified) (2 diffs)
• WorldEntity.cc (modified) (1 diff)
• pawns/Spectator.cc (modified) (4 diffs)
• pawns/Spectator.h (modified) (3 diffs)

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

@@ -127 +127 @@
     void ControllableEntity::startLocalControl()
     {
-        std::cout << "###### start local control" << std::endl;
+        std::cout << this->getObjectID() << " ###### start local control" << std::endl;
         this->camera_ = new Camera();
         this->camera_->requestFocus();
@@ -155 +155 @@
         {
             this->velocity_ += (dt * this->acceleration_);
-            this->node_->translate(dt * this->velocity_, Ogre::Node::TS_PARENT);
+            this->node_->translate(dt * this->velocity_, Ogre::Node::TS_LOCAL);
 
             if (Core::isMaster())

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

@@ -115 +115 @@
                 { this->hudtemplate_ = name; }
 
+            inline bool isLocallyControlled() const
+                { return this->bControlled_; }
+
         private:
             void overwrite();

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

@@ -55 +55 @@
 
         XMLPortParam(Model, "mesh", setMeshSource, getMeshSource, xmlelement, mode);
+        XMLPortParam(Model, "shadow", setCastShadows, getCastShadows, xmlelement, mode).defaultValues(true);
     }
 
     void Model::registerVariables()
     {
-        REGISTERSTRING(this->meshSrc_, network::direction::toclient, new network::NetworkCallback<Model>(this, &Model::changedMesh));
+        REGISTERSTRING(this->meshSrc_,    network::direction::toclient, new network::NetworkCallback<Model>(this, &Model::changedMesh));
+        REGISTERDATA(this->bCastShadows_, network::direction::toclient, new network::NetworkCallback<Model>(this, &Model::changedShadows));
     }
 
@@ -68 +70 @@
 
         this->mesh_.setMeshSource(this->meshSrc_);
+
         if (this->mesh_.getEntity())
+        {
             this->getNode()->attachObject(this->mesh_.getEntity());
+            this->mesh_.getEntity()->setCastShadows(this->bCastShadows_);
+        }
+    }
+
+    void Model::changedShadows()
+    {
+        this->mesh_.setCastShadows(this->bCastShadows_);
     }
 

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

@@ -54 +54 @@
                 { return this->mesh_; }
 
+            inline void setCastShadows(bool bCastShadows)
+                { this->bCastShadows_ = bCastShadows; this->changedShadows(); }
+            inline bool getCastShadows() const
+                { return this->bCastShadows_; }
+
         private:
             void changedMesh();
+            void changedShadows();
 
             std::string meshSrc_;
             Mesh mesh_;
+            bool bCastShadows_;
     };
 }

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, public Tickable
+    class _OrxonoxExport PositionableEntity : public WorldEntity
     {
         public:
@@ -43 +42 @@
 
             void registerVariables();
-            virtual void tick(float dt);
 
             using WorldEntity::setPosition;

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

@@ -51 +51 @@
         RegisterObject(WorldEntity);
 
-        this->node_ = GraphicsEngine::getInstance().getLevelSceneManager()->createSceneNode();
+        this->node_ = GraphicsEngine::getInstance().getLevelSceneManager()->getRootSceneNode()->createChildSceneNode();
         this->parent_ = 0;
         this->parentID_ = (unsigned int)-1;

code/branches/objecthierarchy/src/orxonox/objects/worldentities/pawns/Spectator.cc

@@ -31 +31 @@
 
 #include "core/CoreIncludes.h"
+#include "core/Core.h"
 #include "objects/worldentities/Model.h"
+#include "tools/BillboardSet.h"
 
 namespace orxonox
@@ -51 +53 @@
         this->setDestroyWhenPlayerLeft(true);
 
-        Model* temp = new Model;
-        temp->setMeshSource("assff.mesh");
-        this->attach(temp);
+        // test test test
+        {
+            this->testmesh_ = new Mesh();
+            this->testnode_ = this->getNode()->createChildSceneNode();
+            this->testmesh_->setMeshSource("assff.mesh");
+            if (this->testmesh_->getEntity())
+                this->testnode_->attachObject(this->testmesh_->getEntity());
+            this->testnode_->pitch(Degree(-90));
+            this->testnode_->roll(Degree(+90));
+            this->testnode_->scale(10, 10, 10);
+        }
+        // test test test
+
+        this->greetingFlare_ = new BillboardSet();
+        this->greetingFlare_->setBillboardSet("Examples/Flare", ColourValue(1.0, 1.0, 0.8), Vector3(0, 20, 0), 1);
+        this->getNode()->attachObject(this->greetingFlare_->getBillboardSet());
+        this->greetingFlare_->setVisible(false);
+        this->bGreetingFlareVisible_ = false;
+        this->bGreeting_ = false;
+
+        this->registerVariables();
     }
 
     Spectator::~Spectator()
     {
+        if (this->isInitialized())
+        {
+            delete this->greetingFlare_;
+
+            // test test test
+            {
+                delete this->testmesh_;
+                delete this->testnode_;
+            }
+            // test test test
+        }
+    }
+
+    void Spectator::registerVariables()
+    {
+        REGISTERDATA(this->bGreetingFlareVisible_, network::direction::toclient, new network::NetworkCallback<Spectator>(this, &Spectator::changedFlareVisibility));
+        REGISTERDATA(this->bGreeting_,             network::direction::toserver, new network::NetworkCallback<Spectator>(this, &Spectator::changedGreeting));
+    }
+
+    void Spectator::changedGreeting()
+    {
+        this->bGreetingFlareVisible_ = this->bGreeting_;
+        this->changedFlareVisibility();
+    }
+
+    void Spectator::changedFlareVisibility()
+    {
+        this->greetingFlare_->setVisible(this->bGreetingFlareVisible_);
     }
 
     void Spectator::tick(float dt)
     {
-        Vector3 velocity = this->getVelocity();
-        velocity.normalise();
-        this->setVelocity(velocity * this->speed_);
+        if (this->isLocallyControlled())
+        {
+            Vector3 velocity = this->getVelocity();
+            velocity.normalise();
+            this->setVelocity(velocity * this->speed_);
 
-        // TODO: Check why I have removed *dt (1337)
-        this->yaw(Radian(this->yaw_ * this->rotationSpeed_));
-        this->pitch(Radian(this->pitch_ * this->rotationSpeed_));
-        this->roll(Radian(this->roll_ * this->rotationSpeed_));
+            this->yaw(Radian(this->yaw_ * this->rotationSpeed_));
+            this->pitch(Radian(this->pitch_ * this->rotationSpeed_));
+            this->roll(Radian(this->roll_ * this->rotationSpeed_));
 
-        this->yaw_ = this->pitch_ = this->roll_ = 0;
+            this->yaw_ = this->pitch_ = this->roll_ = 0;
+        }
 
         SUPER(Spectator, tick, dt);
 
-        this->setVelocity(Vector3::ZERO);
+        if (this->isLocallyControlled())
+        {
+            this->setVelocity(Vector3::ZERO);
+        }
     }
 
@@ -82 +135 @@
         ControllableEntity::setPlayer(player);
 
-        this->setObjectMode(network::direction::toclient);
+//        this->setObjectMode(network::direction::toclient);
+    }
+
+    void Spectator::startLocalControl()
+    {
+        ControllableEntity::startLocalControl();
+        if (this->isLocallyControlled())
+            this->testmesh_->setVisible(false);
     }
 
@@ -118 +178 @@
     {
     }
+
+    void Spectator::greet()
+    {
+        this->bGreeting_ = !this->bGreeting_;
+
+        if (Core::isMaster())
+        {
+            this->bGreetingFlareVisible_ = this->bGreeting_;
+            this->changedFlareVisibility();
+        }
+    }
 }

code/branches/objecthierarchy/src/orxonox/objects/worldentities/pawns/Spectator.h

@@ -42 +42 @@
             virtual ~Spectator();
 
+            void registerVariables();
             virtual void tick(float dt);
 
             virtual void setPlayer(PlayerInfo* player);
+            virtual void startLocalControl();
 
             virtual void moveFrontBack(float value);
@@ -55 +57 @@
 
             virtual void fire();
+            virtual void greet();
 
         private:
+            void changedGreeting();
+            void changedFlareVisibility();
+
+            BillboardSet* greetingFlare_;
+            bool bGreetingFlareVisible_;
+            bool bGreeting_;
+
             float speed_;
             float rotationSpeed_;
@@ -63 +73 @@
             float pitch_;
             float roll_;
+
+            // test test test
+            Mesh* testmesh_;
+            Ogre::SceneNode* testnode_;
+            // test test test
     };
 }