Changeset 2367 for code/branches/weapon2/src/orxonox

Timestamp:

Dec 9, 2008, 6:08:20 PM (16 years ago)

Author:

landauf

Message:

used SceneManager provided by our Scene

Location:

code/branches/weapon2/src/orxonox/objects/weaponSystem/projectiles

Files:

• BillboardProjectile.cc (modified) (2 diffs)
• BillboardProjectile.h (modified) (1 diff)

code/branches/weapon2/src/orxonox/objects/weaponSystem/projectiles/BillboardProjectile.cc

@@ -33 +33 @@
 
 #include "core/CoreIncludes.h"
+#include "objects/Scene.h"
 
 namespace orxonox
@@ -42 +43 @@
         RegisterObject(BillboardProjectile);
 
-        this->billboard_.setBillboardSet(this->scenemanager_, "Examples/Flare", ColourValue(1.0, 1.0, 0.5), 1);
+        assert(this->getScene()->getSceneManager()); // getScene() was already checked by WorldEntity
+
+        this->billboard_.setBillboardSet(this->getScene()->getSceneManager(), "Examples/Flare", ColourValue(1.0, 1.0, 0.5), 1);
         //this->attachObject(this->billboard_.getBillboardSet());
         this->scale(0.5);

code/branches/weapon2/src/orxonox/objects/weaponSystem/projectiles/BillboardProjectile.h

@@ -47 +47 @@
             virtual void changedVisibility();
 
-            inline Ogre::SceneManager* getSceneManager()
-            { return this->scenemanager_; }
-
         private:
             BillboardSet billboard_;
-            Ogre::SceneManager* scenemanager_;
     };
 }