Changeset 347 for code/branches

Timestamp:

Nov 29, 2007, 4:32:22 PM (17 years ago)

Author:

rgrieder

Message:

• fixed a bug: under windows, XML uses wchar_t instead of char, but can use char —> commented a line in xml/xmlParser.h according to description in that file
• was able to add the xml parser again to orxonox.cc thanks to the above modification

Location:

code/branches/FICN/src

Files:

• loader/LevelLoader.cc (modified) (1 diff)
• loader/Light.cc (modified) (1 diff)
• loader/LightManager.cc (modified) (1 diff)
• orxonox/orxonox.cc (modified) (1 diff)
• xml/xmlParser.h (modified) (1 diff)

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

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

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

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

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

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

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

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

code/branches/FICN/src/xml/xmlParser.h

@@ -47 +47 @@
 // The _XMLWIDECHAR preprocessor variable force the XMLParser library into either utf16/32-mode (the proprocessor variable
 // must be defined) or utf8-mode(the pre-processor variable must be undefined).
-#define _XMLWIDECHAR
+//#define _XMLWIDECHAR
 #endif