Changeset 346

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)
• bin (modified) (1 prop)
• src/loader/LevelLoader.cc (modified) (1 diff)
• src/loader/Light.cc (modified) (2 diffs)
• src/loader/Light.h (modified) (1 diff)
• src/loader/LightManager.cc (modified) (2 diffs)
• src/loader/LightManager.h (modified) (2 diffs)
• src/network/ClientConnection.cc (modified) (2 diffs)
• src/network/GameStateManager.cc (modified) (2 diffs)
• src/network/GameStateManager.h (modified) (1 diff)
• src/network/PacketBufferTest.cc (modified) (1 diff)
• src/network/PacketBufferTestExt.cc (modified) (2 diffs)
• src/network/Synchronisable.cc (modified) (1 diff)
• src/network/Synchronisable.h (modified) (1 diff)
• src/network/dummyclient.cc (modified) (2 diffs)
• src/network/dummyserver.cc (modified) (2 diffs)
• 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/loader/LevelLoader.cc

@@ -15 +15 @@
         dir.append("/");
         dir.append(file);       
-        rootNode = XMLNode::openFileHelper(dir.c_str(),"WorldDataFile");
+        rootNode = XMLNode::openFileHelper((const wchar_t*)dir.c_str(),(const wchar_t*)"WorldDataFile");
         // TODO: Error handling
 
         // Assing general level infos to class variables
-        this->name_ = rootNode.getChildNode("name").getText();
-        this->description_ = rootNode.getChildNode("description").getText();
-        this->image_ = rootNode.getChildNode("image").getText();
+        this->name_ = (const char*)rootNode.getChildNode((const wchar_t*)"name").getText();
+        this->description_ = (const char*)rootNode.getChildNode((const wchar_t*)"description").getText();
+        this->image_ = (const char*)rootNode.getChildNode((const wchar_t*)"image").getText();
   
         this->loadingScreen();
   
   // Assign sub-nodes
-  if (rootNode.nChildNode("LightManager")==1)
+  if (rootNode.nChildNode((const wchar_t*)"LightManager")==1)
   {
         // Init Luightmanager...

code/branches/FICN/src/loader/Light.cc

@@ -9 +9 @@
                 
         }
+
+  Light::~Light()
+  {
+  }
         
         Light::Light(XMLNode xml)
@@ -18 +22 @@
         {
                 // Here comes the tricky part... convert strings to int
-                const char* diffuse = xml.getAttribute("diffuse-color");
-                const char* coor = xml.getAttribute("abs-coor");
+                const char* diffuse = (const char*)xml.getAttribute((const wchar_t*)"diffuse-color");
+                const char* coor = (const char*)xml.getAttribute((const wchar_t*)"abs-coor");
         }
 }

code/branches/FICN/src/loader/Light.h

