Changeset 507

Timestamp:

Dec 12, 2007, 11:34:58 PM (17 years ago)

Author:

nicolape

Message:

• Skybox and ambient light load now from level file sample.oxw. Added objects to and methods to parse this tags. Added a tokenizer function to split strings into smaller strings (for reading out the light colours for examle). Moved Tokenizer and String2number into misc directory. deleted old unised xml class

Location:

code/branches/FICN/src

Files:

• loader/LevelLoader.cc (modified) (2 diffs)
• loader/LevelLoader.h (modified) (3 diffs)
• loader/Light.cc (deleted)
• loader/Light.h (deleted)
• loader/LightManager.cc (deleted)
• loader/LightManager.h (deleted)
• misc (added)
• misc/String2Number.h (copied) (copied from code/branches/FICN/src/xml/String2Number.h) (1 diff)
• misc/Tokenizer.h (added)
• orxonox/objects/Ambient.cc (added)
• orxonox/objects/Ambient.h (added)
• orxonox/objects/CMakeLists.txt (modified) (1 diff)
• orxonox/objects/Skybox.cc (added)
• orxonox/objects/Skybox.h (added)
• orxonox/objects/test1.cc (modified) (1 diff)
• orxonox/orxonox.cc (modified) (3 diffs)
• xml (deleted)

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

@@ -1 @@
-#include <string.h>
+#include <string>
+#include <vector>
 #include <iostream>
+#include <algorithm>
+#include <iterator>
 
 #include "LevelLoader.h"
@@ -127 +130 @@
         }
         
-        
-        //orxonox::BaseObject* bla = orxonox::ID("classname")->fabricate();
-        //bla->loadParams();
+        LevelLoader::~LevelLoader()
+        {
+
+        }
         
         
-        /*
-        rootNode = XMLNode::openFileHelper(dir.c_str(),"orxonoxworld");
-        // TODO: Error handling
-
-        // Assing general level infos to class variables
+        string LevelLoader::name()
+        {
+                return this->name_;
+        }
         
-        this->name_ = rootNode.getAttribute("name");
-        this->image_ = rootNode.getAttribute("image");
-        this->description_ = rootNode.getChildNode("description").getText();
-  
-        loadingScreenNode = rootNode.getChildNode("loading");
-        if (!loadingScreenNode.isEmpty())
-        {
-                this->showLoadingScreen();
-        }
-
-        worldNode = rootNode.getChildNode("world");
-        if (!worldNode.isEmpty())
-        {
-                
-        }
-        */
-
-  
-  /*
-  // Assign sub-nodes
-  if (rootNode.nChildNode("LightManager")==1)
-  {
-        // Init Luightmanager...
-  }*/
-  
-  /*
-  
-        worldNode = rootNode.getChildNode("WorldEntities");
-        scriptNode = rootNode.getChildNode("ScriptManager");
-        cameraNode = rootNode.getChildNode("CameraMan");
-        lightNode = rootNode.getChildNode("LightManager");
-*/
-
-
-
-LevelLoader::~LevelLoader()
-{
+        string LevelLoader::description()
+        {
+                return this->description_;
+        }
+        
+        string LevelLoader::image()
+        {
+                return this->image_;
+        }
 
 
 }
 
