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

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/pawns

Files:

• Spectator.cc (modified) (6 diffs)
• Spectator.h (modified) (1 diff)

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();