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

Timestamp:

Oct 27, 2008, 4:08:51 AM (16 years ago)

Author:

landauf

Message:

many changes, most important: BaseObject takes now a pointer to it's creator which is needed to build a level hierarchy (with different scenes)

Location:

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

Files:

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

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

@@ -43 +43 @@
     CreateFactory(ControllableEntity);
 
-    ControllableEntity::ControllableEntity()
+    ControllableEntity::ControllableEntity(BaseObject* creator) : WorldEntity(creator)
     {
         RegisterObject(ControllableEntity);
@@ -71 +71 @@
     ControllableEntity::~ControllableEntity()
     {
-        if (this->isInitialized() && this->bControlled_)
-            this->stopLocalControl();
+        if (this->isInitialized())
+        {
+            if (this->bControlled_)
+                this->stopLocalControl();
+
+            if (this->hud_)
+                delete this->hud_;
+
+            if (this->camera_)
+                delete this->camera_;
+        }
     }
 
@@ -92 +101 @@
         this->player_ = player;
         this->playerID_ = player->getObjectID();
-        this->bControlled_ = player->isLocalPlayer();
+        this->bControlled_ = (player->isLocalPlayer() && player->isHumanPlayer());
 
         if (this->bControlled_)
         {
             this->startLocalControl();
-            this->setObjectMode(network::direction::bidirectional);
+
+            if (!Core::isMaster())
+                this->setObjectMode(network::direction::bidirectional);
         }
     }
@@ -115 +126 @@
     }
 
