Changeset 554 for code/branches/FICN

Timestamp:

Dec 17, 2007, 1:58:26 AM (17 years ago)

Author:

landauf

Message:

removed scenemanager hack and used orxonox.h

Location:

code/branches/FICN/src/orxonox/objects

Files:

• WorldEntity.cc (modified) (3 diffs)
• WorldEntity.h (modified) (2 diffs)

code/branches/FICN/src/orxonox/objects/WorldEntity.cc

@@ -31 +31 @@
 #include "WorldEntity.h"
 #include "../core/CoreIncludes.h"
+#include "../orxonox.h"
 
 namespace orxonox
@@ -36 +37 @@
     CreateFactory(WorldEntity);
 
-    Ogre::SceneManager* WorldEntity::sceneManager_s = 0;
     unsigned int WorldEntity::worldEntityCounter_s = 0;
-    int WorldEntity::num_s = 0;
 
     WorldEntity::WorldEntity()
@@ -44 +43 @@
         RegisterObject(WorldEntity);
 
-        if (WorldEntity::sceneManager_s)
-            WorldEntity::sceneManager_s->setAmbientLight( ColourValue( 1, 1, 1 ) ); // remove this
-
-        if (WorldEntity::sceneManager_s)
+        if (Orxonox::getSingleton()->getSceneManager())
         {
             std::ostringstream name;
             name << (WorldEntity::worldEntityCounter_s++);
             this->setName("WorldEntity" + name.str());
-            node_ = WorldEntity::sceneManager_s->getRootSceneNode()->createChildSceneNode(this->getName());
+            node_ = Orxonox::getSingleton()->getSceneManager()->getRootSceneNode()->createChildSceneNode(this->getName());
         }
 

code/branches/FICN/src/orxonox/objects/WorldEntity.h

@@ -18 +18 @@
             void tick(float dt);
 
-        private:
-            Ogre::SceneNode* node_;
-            static unsigned int worldEntityCounter_s;
-
-            bool bStatic_;
-            Vector3 velocity_;
-            Vector3 acceleration_;
-            Vector3 rotationAxis_;
-            Radian rotationRate_;
-            Radian momentum_;
-
-        public:
             inline Ogre::SceneNode* getNode()
                 { return this->node_; }
@@ -114 +102 @@
 
 
-            static Ogre::SceneManager* sceneManager_s;
-            static int num_s;
+        private:
+            Ogre::SceneNode* node_;
+            static unsigned int worldEntityCounter_s;
 
+            bool bStatic_;
+            Vector3 velocity_;
+            Vector3 acceleration_;
+            Vector3 rotationAxis_;
+            Radian rotationRate_;
+            Radian momentum_;
     };
 }