Changeset 460 for code/branches

Timestamp:

Dec 12, 2007, 1:18:46 AM (17 years ago)

Author:

landauf

Message:

first try to add a WorldEntity. at the moment it's just a class with an Ogre::SceneNode

Location:

code/branches/objecthierarchy/src

Files:

• CMakeLists.txt (modified) (2 diffs)
• orxonox/core/CoreIncludes.h (modified) (2 diffs)
• orxonox/core/OrxonoxClass.h (modified) (3 diffs)
• orxonox/objects/WorldEntity.cc (added)
• orxonox/objects/WorldEntity.h (added)
• orxonox/orxonox.cc (modified) (4 diffs)

code/branches/objecthierarchy/src/CMakeLists.txt

@@ -14 +14 @@
         orxonox/core/SignalHandler.cc
         orxonox/objects/BaseObject.cc
+        orxonox/objects/WorldEntity.cc
         orxonox/objects/test1.cc
         orxonox/objects/test2.cc
@@ -35 +36 @@
         orxonox/core/SignalHandler.h
         orxonox/objects/BaseObject.h
+        orxonox/objects/WorldEntity.h
         orxonox/objects/Test.h
         orxonox/objects/test1.h

code/branches/objecthierarchy/src/orxonox/core/CoreIncludes.h

@@ -22 +22 @@
 #include "OgreVector3.h"
 #include "OgreColourValue.h"
+#include "OgreQuaternion.h"
+#include "OgreMatrix3.h"
 
 
@@ -30 +32 @@
     typedef Ogre::Vector3 Vector3;
     typedef Ogre::ColourValue ColourValue;
+    typedef Ogre::Radian Radian;
+    typedef Ogre::Real Real;
+    typedef Ogre::Quaternion Quaternion;
+    typedef Ogre::Matrix3 Matrix3;
 }
 

code/branches/objecthierarchy/src/orxonox/core/OrxonoxClass.h

@@ -103 +103 @@
 
             /** @brief Sets the name of the object. @param name The name */
-            inline void setName(const std::string& name) { this->name_ = name; }
+            inline virtual void setName(const std::string& name) { this->name_ = name; }
 
             /** @returns the name of the object. */
@@ -109 +109 @@
 
             /** @brief Sets the state of the objects activity. @param bActive True = active */
-            inline void setActive(bool bActive) { this->bActive_ = bActive; }
+            inline virtual void setActive(bool bActive) { this->bActive_ = bActive; }
 
             /** @returns the state of the objects activity. */
@@ -115 +115 @@
 
             /** @brief Sets the state of the objects visibility. @param bVisible True = visible */
-            inline void setVisible(bool bVisible) { this->bVisible_ = bVisible; }
+            inline virtual void setVisible(bool bVisible) { this->bVisible_ = bVisible; }
 
             /** @returns the state of the objects visibility. */

code/branches/objecthierarchy/src/orxonox/orxonox.cc

@@ -31 +31 @@
  */
 
-#include <Ogre.h>
+#include <OgreSceneNode.h>
+#include <OgreSceneManager.h>
+#include <OgreRoot.h>
+#include <OgreFrameListener.h>
+#include <OgreConfigFile.h>
+#include <OgreTextureManager.h>
+#include <OgreEntity.h>
+#include <OgreRenderWindow.h>
+
 #include <OIS/OIS.h>
 #include <CEGUI/CEGUI.h>
@@ -46 +54 @@
 #include "objects/Tickable.h"
 #include "objects/Timer.h"
+#include "objects/WorldEntity.h"
 
 #include "objects/BaseObject.h"
@@ -633 +642 @@
         std::cout << "4\n";
 
+        std::cout << "Test 12\n";
+        std::cout << "1\n";
+
+        WorldEntity* test12_1 = new WorldEntity;
+
+        std::cout << sizeof(WorldEntity) << std::endl;
+
+        std::cout << "2\n";
+
+
+
         startRenderLoop();
       }
@@ -721 +741 @@
       void setupScene()
       {
-        Ogre::SceneManager *mgr = mRoot->createSceneManager(Ogre::ST_GENERIC, "Default SceneManager");
-        Ogre::Camera *cam = mgr->createCamera("Camera");
+        WorldEntity::sceneManager_s = mRoot->createSceneManager(Ogre::ST_GENERIC, "Default SceneManager");
+        Ogre::Camera *cam = WorldEntity::sceneManager_s->createCamera("Camera");
         Ogre::Viewport *vp = mRoot->getAutoCreatedWindow()->addViewport(cam);
       }