Changeset 470 for code/branches

Timestamp:

Dec 12, 2007, 2:30:29 PM (16 years ago)

Author:

nicolape

Message:

Did some changes to levelloader

Location:

code/branches/FICN

Files:

• bin/levels/sample.oxw (modified) (1 diff)
• src/loader/LevelLoader.cc (modified) (2 diffs)
• src/loader/LevelLoader.h (modified) (2 diffs)

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

@@ +1 @@
+<?xml version="1.0"?>
 <orxonoxworld name="Orxonox sample level" image="textures/menu/moonstation_512x512.jpg">
         <description>

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

@@ -19 +19 @@
 
         // Assing general level infos to class variables
-        //this->name_ = (std::string)rootNode.getAttribute("name").getText();
-        //this->image_ = (std::string)rootNode.getAttribute("image").getText();
-        //this->description_ = (std::string)rootNode.getChildNode("description").getText();
+        
+        this->name_ = rootNode.getAttribute("name");
+        this->image_ = rootNode.getAttribute("image");
+        this->description_ = rootNode.getChildNode("description").getText();
   
-        //this->loadingScreen();
+        loadingScreenNode = rootNode.getChildNode("loading");
   
+        if (!loadingScreenNode.isEmpty())
+        {
+                this->showLoadingScreen();
+        }
+  
+  /*
   // Assign sub-nodes
   if (rootNode.nChildNode("LightManager")==1)
   {
         // Init Luightmanager...
-  }
+  }*/
   
   /*
@@ -63 +70 @@
 }
 
-void LevelLoader::loadingScreen()
+void LevelLoader::showLoadingScreen()
 {
         cout << "\n\n\nThis is Orxonox\nthe hottest 3D action shooter ever to exist\n\n\n";

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

@@ -31 +31 @@
                 
                 // Level information
-                string name_;
-                string description_;
-                string image_;
+                std::string name_;
+                std::string description_;
+                std::string image_;
                         
         public:
@@ -41 +41 @@
                 ~LevelLoader();
                 
-                void loadingScreen();
+                void showLoadingScreen();
                 
                 // Getters