-    void ControllableEntity::updatePlayer()
-    {
+    void ControllableEntity::networkcallback_changedplayerID()
+    {
+        // just do this in case the entity wasn't yet synchronized when the corresponding PlayerInfo got our objectID
         if (this->playerID_ != network::OBJECTID_UNKNOWN)
         {
             this->player_ = dynamic_cast<PlayerInfo*>(network::Synchronisable::getSynchronisable(this->playerID_));
-            if (this->player_ && (this->player_->getPawn() != this))
+            if (this->player_ && (this->player_->getControllableEntity() != this))
                 this->player_->startControl(this);
         }
@@ -128 +140 @@
     {
         std::cout << this->getObjectID() << " ###### start local control" << std::endl;
-        this->camera_ = new Camera();
+        this->camera_ = new Camera(this);
         this->camera_->requestFocus();
         this->attach(this->camera_);
@@ -134 +146 @@
         if (this->hudtemplate_ != "")
         {
-            this->hud_ = new OverlayGroup();
+            this->hud_ = new OverlayGroup(this);
             this->hud_->addTemplate(this->hudtemplate_);
         }
@@ -184 +196 @@
         REGISTERDATA(this->client_overwrite_,   network::direction::toserver);
 
-        REGISTERDATA(this->playerID_, network::direction::toclient, new network::NetworkCallback<ControllableEntity>(this, &ControllableEntity::updatePlayer));
+        REGISTERDATA(this->playerID_, network::direction::toclient, new network::NetworkCallback<ControllableEntity>(this, &ControllableEntity::networkcallback_changedplayerID));
     }
 

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

@@ -40 +40 @@
     {
         public:
-            ControllableEntity();
+            ControllableEntity(BaseObject* creator);
             virtual ~ControllableEntity();
 
@@ -56 +56 @@
             inline bool getDestroyWhenPlayerLeft() const
                 { return this->bDestroyWhenPlayerLeft_; }
-
-            virtual void startLocalControl();
-            virtual void stopLocalControl();
 
             virtual void moveFrontBack(float value) {}
@@ -82 +79 @@
                 { return this->hudtemplate_; }
 
-        protected:
             using WorldEntity::setPosition;
             using WorldEntity::translate;
@@ -112 +108 @@
                 { this->acceleration_.x = x; this->acceleration_.y = y; this->acceleration_.z = z; }
 
+        protected:
+            virtual void startLocalControl();
+            virtual void stopLocalControl();
+
             inline void setHudTemplate(const std::string& name)
                 { this->hudtemplate_ = name; }
@@ -130 +130 @@
             void processClientOrientation();
 
-            void updatePlayer();
+            void networkcallback_changedplayerID();
 
             unsigned int server_overwrite_;

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

@@ -32 +32 @@
 #include "core/CoreIncludes.h"
 #include "core/XMLPort.h"
+#include "objects/Scene.h"
 
 namespace orxonox
@@ -37 +38 @@
     CreateFactory(Model);
 
-    Model::Model()
+    Model::Model(BaseObject* creator) : PositionableEntity(creator)
     {
         RegisterObject(Model);
@@ -69 +70 @@
             this->getNode()->detachObject(this->mesh_.getEntity());
 
-        this->mesh_.setMeshSource(this->meshSrc_);
+        this->mesh_.setMeshSource(this->getScene()->getSceneManager(), this->meshSrc_);
 
         if (this->mesh_.getEntity())

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

@@ -39 +39 @@
     {
         public:
-            Model();
+            Model(BaseObject* creator);
             virtual ~Model();
 

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

@@ -41 +41 @@
     CreateFactory(MovableEntity);
 
-    MovableEntity::MovableEntity()
+    MovableEntity::MovableEntity(BaseObject* creator) : WorldEntity(creator)
     {
         RegisterObject(MovableEntity);

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

@@ -41 +41 @@
     {
         public:
-            MovableEntity();
+            MovableEntity(BaseObject* creator);
             virtual ~MovableEntity();
 

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

@@ -35 +35 @@
     CreateFactory(PositionableEntity);
 
-    PositionableEntity::PositionableEntity()
+    PositionableEntity::PositionableEntity(BaseObject* creator) : WorldEntity(creator)
     {
         RegisterObject(PositionableEntity);

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

@@ -38 +38 @@
     {
         public:
-            PositionableEntity();
+            PositionableEntity(BaseObject* creator);
             virtual ~PositionableEntity();
 

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

@@ -30 +30 @@
 #include "WorldEntity.h"
 
+#include <cassert>
 #include <OgreSceneManager.h>
 
@@ -37 +38 @@
 
 #include "GraphicsEngine.h"
+#include "objects/Scene.h"
 
 namespace orxonox
@@ -47 +49 @@
     const Vector3 WorldEntity::UP    = Vector3::UNIT_Y;
 
-    WorldEntity::WorldEntity()
+    WorldEntity::WorldEntity(BaseObject* creator) : BaseObject(creator)
     {
         RegisterObject(WorldEntity);
 
-        this->node_ = GraphicsEngine::getInstance().getLevelSceneManager()->getRootSceneNode()->createChildSceneNode();
+        assert(this->getScene());
+        assert(this->getScene()->getRootSceneNode());
+
+        this->node_ = this->getScene()->getRootSceneNode()->createChildSceneNode();
+
         this->parent_ = 0;
         this->parentID_ = (unsigned int)-1;
@@ -66 +72 @@
         {
             this->node_->detachAllObjects();
-            GraphicsEngine::getInstance().getLevelSceneManager()->destroySceneNode(this->node_->getName());
+            if (this->getScene()->getSceneManager())
+                this->getScene()->getSceneManager()->destroySceneNode(this->node_->getName());
         }
     }
-
 
     void WorldEntity::XMLPort(Element& xmlelement, XMLPort::Mode mode)
@@ -131 +137 @@
         object->parentID_ = (unsigned int)-1;
 
-        GraphicsEngine::getInstance().getLevelSceneManager()->getRootSceneNode()->addChild(object->node_);
+        this->getScene()->getRootSceneNode()->addChild(object->node_);
     }
 

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

@@ -45 +45 @@
     {
         public:
-            WorldEntity();
+            WorldEntity(BaseObject* creator);
             virtual ~WorldEntity();
 

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

@@ -33 +33 @@
 #include "core/Core.h"
 #include "objects/worldentities/Model.h"
+#include "objects/Scene.h"
+#include "objects/infos/PlayerInfo.h"
 #include "tools/BillboardSet.h"
 
@@ -39 +41 @@
     CreateFactory(Spectator);
 
-    Spectator::Spectator()
+    Spectator::Spectator(BaseObject* creator) : ControllableEntity(creator)
     {
         RegisterObject(Spectator);
@@ -54 +56 @@
 
         // test test test
+        if (this->getScene()->getSceneManager())
         {
             this->testmesh_ = new Mesh();
             this->testnode_ = this->getNode()->createChildSceneNode();
-            this->testmesh_->setMeshSource("assff.mesh");
+            this->testmesh_->setMeshSource(this->getScene()->getSceneManager(), "assff.mesh");
             if (this->testmesh_->getEntity())
                 this->testnode_->attachObject(this->testmesh_->getEntity());
@@ -64 +67 @@
             this->testnode_->scale(10, 10, 10);
         }
+        else
+        {
+            this->testmesh_ = 0;
+            this->testnode_ = 0;
+        }
         // 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->greetingFlare_->setBillboardSet(this->getScene()->getSceneManager(), "Examples/Flare", ColourValue(1.0, 1.0, 0.8), Vector3(0, 20, 0), 1);
         this->getNode()->attachObject(this->greetingFlare_->getBillboardSet());
         this->greetingFlare_->setVisible(false);
@@ -80 +88 @@
         if (this->isInitialized())
         {
-            delete this->greetingFlare_;
+            if (this->greetingFlare_)
+            {
+                this->getNode()->detachObject(this->greetingFlare_->getBillboardSet());
+                delete this->greetingFlare_;
+            }
 
             // test test test
             {
-                delete this->testmesh_;
-                delete this->testnode_;
+                if (this->testmesh_ && this->testnode_)
+                    this->testnode_->detachObject(this->testmesh_->getEntity());
+
+                if (this->testmesh_)
+                    delete this->testmesh_;
+
+                if (this->testnode_)
+                    this->getNode()->removeAndDestroyChild(this->testnode_->getName());
             }
             // test test test
@@ -177 +195 @@
     void Spectator::fire()
     {
+        if (this->getPlayer())
+            this->getPlayer()->setReadyToSpawn(true);
     }
 

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

@@ -39 +39 @@
     {
         public:
-            Spectator();
+            Spectator(BaseObject* creator);
             virtual ~Spectator();