Changeset 346 for code/branches/FICN/src/orxonox

Timestamp:

Nov 29, 2007, 4:21:30 PM (17 years ago)

Author:

rgrieder

Message:

• adjusted the entire source to compile under windows visual studio too:
• added some ugly conversions
• changed some illegal code pieces (gcc however accepted it)
• added a few files from reto's framework to evade linker errors (no more dynamic linking)
• inserted some 'return true' to justify the return type
• excluded the levelLoader in the orxonox.cc (couldn't make it work, parsing error)
• wrote about 5 code #branches to compensate for missing usleep() under windows

Location:

code/branches/FICN

Files:

• . (modified) (1 prop)
• src/orxonox/core/Identifier.h (modified) (1 diff)
• src/orxonox/inertial_node.cc (added)
• src/orxonox/objects/test3.cc (modified) (2 diffs)
• src/orxonox/ogre_control.h (added)
• src/orxonox/orxonox.cc (modified) (3 diffs)
• src/orxonox/orxonox_scene.cc (added)
• src/orxonox/orxonox_scene.h (added)
• src/orxonox/orxonox_ship.cc (added)
• src/orxonox/orxonox_ship.h (added)
• src/orxonox/run_manager.cc (added)

code/branches/FICN/src/orxonox/core/Identifier.h

@@ -8 +8 @@
 #include "Factory.h"
 
-#define HIERARCHY_VERBOSE false
+#define HIERARCHY_VERBOSE 0
 
 

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

@@ -33 +33 @@
         testandcout(test1->usefullClass3isA(Class(Test2)));
         testandcout(test1->usefullClass3isA(Class(Test3)));
+
+        return true;
     }
 
@@ -50 +52 @@
         testandcout(test2->usefullClass3isA(Class(Test2)));
         testandcout(test2->usefullClass3isA(Class(Test3)));
+
+        return true;
     }
 }

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

@@ -33 +33 @@
 #include <Ogre.h>
 #include <OIS/OIS.h>
-#include <CEGUI/CEGUI.h>
-#include <OgreCEGUIRenderer.h>
+//#include <CEGUI/CEGUI.h>
+//#include <OgreCEGUIRenderer.h>
 
 #include <string>
@@ -209 +209 @@
       OIS::Mouse *mMouse;
       OIS::InputManager *mInputManager;
-      CEGUI::OgreCEGUIRenderer *mRenderer;
-      CEGUI::System *mSystem;
+      //CEGUI::OgreCEGUIRenderer *mRenderer;
+      //CEGUI::System *mSystem;
       OrxExitListener *mListener;
 
@@ -271 +271 @@
       {
 
-      string levelFile = "sp_level_moonstation.oxw";
-      loader::LevelLoader* loader = new loader::LevelLoader(levelFile);
+      //string levelFile = "sp_level_moonstation.oxw";
+      //loader::LevelLoader* loader = new loader::LevelLoader(levelFile);
     }