Changeset 1002 for code/branches

Timestamp:

Apr 8, 2008, 11:12:22 AM (17 years ago)

Author:

chaiy

Message:

BarFactory created, but doesn't work yet

Location:

code/branches/hud2/src/orxonox

Files:

• Orxonox.cc (modified) (1 diff)
• hud/Bar.cc (modified) (1 diff)
• hud/Bar.h (modified) (2 diffs)
• hud/Factories.h (added)
• hud/HUD.cc (modified) (3 diffs)

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

@@ -375 +375 @@
       // show the current time in the HUD
       //orxonoxHUD_->setTime((int)now, 0);
-      orxonoxHUD_->energyCounter->reset(20);
+//      orxonoxHUD_->energyCounter->reset(20);
 
 

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

@@ -26 +26 @@
 */
 
-#include "OrxonoxStableHeaders.h"
-
 #include <OgreOverlayManager.h>
 #include <OgreOverlayElement.h>
-#include <OgreTextAreaOverlayElement.h>
 #include <OgreStringConverter.h>
+#include <OgreColourValue.h>
 #include <string.h>
 
-#include "Bar.h"
+#include "BarV1.h"
 
 namespace orxonox
 {
   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(const String& name):Ogre::OverlayElement(name){}
+
+
+
+
+
+
+/*  Bar::Bar(const Ogre::String& s){}
   
   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_);  
+  */
+/*  void Bar::setPercentage(float percentage){
+    percentage_=percentage;
+    if(dir_){setWidth(int(percentage_* getWidth()));}
+        else {setHeight(int(percentage_ * getHeight()));}
     }
+
+
+  void Bar::setPercentage(float percentage){
+    percentage_ = percentage;
+//    setWidth(getWidth());
   }
 
-  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");
-    }
-  }
-
-  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(left, top, width, height, dir, Bar::YELLOW, name){
-  }
-
-  SmartBar::~SmartBar(void){}
 
 
-  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/hud2/src/orxonox/hud/Bar.h

@@ -30 +30 @@
 #define _BAR_H__
 
+#include <string>
+#include <OgreColourValue.h>
+#include <OgreOverlayElement.h>
+#include <OgrePrerequisites.h>
 #include <string.h>
-#include <OgreOverlayElement.h>
-#include <OgreTextAreaOverlayElement.h>
-#include <OgrePrerequisites.h>
 #include "../OrxonoxPrereqs.h"
 
@@ -40 +41 @@
 namespace orxonox
 {
-  class _OrxonoxExport Bar
+  class Bar : public Ogre::OverlayElement
   {
   private:
-    int percentage_;
-    int dir_;   
-    int left_;
-    int top_;
-    int width_;
-    int height_;
+    float percentage_;
+    bool dir_;
+    Ogre::ColourValue color_;
+        
         
   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();
-    
-  };
+    Bar(const Ogre::String& name);
+//    virtual ~Bar();
 
 
-  class _OrxonoxExport SmartBar : public Bar
-  {
-  private:
 
-  public:
-    SmartBar(Ogre::Real left, Ogre::Real top, Ogre::Real width, Ogre::Real height,
-        int dir, std::string name);
-    ~SmartBar(void);
-    void reset(int percentage);
-  };
+
+/*    Bar(const Ogre::String& s);
+    ~Bar(void);
+    void setPercentage(float percentage);
+    void setColor(Ogre::ColourValue color);
+*/  };
 }
 

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

@@ -35 +35 @@
 #include "HUD.h"
 #include "Bar.h"
-#include "TestElement.h"
+#include "Factories.h"
 // ugly hack
 #include "Orxonox.h"
@@ -52 +52 @@
     Ogre::OverlayManager& overlayManager = Ogre::OverlayManager::getSingleton();
 
-    energyCounter = new Bar(0,0,100,20,Bar::LEFT,Bar::YELLOW,"Orxonox/HUD/energyCounterPanel/energyCounter");
+//    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"));
@@ -62 +62 @@
     energyCounterPanel->setMetricsMode(Ogre::GMM_PIXELS);       
     energyCounterPanel->show();
-    energyCounterPanel->addChild(energyCounter->element);
-
-    TestOverlayElementFactory *factory = new TestOverlayElementFactory();
+//    energyCounterPanel->addChild(energyCounter->element);
+
+    BarOverlayElementFactory *factory = new BarOverlayElementFactory();
     overlayManager.addOverlayElementFactory(factory);
-    Ogre::OverlayElement* testElement = overlayManager.createOverlayElementFromFactory("Test", "testElement");
+    Ogre::OverlayElement* BarElement = overlayManager.createOverlayElementFromFactory("Bar", "BarElement");
+
+
+
+
 
     Ogre::Overlay* orxonoxOverlay = overlayManager.create("Orxonox/HUD");