Changeset 588 for code/branches/FICN/src

Timestamp:

Dec 17, 2007, 6:38:36 PM (17 years ago)

Author:

bknecht

Message:

corrected strange behaviour

Location:

code/branches/FICN/src/orxonox

Files:

• hud/HUD.cc (modified) (1 diff)
• orxonox.cc (modified) (3 diffs)
• run_manager.cc (modified) (6 diffs)
• run_manager.h (modified) (2 diffs)

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

@@ -2 +2 @@
 #include <Ogre.h>
 #include <OIS/OIS.h>
-#include <CEGUI/CEGUI.h>
-#include <CEGUIRenderer.h>
+//#include <CEGUI/CEGUI.h>
+//#include <CEGUIRenderer.h>
 
 

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

@@ -64 +64 @@
 
 #include "particle/ParticleInterface.h"
+
+#include "hud/HUD.h"
 
 //network stuff
@@ -402 +404 @@
   void Orxonox::setupRenderSystem()
   {
-    if (/*!root_->restoreConfig() &&*/ !root_->showConfigDialog())
+    if (!root_->restoreConfig() && !root_->showConfigDialog())
       throw Exception(52, "User canceled the config dialog!", "OrxApplication::setupRenderSystem()");
   }
@@ -430 +432 @@
     loader_->loadLevel();
 
-    auMan_->ambientStart();
+    Overlay* hudOverlay = OverlayManager::getSingleton().getByName("Orxonox/HUD1.2");
+    hud::HUD* orxonoxHud;
+    orxonoxHud = new hud::HUD();
+    orxonoxHud->setEnergyValue(20);
+    orxonoxHud->setEnergyDistr(20,20,60);
+    hudOverlay->show();
+
+
+        /*
+    auMan_->ambientAdd("a1");
+    auMan_->ambientAdd("a2");
+    auMan_->ambientAdd("a3");
+                                //auMan->ambientAdd("ambient1");
+    auMan_->ambientStart();*/
   }
 

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

@@ -54 +54 @@
 #include "weapon/base_weapon.h"
 
-#include "hud/hud_overlay.h"
-#include "hud/test_overlay.h"
+//#include "hud/hud_overlay.h"
+//#include "hud/test_overlay.h"
+#include "hud/HUD.h"
 
 #include "run_manager.h"
@@ -142 +143 @@
 
     // create HUD
-    hud_ = new hud::TestOverlay(window_);
-    hud_->show();
+    //hud_ = new hud::TestOverlay(window_);
+    //hud_->show();
+    /*hud_ = new hud::HUD();
+    hud_->show();*/
 
 
@@ -206 +209 @@
     if (bulletManager_)
       delete bulletManager_;
-    if (hud_)
-      delete hud_;
+    /*if (hud_)
+      delete hud_;*/
   }
 
@@ -241 +244 @@
       + " | Ammo stock = "
       + StringConverter::toString(playerShip_->getAmmoStock());
-    hud_->setDebugText(tempStr);
-
-    hud_->tick(time, deltaTime);
+    //hud_->setDebugText(tempStr);
+
+    //hud_->tick(time, deltaTime);
 
     // update the bullet positions
@@ -444 +447 @@
   void RunManager::showDebugOverlay(bool show)
   {
-    if (hud_)
+    /*if (hud_)
     {
       if (show)
@@ -450 +453 @@
       else
         hud_->hide();
-    }
+    }*/
   }
 

code/branches/FICN/src/orxonox/run_manager.h

@@ -47 +47 @@
   public:
     virtual ~RunManager();
-    
+
     void initialise(OgreControl*);
 
@@ -109 +109 @@
           OrxonoxScene *backgroundScene_;
           OrxonoxShip  *playerShip_;
-    hud::TestOverlay *hud_;
+    //hud::TestOverlay *hud_;
+          //hud::HUD  *hud_;
 
     // Bullet manager