Changeset 525 for code/branches/FICN/src/loader

Timestamp:

Dec 13, 2007, 11:54:00 PM (17 years ago)

Author:

nicolape

Message:

Running again, but only with hack, don't know why the loader can't set up the steering

Location:

code/branches/FICN/src/loader

Files:

• LevelLoader.cc (modified) (3 diffs)
• LevelLoader.h (modified) (1 diff)

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

@@ -104 +104 @@
                         TiXmlNode* tNode;
 
+                        Ogre::OverlayManager& omgr = Ogre::OverlayManager::getSingleton();
+                        Ogre::Overlay* mLoadOverlay;
 
                         // Set loading screen
@@ -126 +128 @@
                                         loadingBarHeight_ = tElem->Attribute("height");
                                 }
-                                showLoadingScreen();
+                                
+                                
+                    mLoadOverlay = (Ogre::Overlay*)omgr.getByName("Orxonox/LoadingScreenSample");
+                    mLoadOverlay->show();                               
+
+                                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";
+                                                        
                         }
 
@@ -147 +157 @@
                                 }
                         }
-
+                        
+                        if (loadElem)
+                        {
+                                 mLoadOverlay->hide();
+                        }
                         std::cout << "Loading finished!\n\n\n\n\n";
                 }
-        }
-
-        void LevelLoader::showLoadingScreen()
-        {
-                
-                Ogre::OverlayManager& omgr = Ogre::OverlayManager::getSingleton();
-    Ogre::Overlay* mLoadOverlay = (Ogre::Overlay*)omgr.getByName("Orxonox/LoadingScreenSample");
-    mLoadOverlay->show(); 
-                
-                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";
         }
 

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

@@ -29 +29 @@
                 // Destructor
                 ~LevelLoader();
-                // Shows a simple loading screen
-                void showLoadingScreen();
                 // Loads all level data
                 void loadLevel();