Changeset 2006 for code/branches/objecthierarchy/src/orxonox/gamestates

Timestamp:

Oct 24, 2008, 2:48:43 AM (16 years ago)

Author:

landauf

Message:

many changes, can't remember everything, but these are the most important:

• attaching entities to other entities works
• displaying models, lights and shadows works
• controlling a spectator works
• removed an update hack in PositionableEntity because I've found a much better solution

and with "works" I mean: it works on client, server and standalone

Location:

code/branches/objecthierarchy/src/orxonox/gamestates

Files:

• GSLevel.cc (modified) (4 diffs)
• GSLevel.h (modified) (1 diff)

code/branches/objecthierarchy/src/orxonox/gamestates/GSLevel.cc

@@ -57 +57 @@
         , radar_(0)
         , startLevel_(0)
-        , hud_(0)
     {
         RegisterObject(GSLevel);
@@ -83 +82 @@
         COUT(4) << "Created SceneManager: " << sceneManager_->getName() << std::endl;
 
+        this->sceneManager_->setShadowTechnique(Ogre::SHADOWTYPE_STENCIL_ADDITIVE);
+
         // temporary hack
         GraphicsEngine::getInstance().setLevelSceneManager(this->sceneManager_);
@@ -88 +89 @@
         // Start the Radar
         this->radar_ = new Radar();
-
-        // Load the HUD
-        COUT(3) << "Orxonox: Loading HUD" << std::endl;
-        hud_ = new Level(Settings::getDataPath() + "overlay/hud.oxo");
-        Loader::load(hud_);
 
         // reset game speed to normal
@@ -113 +109 @@
     void GSLevel::leave()
     {
-        Loader::unload(hud_);
-        delete this->hud_;
-
         // this call will delete every BaseObject!
         // But currently this will call methods of objects that exist no more

code/branches/objecthierarchy/src/orxonox/gamestates/GSLevel.h

@@ -69 +69 @@
         Radar*                radar_;            //!< represents the Radar (not the HUD part)
         Level*                startLevel_;       //!< current hard coded default level
-        Level*                hud_;              //!< 'level' object fo the HUD
 
         // config values
         std::string           keyDetectorCallbackCode_;
-        
+
     private:
         void setConfigValues();