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

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/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)

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