Changeset 554 for code/branches/FICN/src/orxonox/objects/WorldEntity.h

Timestamp:

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

Author:

landauf

Message:

removed scenemanager hack and used orxonox.h

File:

• code/branches/FICN/src/orxonox/objects/WorldEntity.h (modified) (2 diffs)

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_;
     };
 }