Changeset 471

Timestamp:

Dec 12, 2007, 2:45:01 PM (16 years ago)

Author:

nicolape

Message:

Added tinyxml library

Location:

code/branches/FICN/src

Files:

• loader/CMakeLists.txt (modified) (1 diff)
• loader/LevelLoader.cc (modified) (3 diffs)
• loader/LevelLoader.h (modified) (3 diffs)
• tinyxml (added)
• tinyxml/tinystr.cc (added)
• tinyxml/tinystr.h (added)
• tinyxml/tinyxml.cc (added)
• tinyxml/tinyxml.h (added)
• tinyxml/tinyxmlerror.cc (added)
• tinyxml/tinyxmlparser.cc (added)

code/branches/FICN/src/loader/CMakeLists.txt

@@ -4 +4 @@
 SET( LOADER_SRC_FILES
   LevelLoader.cc
-  ../xml/xmlParser.cc
+  #../xml/xmlParser.cc
+  ../tinyxml/tinystr.cc
+  ../tinyxml/tinyxml.cc
+  ../tinyxml/tinyxmlerror.cc
+  ../tinyxml/tinyxmlparser.cc
 )
 

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

@@ -3 +3 @@
 
 #include "LevelLoader.h"
-#include "xml/xmlParser.h"
+//#include "xml/xmlParser.h"
+#include "tinyxml/tinyxml.h"
 
 using namespace std;
@@ -15 +16 @@
         dir.append("/");
         dir.append(file);       
+        
+        TiXmlDocument doc(file);
+        bool loadOkay = doc.LoadFile();
+        if (loadOkay)
+        {
+
+        }
+        else
+        {
+                std::string err = "Could not load level file ";
+                err.append(file); 
+                std::cout << err << std::endl;
+        }       
+        
+        /*
         rootNode = XMLNode::openFileHelper(dir.c_str(),"orxonoxworld");
         // TODO: Error handling
@@ -25 +41 @@
   
         loadingScreenNode = rootNode.getChildNode("loading");
-  
         if (!loadingScreenNode.isEmpty())
         {
                 this->showLoadingScreen();
         }
+
+        worldNode = rootNode.getChildNode("world");
+        if (!worldNode.isEmpty())
+        {
+                
+        }
+        */
+
   
   /*

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

@@ -10 +10 @@
 
 #include "loader_platform.h"
-#include "xml/xmlParser.h"
+//#include "xml/xmlParser.h"
 
 #ifndef __MODULE_LEVELLOADER__
@@ -22 +22 @@
         {
         private:
-                
+                /*
                 // XML Nodes 
                 XMLNode rootNode;
@@ -29 +29 @@
                 XMLNode audioNode;
                 XMLNode scriptsNode;
-                
+                */
                 // Level information
                 std::string name_;