Changeset 980

Timestamp:

Apr 3, 2008, 2:52:50 PM (17 years ago)

Author:

chaiy

Message:

hallo

Location:

code/branches/hud/src/orxonox/hud

Files:

• Bar.cc (modified) (3 diffs)
• Bar.h (modified) (1 diff)
• HUD.cc (modified) (6 diffs)
• HUD.h (modified) (1 diff)

code/branches/hud/src/orxonox/hud/Bar.cc

@@ -3 +3 @@
 *
 *
-*   License notice:asdf
+*   License notice:
 *
 *   This program is free software; you can redistribute it and/or
@@ -28 +28 @@
 #include <OgreOverlayManager.h>
 #include <OgreOverlayElement.h>
+#include <OgreTextAreaOverlayElement.h>
 #include <OgreStringConverter.h>
-#include <OgreColourValue.h>
 #include <string.h>
 
@@ -37 +37 @@
 {
   using namespace Ogre;
+    
+  Bar::Bar(Real left, Real top, Real width, Real height,
+          int dir,  int colour, std::string name){
+    Ogre::OverlayManager& overlayManager = Ogre::OverlayManager::getSingleton();
+    element = overlayManager.createOverlayElement("Panel",name);
+    element->setMetricsMode(Ogre::GMM_PIXELS);
+    dir_ = dir;
+    left_ = left;
+    top_ = top;
+    width_ = width;
+    height_ = height;
+    element->setPosition(left_,top_);
+    element->setDimensions(width_,height_);
+    setColour(colour);
+  }
+  
+  Bar::~Bar(void){}
+  
+  
+  void Bar::reset(int percentage){
+    switch(dir_){
+      case 1:
+        element->setPosition(left_,top_);
+        element->setDimensions(width_,height_*percentage/100);
+        break;
+      case 2:
+        element->setPosition(left_+width_-width_*percentage/100,top_);
+        element->setDimensions(width_*percentage/100,height_);
+        break;
+      case 3:
+        element->setPosition(left_,top_+height_-height_*percentage/100);
+        element->setDimensions(width_,height_*percentage/100);
+        break;
+      default:
+        element->setPosition(left_,top_);
+        element->setDimensions(width_*percentage/100,height_);  
+    }
+  }
 
-  Bar::Bar(void){}
+  void Bar::setColour(int colour){
+    switch(colour){
+     case 0:
+        element->setMaterialName("Orxonox/Red");
+        break;
+     case 1:
+        element->setMaterialName("Orxonox/Yellow");
+        break;
+     case 2:
+        element->setMaterialName("Orxonox/Green");
+    }
+  }
 
-  Bar::~Bar(void){}
+  void Bar::show(){element->show();}
+
+  void Bar::hide(){element->hide();}
+
+  SmartBar::SmartBar(Ogre::Real left, Ogre::Real top, Ogre::Real width, Ogre::Real height,
+        int dir, std::string name) : Bar::Bar(left, top, width, height, dir, Bar::YELLOW, name){
+  }
+
+  SmartBar::~SmartBar(void){}
 
 
-/*  void Bar::setPercentage(Ogre::Real percentage){
-    percentage_=percentage;
-    if(horz_){setWidth(int(percentage_* maxLength_));}
-        else {setHeight(int(percentage_ * maxHeight_));}
-    }
-*/
-
-  void Bar::setPercentage(Ogre::Real percentage){
-    percentage_ = percentage;
-//    setWidth(getWidth());
+  void SmartBar::reset(int percentage){
+    if (percentage>50) {setColour(Bar::GREEN);}
+    else if (percentage>25) {setColour(Bar::YELLOW);}
+    else setColour(Bar::RED);
+    Bar::reset(percentage);
   }
 
+}
 
 
-
-  void Bar::setColor(ColourValue color){
-    color_=color;
-    setColour(color);
-  }
-
-
-}

code/branches/hud/src/orxonox/hud/Bar.h

@@ -30 +30 @@
 #define _BAR_H__
 
-#include <string>
-#include <OgreColourValue.h>
+#include <string.h>
 #include <OgreOverlayElement.h>
+#include <OgreTextAreaOverlayElement.h>
 #include <OgrePrerequisites.h>
-#include <string.h>
 #include "../OrxonoxPrereqs.h"
 
 
 
-// namespace hud
 namespace orxonox
 {
-  class Bar : public Ogre::OverlayElement
+  class _OrxonoxExport Bar
   {
   private:
-    double percentage_;
-    bool horz_;
-    Ogre::ColourValue color_;
+    int percentage_;
+    int dir_;   
+    int left_;
+    int top_;
+    int width_;
+    int height_;
+        
+  public:
+    static const int LEFT = 0;
+    static const int UP = 1;
+    static const int RIGHT = 2;
+    static const int DOWN = 3;
+
+    static const int RED = 0;
+    static const int YELLOW = 1;
+    static const int GREEN = 2;
+
+    Ogre::OverlayElement* element;
+
+    Bar(Ogre::Real left, Ogre::Real top, Ogre::Real width, Ogre::Real height,
+        int dir, int colour, std::string name);
+    ~Bar(void);
+    void reset(int percentage);
+    void setColour(int colour);
+    void show();
+    void hide();
+    
+  };
 
 
+  class _OrxonoxExport SmartBar : public Bar
+  {
+  private:
+
   public:
-    Bar(void);
-    ~Bar(void);
-    void setPercentage(Ogre::Real percentage);
-    void setColor(Ogre::ColourValue color);
+    SmartBar(Ogre::Real left, Ogre::Real top, Ogre::Real width, Ogre::Real height,
+        int dir, std::string name);
+    ~SmartBar(void);
+    void reset(int percentage);
   };
 }

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

@@ -8 +8 @@
 *   modify it under the terms of the GNU General Public License
 *   as published by the Free Software Foundation; either version 2
-*   of the License, or (at your option)asdf any later version.
+*   of the License, or (at your option) any later version.
 *
 *   This program is distributed in the hope that it will be useful,
@@ -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>
@@ -34 +84 @@
 #include "HUD.h"
 #include "Bar.h"
-
 
 namespace orxonox
@@ -51 +100 @@
     setTargetWindowDistance(30);
 
-    setEnergyValue(60.0);
+    setEnergyValue(60);
 
     setShieldLeftTopValue(true);
@@ -69 +118 @@
     energyDistrPixelX_ = 100;
     energyDistrPixelY_ = 86;
+
 
   }
@@ -218 +268 @@
 
 }
+*/

code/branches/hud/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__