@@ -7 +7 @@
 namespace light
 {
-        class Light()
+        class Light
         {
         public:      

code/branches/FICN/src/loader/LightManager.cc

@@ -7 +7 @@
         LightManager::LightManager()
         {
-                vector<Light> this->elements_ = new vector<Light>;
+    std::vector<Light> elements_ = *(new std::vector<Light>);
         }
         
@@ -14 +14 @@
                 if (!xml.isEmpty())
                 {
-                        int nLights = xml.nChildNode("light");
+                        int nLights = xml.nChildNode((const wchar_t*)"light");
                         for (int i=0; i<nLights;i++)
                         {
-                                Light l = new Light(xml.getChildNode("light",i));
-                                this->elements_.append(l);
+                                Light l = *(new Light(xml.getChildNode((const wchar_t*)"light",i)));
+        this->elements_.insert(elements_.end(),l);
                         }
                 }               

code/branches/FICN/src/loader/LightManager.h

@@ -9 +9 @@
 namespace light
 {
-        class LightManager()
+        class LightManager
         {      
         public:
@@ -20 +20 @@
                 float ambient_g_;
                 float ambient_b_;
-                vector<Light> elements_;
+    std::vector<Light> elements_;
         };
 }

code/branches/FICN/src/network/ClientConnection.cc

@@ -12 +12 @@
 #include "ClientConnection.h"
 
+// workaround for usleep(int) under windows
+#ifdef WIN32
+#include "winbase.h"
+#endif
+
 namespace network{
 
-  boost::thread_group network_threads;
+  static boost::thread_group network_threads;
 
   ClientConnection::ClientConnection(int port, std::string address){
@@ -34 +39 @@
   bool ClientConnection::waitEstablished(int milisec){
     for(int i=0; i<=milisec && !established; i++)
+// under windows, use Sleep(milliseconds) instead of usleep(microseconds)
+#ifdef WIN32
+      Sleep(1);
+#else
       usleep(1000);
+#endif
     return established;
   }

code/branches/FICN/src/network/GameStateManager.cc

@@ -106 +106 @@
   }
   
-  
+  return true;
 }
 
@@ -115 +115 @@
  */
 // orxonox::Iterator<Synchronisable> removeObject(orxonox::Iterator<Synchronisable> it){
-void removeObject(orxonox::Iterator<Synchronisable> &it){
+void GameStateManager::removeObject(orxonox::Iterator<Synchronisable> &it){
   orxonox::Iterator<Synchronisable> temp=it;
   ++it;

code/branches/FICN/src/network/GameStateManager.h

@@ -44 +44 @@
   bool loadSnapshot(GameState state);
 private:
-  bool removeObject(orxonox::Iterator<Synchronisable> it);
+  void removeObject(orxonox::Iterator<Synchronisable> &it);
 
 };

code/branches/FICN/src/network/PacketBufferTest.cc

@@ -14 +14 @@
     p.data=i*i;
     std::cout << i << ": pushing " << p.data << std::endl;
-    test.push(p);
+    test.push((ENetEvent*)&p);
   }
   std::cout << std::endl << "queue.print()" << std::endl;
   test.print();
   while(!test.isEmpty()){
-    int i=test.pop().data;
+    int i = (int)test.pop()->data;
     std::cout << "We popped the value " << i << std::endl;
   }

code/branches/FICN/src/network/PacketBufferTestExt.cc

@@ -7 +7 @@
 
 using namespace network;
+
+// workaround for usleep(int) under windows
+#ifdef WIN32
+#include "winbase.h"
+#endif
 
 
@@ -18 +23 @@
 ENET_PACKET_FLAG_RELIABLE);
     std::cout << i << ": pushing " << packet->data << std::endl;
-    test->push(packet);
+    test->push((ENetEvent*)packet);
     if(i==5)
+// under windows, use Sleep(milliseconds) instead of usleep(microseconds)
+#ifdef WIN32
+      Sleep(200);
+#else
       usleep(200000);
+#endif
   }
   test->setClosed(true);

code/branches/FICN/src/network/Synchronisable.cc

@@ -21 +21 @@
 {
   datasize=0;
-  registerAllVariables();
+  //registerAllVariables();
 }
 

code/branches/FICN/src/network/Synchronisable.h

@@ -52 +52 @@
   int getSize();
   bool updateData(syncData vars);
-  virtual void registerAllVariables();
+  virtual void registerAllVariables() = 0;
 
 private:

code/branches/FICN/src/network/dummyclient.cc

@@ -8 +8 @@
 #include <enet/enet.h>
 #include "PacketManager.h"
+
+// workaround for usleep(int) under windows
+#ifdef WIN32
+#include "winbase.h"
+#endif
+
 
 using namespace std;
@@ -67 +73 @@
       cout << "failed sending" << endl;
     }
+// under windows, use Sleep(milliseconds) instead of usleep(microseconds)
+#ifdef WIN32
+    Sleep(1000);
+#else
     usleep(1000000);
+#endif
   }
 

code/branches/FICN/src/network/dummyserver.cc

@@ -9 +9 @@
 #include "ConnectionManager.h"
 #include "PacketManager.h"
+
+// workaround for usleep(int) under windows
+#ifdef WIN32
+#include "winbase.h"
+#endif
+
 
 using namespace network;
@@ -23 +29 @@
   while(!quit){
     if(server.queueEmpty())
+// under windows, use Sleep(milliseconds) instead of usleep(microseconds)
+// Warning: Sleep(1) is ten times longer than usleep(100)!
+#ifdef WIN32
+      Sleep(1);
+#else
       usleep(100);
+#endif
     else{
       ENetAddress addr;

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