Changeset 480

Timestamp:

Dec 12, 2007, 7:54:44 PM (16 years ago)

Author:

nicolape

Message:

Level loader working, see test1 class

Location:

code/branches/FICN

Files:

• bin/levels/sample.oxw (modified) (1 diff)
• bin/levels/sp_level_moonstation.oxw (deleted)
• src/CMakeLists.txt (modified) (1 diff)
• src/loader/CMakeLists.txt (modified) (1 diff)
• src/loader/LevelLoader.cc (modified) (7 diffs)
• src/loader/LevelLoader.h (modified) (3 diffs)
• src/orxonox/CMakeLists.txt (modified) (1 diff)
• src/orxonox/core/OrxonoxClass.h (modified) (1 diff)
• src/orxonox/objects/BaseObject.cc (modified) (1 diff)
• src/orxonox/objects/BaseObject.h (modified) (1 diff)
• src/orxonox/objects/CMakeLists.txt (modified) (1 diff)
• src/orxonox/objects/test1.cc (modified) (2 diffs)
• src/orxonox/objects/test1.h (modified) (2 diffs)
• src/orxonox/orxonox.cc (modified) (3 diffs)

code/branches/FICN/bin/levels/sample.oxw

@@ -15 +15 @@
         
         <world>
-
-
+                <Test1>
+                        sdafa sdfj askjfdskdalfj
+                </Test1>
         </world>
 

code/branches/FICN/src/CMakeLists.txt

@@ -7 +7 @@
 ADD_SUBDIRECTORY(orxonox)
 ADD_SUBDIRECTORY(audio)
+ADD_SUBDIRECTORY(tinyxml)
 
 # xml gets handled by loader

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

@@ -4 +4 @@
 SET( LOADER_SRC_FILES
   LevelLoader.cc
-  #../xml/xmlParser.cc
-  ../tinyxml/tinystr.cc
-  ../tinyxml/tinyxml.cc
-  ../tinyxml/tinyxmlerror.cc
-  ../tinyxml/tinyxmlparser.cc
 )
 
 ADD_LIBRARY(loader SHARED ${LOADER_SRC_FILES})
+
+TARGET_LINK_LIBRARIES( loader
+  xml
+)

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

@@ -5 +5 @@
 #include "tinyxml/tinyxml.h"
 #include "orxonox/core/IdentifierIncludes.h"
+#include "orxonox/core/Error.h"
+#include "orxonox/objects/BaseObject.h"
 
 using namespace std;
@@ -11 +13 @@
 {
 
-LevelLoader::LevelLoader(string file, string dir)
-{
+LevelLoader::LevelLoader(string file, string path)
+{
+        valid_ = false;
+        
         // Load XML level file
-        dir.append("/");
-        dir.append(file);       
+        path.append("/");
+        path.append(file);      
         
         // Open xml file
-        TiXmlDocument doc(file);
+        doc.LoadFile(path);
 
         // Check if file was loaded
@@ -24 +28 @@
         {
                 TiXmlHandle hDoc(&doc);
-                TiXmlHandle hRoot(0);   
-
+                TiXmlHandle hRoot(0);           
                 TiXmlElement* pElem;
-                
 
                 // Check for root element
@@ -35 +37 @@
                         // Set root element
                         hRoot = TiXmlHandle(pElem);
+                        rootElement = hRoot.Element();
 
                         // Set level description
@@ -44 +47 @@
                         
                         // Set level name
-                        pElem = hRoot.Element();
-                        name_ = pElem->Attribute("name");
-                        image_ = pElem->Attribute("image");
+                        name_ = rootElement->Attribute("name");
+                        image_ = rootElement->Attribute("image");
+                        
+                        valid_ = true;
+                }
+                else
+                {
+                        orxonox::Error("Level file has no valid root node");
+                }       
+        }
+        else
+        {
+                orxonox::Error("Could not load level file ");
+        }       
+}
+
+        void LevelLoader::loadLevel()
+        {
+                if (valid_)
+                {
+                        TiXmlElement* loadElem;
+                        TiXmlElement* worldElem;
+                        TiXmlElement* tElem;
+                        TiXmlNode* tNode;
+                        
                         
                         // Set loading screen
-                        pElem = hRoot.FirstChild("loading").Element();
-                        if (pElem)
+                        loadElem = rootElement->FirstChildElement("loading");
+                        if (loadElem)
                         {
                                 // Set background
-                                pElem = hRoot.FirstChild("loading").FirstChild("background").Element();
-                                if (pElem)
+                                tElem = loadElem->FirstChildElement("background");
+                                if (tElem)
                                 {
-                                        loadingBackgroundColor_ = pElem->Attribute("color");
-                                        loadingBackgroundImage_ = pElem->Attribute("image");
+                                        loadingBackgroundColor_ = tElem->Attribute("color");
+                                        loadingBackgroundImage_ = tElem->Attribute("image");
                                 }
                                 // Set bar
-                                pElem = hRoot.FirstChild("loading").FirstChild("bar").Element();
-                                if (pElem)
+                                tElem = loadElem->FirstChildElement("bar");
+                                if (tElem)
                                 {
-                                        loadingBarImage_ = pElem->Attribute("image");;
-                                        loadingBarTop_ = pElem->Attribute("top");
-                                        loadingBarLeft_ = pElem->Attribute("left");
-                                        loadingBarWidth_ = pElem->Attribute("width");
-                                        loadingBarHeight_ = pElem->Attribute("height");
+                                        loadingBarImage_ = tElem->Attribute("image");;
+                                        loadingBarTop_ = tElem->Attribute("top");
+                                        loadingBarLeft_ = tElem->Attribute("left");
+                                        loadingBarWidth_ = tElem->Attribute("width");
+                                        loadingBarHeight_ = tElem->Attribute("height");
                                 }
+                                showLoadingScreen();
                         }
-                                                
-                        
-                }
-                else
-                {
-                        std::string err = "Level file has no valid root node";
-                        std::cout << err << std::endl;
-                }       
-        }
-        else
-        {
-                std::string err = "Could not load level file ";
-                err.append(file); 
-                std::cout << err << std::endl;
-        }       
+                        
+                        // Load audio
+                        // TODO
+                        
+                        // Load scripts
+                        // TODO
+                        
+                        // Load world
+                        worldElem = rootElement->FirstChildElement("world");
+                        if (worldElem)
+                        {       
+                                tNode = 0;
+                                while( tNode = worldElem->IterateChildren( tNode ) )
+                                {
+                                        tElem = tNode->ToElement();
+                                        orxonox::BaseObject* obj = orxonox::ID(tElem->Value())->fabricate();
+                                        obj->loadParams(tElem);
+                                }                       
+                        }
+                        
+                        std::cout << "Loading finished!\n\n\n\n\n";                                             
+                }
+        }
+        
+        void LevelLoader::showLoadingScreen()
+        {
+                std::cout << "\n\n\nThis is Orxonox\nthe hottest 3D action shooter ever to exist\n\n\n";
+                std::cout << "Level: " << name() << "\nDescription:" << description() << "\nImage:"<<image()<<"\n\n\n";
+                std::cout << "Backgroundcolor: " << loadingBackgroundColor_ << "\nBackgroundimage:" << loadingBackgroundImage_ << "\n\n\n";
+        }
         
         
@@ -130 +171 @@
 */
 