-
-string LevelLoader::name()
-{
-        return this->name_;
-}
-
-string LevelLoader::description()
-{
-        return this->description_;
-}
-
-string LevelLoader::image()
-{
-        return this->image_;
-}
-
-
-/*
-
-
-void LevelLoader::loadWorld(WorldManager* wm)
-{
-        if (!worldNode.getChildNode("lights").isEmpty())
-        {
-                
-                
-        }
-}
-
-
-void LevelLoader::loadLights(LightManager* lm)
-{
-        if (!lightNode.getChildNode("lights").isEmpty())
-        {
-                int nLights = lightNode.getChildNode("lights").nChildNode("light");
-                for (int i=0; i<nLights;i++)
-                {
-                        XMLNode t = lightNode.getChildNode("lights").getChildNode("light",i);
-                        const char* diffuse = t.getAttribute("diffuse-color");
-                        const char* coor = t.getAttribute("abs-coor");
-                        lm->addLight(diffuse,coor);     
-                }
-        }
-        lm->setAmbient(lightNode.getChildNode("ambient").getAttribute("color"));        
-}
-
-void LevelLoader::loadCameras(CameraManager* cm)
-{
-        if (!cameraNode.getChildNode("cameras").isEmpty())
-        {
-                int nCameras = cameraNode.getChildNode("cameras").nChildNode("camera");
-                for (int i=0; i<nCameras;i++)
-                {
-                        XMLNode t = cameraNode.getChildNode("cameras").getChildNode("camera",i);
-                        
-                        
-                        cm->addCamera();
-                }
-        }
-}
-
-
-void LevelLoader::loadScripts(ScriptManager* sm)
-{
-        if (!scriptNode.getChildNode("scripts").isEmpty())
-        {
-                int nScripts = scriptNode.getChildNode("scripts").nChildNode("script");
-                for (int i=0; i<nScripts;i++)
-                {
-                        XMLNode t = scriptNode.getChildNode("scripts").getChildNode("script",i);
-                        sm->addScript(t.getAttribute("file"));
-                }
-        
-        }
-}
-*/
-
-
-}
-

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

@@ -7 +7 @@
 
 #include <string>
+#include <vector>
 #include <iostream>
 
@@ -23 +24 @@
         class _LoaderExport LevelLoader
         {
+        public:
+                // Constructors, loads the level file and some information data
+                LevelLoader(string file, string dir="levels");
+                // Destructor
+                ~LevelLoader();
+                // Shows a simple loading screen
+                void showLoadingScreen();
+                // Loads all level data
+                void loadLevel();
+        
+                // Getters
+                string name();
+                string description();
+                string image();         
         private:
                 // Level information
@@ -36 +51 @@
                 std::string loadingBarHeight_;
                 
+                // Set to true if it was possible to load the level file
                 bool valid_;
                         
+                // Xml-Stuff
                 TiXmlDocument doc;
                 TiXmlElement* rootElement;      
-        public:
 
-                // Constructors
-                LevelLoader(string file, string dir="levels");
-                ~LevelLoader();
-                
-                void showLoadingScreen();
-                void loadLevel();
-                
-                // Getters
-                string name();
-                string description();
-                string image();         
-                
-                // Managers 
-                
                         
         };      

code/branches/FICN/src/misc/String2Number.h

@@ -32 +32 @@
         * should be one of std::hex, std::dec or std::oct (dec is default value)
         */
-        String2Number(T& t, const std::string& s, std::ios_base& (*f)(std::ios_base&) =  std::dec, int haltOnError=1)
+        inline String2Number(T& t, const std::string& s, std::ios_base& (*f)(std::ios_base&) =  std::dec, int haltOnError=1)
         {
           std::istringstream iss(s);

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

@@ -7 +7 @@
   test2.cc
   test3.cc
+  Ambient.cc
+  Skybox.cc
 )
 

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

@@ -72 +72 @@
     void Test1::loadParams(TiXmlElement* xmlElem)
     {
-        Ogre::SceneManager* mgr = orxonox::Orxonox::getSingleton()->getSceneManager();
-        
-        mgr->setAmbientLight(ColourValue(1,0,0));
-        
-        
-        
-        std::cout<< xmlElem->GetText()<<std::endl;
+
         
         

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

@@ -56 +56 @@
 #include "core/Factory.h"
 
-#include "../xml/xmlParser.h"
 #include "../loader/LevelLoader.h"
 #include "../audio/AudioManager.h"
@@ -360 +359 @@
   {
     SceneManager *mgr = ogre_->getSceneManager();
+    
     Camera *cam = mgr->createCamera("Camera");
     cam->setPosition(Vector3(0,0,-250));
@@ -370 +370 @@
     node->attachObject(head);
     node->attachObject(cam);
-    mgr->setSkyBox(true, "Examples/SceneSkyBox2");
+    
+    
 
     Entity* head1 = mgr->createEntity("head1", "ogrehead.mesh");