Changeset 480 for code/branches/FICN/src/orxonox

Timestamp:

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

Author:

nicolape

Message:

Level loader working, see test1 class

Location:

code/branches/FICN/src/orxonox

Files:

• CMakeLists.txt (modified) (1 diff)
• core/OrxonoxClass.h (modified) (1 diff)
• objects/BaseObject.cc (modified) (1 diff)
• objects/BaseObject.h (modified) (1 diff)
• objects/CMakeLists.txt (modified) (1 diff)
• objects/test1.cc (modified) (2 diffs)
• objects/test1.h (modified) (2 diffs)
• orxonox.cc (modified) (3 diffs)

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);
+        */
   }