-}
+
 
 LevelLoader::~LevelLoader()
@@ -154 +195 @@
 }
 
-void LevelLoader::showLoadingScreen()
-{
-        cout << "\n\n\nThis is Orxonox\nthe hottest 3D action shooter ever to exist\n\n\n";
-        cout << "Level: " << name() << "\nDescription:" << description() << "\nImage:"<<image()<<"\n\n\n";
-}
 
 /*

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

@@ -24 +24 @@
         {
         private:
-                /*
-                // XML Nodes 
-                XMLNode rootNode;
-                XMLNode loadingScreenNode;
-                XMLNode worldNode;
-                XMLNode audioNode;
-                XMLNode scriptsNode;
-                */
                 // Level information
                 std::string name_;
                 std::string description_;
                 std::string image_;
-                
                 std::string loadingBackgroundColor_;
                 std::string loadingBackgroundImage_;
@@ -44 +35 @@
                 std::string loadingBarWidth_;
                 std::string loadingBarHeight_;
+                
+                bool valid_;
                         
+                TiXmlDocument doc;
+                TiXmlElement* rootElement;      
         public:
 
@@ -52 +47 @@
                 
                 void showLoadingScreen();
+                void loadLevel();
                 
                 // Getters

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

@@ -32 +32 @@
   objects
   weapon
+  xml
 )
 

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

@@ -92 +92 @@
             inline const bool isVisible() const { return this->bVisible_; }
 
-                        //virtual void loadParams(TIXMLNode n);
 
         private:

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

@@ -13 +13 @@
     {
     }
+    
 }

code/branches/FICN/src/orxonox/objects/BaseObject.h

@@ -11 +11 @@
             BaseObject();
             virtual ~BaseObject();
+                        virtual void loadParams(TiXmlElement* xmlElem) {}
+            
     };
 }

code/branches/FICN/src/orxonox/objects/CMakeLists.txt

@@ -9 +9 @@
 
 ADD_LIBRARY(objects SHARED ${OBJECTS_SRC_FILES})
+
+TARGET_LINK_LIBRARIES( objects
+  xml
+)

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

@@ -2 +2 @@
 #include "test2.h"
 #include "test3.h"
+#include "../../tinyxml/tinyxml.h"
 
 namespace orxonox
@@ -66 +67 @@
         this->usefullClass3_ = identifier;
     }
+    
+    void Test1::loadParams(TiXmlElement* xmlElem)
+    {
+        std::cout<< xmlElem->GetText()<<std::endl;
+    }
 }

code/branches/FICN/src/orxonox/objects/test1.h

@@ -5 +5 @@
 #include "Tickable.h"
 #include "test3.h"
+#include "../../tinyxml/tinyxml.h"
 
 namespace orxonox
@@ -22 +23 @@
             void setUsefullClass2(Identifier* identifier);
             void setUsefullClassOfTypeTest3(Identifier* identifier);
+            
+            void loadParams(TiXmlElement* xmlElem);
 
         private:

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

@@ -218 +218 @@
   {
     //TODO: start modules
-    ogre_->startRender();
-    auMan_ = new audio::AudioManager();
-    // load this file from config
-    string levelFile = "sample.oxw";
-    //loader_ = new loader::LevelLoader(levelFile);
+
     //TODO: run engine
   }
@@ -339 +335 @@
   void Orxonox::createScene(void)
   {
+        // Init audio
     auMan_ = new audio::AudioManager();
-
+    
+    // load this file from config
+    loader_ = new loader::LevelLoader("sample.oxw");
+    loader_->loadLevel();
+
+        /*
     auMan_->ambientAdd("a1");
     auMan_->ambientAdd("a2");
@@ -346 +348 @@
                                 //auMan->ambientAdd("ambient1");
     auMan_->ambientStart();
-
-    string levelFile = "sp_level_moonstation.oxw";
-//       loader::LevelLoader* loader = new loader::LevelLoader(levelFile);
+        */
   }