Changeset 991 for code/branches

Timestamp:

Apr 4, 2008, 12:10:58 PM (17 years ago)

Author:

rgrieder

Message:

• added the hud files and edited the CMLs

Location:

code/branches/hud2

Files:

• src/orxonox/CMakeLists.txt (modified) (2 diffs)
• src/orxonox/Orxonox.cc (modified) (3 diffs)
• src/orxonox/hud/Bar.cc (added)
• src/orxonox/hud/Bar.h (added)
• src/orxonox/hud/BarV1.cc (added)
• src/orxonox/hud/BarV1.h (added)
• src/orxonox/hud/HUD.cc (modified) (5 diffs)
• src/orxonox/hud/HUD.h (modified) (1 diff)
• src/orxonox/hud/HUDV2.cc (added)
• src/orxonox/hud/HUDV2.h (added)
• src/orxonox/hud/Radar.cpp (added)
• src/orxonox/hud/Radar.h (added)
• visual_studio/vc8/orxonox.vcproj (modified) (2 diffs)

code/branches/hud2/src/orxonox/CMakeLists.txt

@@ -5 +5 @@
 #  SpaceshipSteering.cc
   hud/HUD.cc
+  hud/Bar.cc
   particle/ParticleInterface.cc
   tools/BillboardSet.cc
@@ -46 +47 @@
 )
 
+

code/branches/hud2/src/orxonox/Orxonox.cc

@@ -255 +255 @@
     bulletMgr_ = new BulletManager();
     
-    Ogre::Overlay* hudOverlay = Ogre::OverlayManager::getSingleton().getByName("Orxonox/HUD1.2");
-    HUD* orxonoxHud;
-    orxonoxHud = new HUD();
-    orxonoxHud->setEnergyValue(20);
-    orxonoxHud->setEnergyDistr(20,20,60);
-    hudOverlay->show();
+    //Ogre::Overlay* hudOverlay = Ogre::OverlayManager::getSingleton().getByName("Orxonox/HUD1.2");
+    //HUD* orxonoxHud;
+    orxonoxHUD_ = new HUD(1);
+    //orxonoxHud->setEnergyValue(20);
+    //orxonoxHud->setEnergyDistr(20,20,60);
+    //hudOverlay->show();
     
     client_g->establishConnection();
@@ -306 +306 @@
     Loader::open(startlevel);
 
-    Ogre::Overlay* hudOverlay = Ogre::OverlayManager::getSingleton().getByName("Orxonox/HUD1.2");
-    orxonoxHUD_ = new HUD();
-    orxonoxHUD_->setEnergyValue(20);
-    orxonoxHUD_->setEnergyDistr(20,20,60);
-    hudOverlay->show();
+    //Ogre::Overlay* hudOverlay = Ogre::OverlayManager::getSingleton().getByName("Orxonox/HUD1.2");
+    orxonoxHUD_ = new HUD(1);
+    //orxonoxHUD_->setEnergyValue(20);
+    //orxonoxHUD_->setEnergyDistr(20,20,60);
+    //hudOverlay->show();
 
         /*
@@ -374 +374 @@
 
       // show the current time in the HUD
-      orxonoxHUD_->setTime((int)now, 0);
+      //orxonoxHUD_->setTime((int)now, 0);
+      orxonoxHUD_->energyCounter->reset(20);
+
 
       // Iterate through all Tickables and call their tick(dt) function

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

@@ -26 +26 @@
 */
 
+
 #include "OrxonoxStableHeaders.h"
+#include <OgreOverlay.h>
+#include <OgreOverlayContainer.h>
+#include <OgreOverlayManager.h>
+
+#include "HUD.h"
+#include "Bar.h"
+
+
+namespace orxonox
+{
+  using namespace Ogre;
+
+
+
+
+
+  HUD::HUD(int zoom){
+
+    Ogre::OverlayManager& overlayManager = Ogre::OverlayManager::getSingleton();
+
+    energyCounter = new Bar(0,0,100,20,Bar::LEFT,Bar::YELLOW,"Orxonox/HUD/energyCounterPanel/energyCounter");
+
+    Ogre::OverlayContainer* energyCounterPanel = static_cast<Ogre::OverlayContainer*>(overlayManager.createOverlayElement("Panel", "Orxonox/HUD/energyCounterPanel"));
+    energyCounterPanel->setLeft(-50);
+    energyCounterPanel->setTop(10);
+    energyCounterPanel->setWidth(100);
+    energyCounterPanel->setHeight(20);
+    energyCounterPanel->setHorizontalAlignment(Ogre::GHA_CENTER);
+    energyCounterPanel->setMetricsMode(Ogre::GMM_PIXELS);       
+    energyCounterPanel->show();
+    energyCounterPanel->addChild(energyCounter->element);
+
+    Ogre::Overlay* orxonoxOverlay = overlayManager.create("Orxonox/HUD"); 
+    orxonoxOverlay->add2D(energyCounterPanel);
+    orxonoxOverlay->show();
+  }
+
+  HUD::~HUD(void){}
+
+
+
+}
+
+
+
+
+
+
+/*#include "OrxonoxStableHeaders.h"
 
 #include <OgreOverlayManager.h>
@@ -33 +83 @@
 
 #include "HUD.h"
-
+#include "Bar.h"
 
 namespace orxonox
@@ -50 +100 @@
     setTargetWindowDistance(30);
 
-    setEnergyValue(60.0);
+    setEnergyValue(60);
 
     setShieldLeftTopValue(true);
@@ -68 +118 @@
     energyDistrPixelX_ = 100;
     energyDistrPixelY_ = 86;
+
 
   }
@@ -217 +268 @@
 
 }
+*/

code/branches/hud2/src/orxonox/hud/HUD.h

@@ -26 +26 @@
 */
 
+
 #ifndef _HUD_H__
+#define _HUD_H__
+
+#include <string.h>
+#include <OgreOverlayElement.h>
+#include <OgreTextAreaOverlayElement.h>
+#include <OgrePrerequisites.h>
+#include "../OrxonoxPrereqs.h"
+
+#include "Bar.h"
+
+
+namespace orxonox
+{
+  class _OrxonoxExport HUD
+  {
+  private:
+
+  public:
+    HUD(int zoom);
+    ~HUD();
+
+    Bar* energyCounter;
+  };
+}       
+
+
+
+
+
+
+
+
+
+#endif _HUD_H_
+
+/*#ifndef _HUD_H__
 #define _HUD_H__
 

code/branches/hud2/visual_studio/vc8/orxonox.vcproj

@@ -188 +188 @@
                                 >
                                 <File
+                                        RelativePath="..\..\src\orxonox\hud\Bar.cc"
+                                        >
+                                </File>
+                                <File
                                         RelativePath="..\..\src\orxonox\hud\HUD.cc"
                                         >
@@ -322 +326 @@
                                 >
                                 <File
+                                        RelativePath="..\..\src\orxonox\hud\Bar.h"
+                                        >
+                                </File>
+                                <File
+                                        RelativePath="..\..\src\orxonox\hud\BarV1.h"
+                                        >
+                                </File>
+                                <File
                                         RelativePath="..\..\src\orxonox\hud\HUD.h"
+                                        >
+                                </File>
+                                <File
+                                        RelativePath="..\..\src\orxonox\hud\HUDV2.h"
+                                        >
+                                </File>
+                                <File
+                                        RelativePath="..\..\src\orxonox\hud\Radar.h"
                                         >
                                 </File>