Changeset 10230 in orxonox.OLD for branches/playability/src/world_entities/elements

Timestamp:

Jan 10, 2007, 7:16:00 PM (18 years ago)

Author:

muellmic

Message:

interface changes

Location:

branches/playability/src/world_entities/elements

Files:

• glgui_energywidgetvertical.cc (modified) (2 diffs)
• glgui_energywidgetvertical.h (modified) (1 diff)
• glgui_radar.cc (modified) (1 diff)

branches/playability/src/world_entities/elements/glgui_energywidgetvertical.cc

@@ -30 +30 @@
   GLGuiEnergyWidgetVertical::GLGuiEnergyWidgetVertical ()
   {
-    //   this->setClassID(CL_PROTO_ID, "GLGuiEnergyWidget");
-
-    //this->_bar.setSize2D(100, 30);
-    //this->_bar.setRelCoor2D(-10,0);
-    //this->_name.setRelCoor2D(20,0);
-    //this->_valueText.setRelCoor2D(,0);
-    this->setAbsDir2D(270);
-    //std::cout << "absAngle: " << int(this->getAbsDir2D()) << ", relAngle: " << int(this->getRelDir2D()) << '\n';
-    //this->setOrientation(OrxGui::Vertical);
-
-    //this->pack(&this->_name);
-    //this->pack(&this->_valueText);
-
-    this->_image.setParent2D(this);
-    this->_image.setBorderTop(0);
-    this->_image.setBorderLeft(0);
-    this->_image.setBorderRight(0);
-    this->_image.setBorderBottom(0);
-    this->_image.setWidgetSize(30,30);
-    this->_image.setForegroundColor(Color(1,1,1,0.6));
-    this->_image.setBackgroundColor(Color(1,1,1,0));
-    this->_image.setBackgroundTexture(Texture());
-    this->_image.loadImageFromFile("maps/evil-flower.png");
-    //this->_image.setRelCoor2D(borderLeft(), borderTop() + this->_bar.getSizeX2D());
-    this->_image.setRelCoor2D(0,0);
-    this->_image.setRelDir2D(90);
-    this->_image.setVisibility(true);
-
-    this->_valueText.setParent2D(this);
-    this->_valueText.setWidgetSize(100,20);
-    //this->_valueText.setRelCoor2D(borderLeft(), borderTop() + this->_bar.getSizeX2D());
-    this->_valueText.setRelCoor2D(0,0);
-    this->_valueText.setChangedTextColor(Color::white);
-
-    this->setBackgroundTexture(Texture());
-    this->setBackgroundColor(Color(1,1,1,0.5));
-    this->setBorderTop(10);
-    this->setBorderLeft(10);
-    this->setBorderRight(10);
-    this->setBorderBottom(10);
-    this->setWidgetSize(120,50);
-    this->setVisibility(true);
-    
-
-    //this->_name.setBackgroundTexture(Texture());
-    //this->_valueText.setBackgroundTexture("maps/gui_element_background_2.png");
-
-    this->_bar.setParent2D(&this->_valueText);
-    this->_bar.setBackgroundTexture(Texture());
-    this->_bar.setBackgroundColor(Color(0,0,0,0));
-    this->_bar.setForegroundTexture("maps/gui_element_background_faded.png");
-    this->_bar.setForegroundColor(Color(.5, .5, .5, 1));
-    this->_bar.setChangedValueColor(Color::black);
-    this->_bar.setBorderTop(0);
-    this->_bar.setBorderLeft(0);
-    this->_bar.setBorderRight(0);
-    this->_bar.setBorderBottom(0);
-    this->_bar.setWidgetSize(100,30);
-    //this->_bar.setRelCoor2D(borderLeft(), 0);
-    this->_bar.setRelCoor2D(0,0);
   }
 
@@ -132 +72 @@
   void GLGuiEnergyWidgetVertical::showing()
   {
+    this->setAbsDir2D(270);
+    this->setBackgroundTexture(Texture());
+    this->setBackgroundColor(Color(1,1,1,0));
+    this->setBorderTop(10);
+    this->setBorderLeft(10);
+    this->setBorderRight(10);
+    this->setBorderBottom(10);
+    this->setWidgetSize(120,50);
+
+    this->_bar.setParent2D(&this->_valueText);
+    this->_bar.setBackgroundTexture(Texture());
+    this->_bar.setBackgroundColor(Color(0,0,0,0));
+    this->_bar.setForegroundTexture("maps/gui_element_background_faded.png");
+    this->_bar.setForegroundColor(Color::green);
+    this->_bar.setChangedValueColor(Color(1,0,0,0.2));
+    this->_bar.setBorderTop(0);
+    this->_bar.setBorderLeft(0);
+    this->_bar.setBorderRight(0);
+    this->_bar.setBorderBottom(0);
+    this->_bar.setWidgetSize(100,30);
+    //this->_bar.setRelCoor2D(borderLeft(), 0);
+    this->_bar.setRelCoor2D(0,0);
+    this->_bar.show();
+  
+    this->_image.setParent2D(this);
+    this->_image.setBorderTop(0);
+    this->_image.setBorderLeft(0);
+    this->_image.setBorderRight(0);
+    this->_image.setBorderBottom(0);
+    this->_image.setWidgetSize(30,30);
+    this->_image.setForegroundColor(Color(1,1,1,0.6));
+    this->_image.setBackgroundColor(Color(1,1,1,0));
+    this->_image.setBackgroundTexture(Texture());
+    this->_image.loadImageFromFile("maps/evil-flower.png");
+    //this->_image.setRelCoor2D(borderLeft(), borderTop() + this->_bar.getSizeX2D());
+    this->_image.setRelCoor2D(0,0);
+    this->_image.setRelDir2D(90);
+    this->_image.setVisibility(true);
     this->_image.show();
+
+    this->_valueText.setParent2D(this);
+    this->_valueText.setWidgetSize(100,20);
+    //this->_valueText.setRelCoor2D(borderLeft(), borderTop() + this->_bar.getSizeX2D());
+    this->_valueText.setRelCoor2D(0,0);
+    this->_valueText.setChangedTextColor(Color::black);
     this->_valueText.show();
-    this->_bar.show();
-    //this->show();
   }
 

branches/playability/src/world_entities/elements/glgui_energywidgetvertical.h

@@ -27 +27 @@
     void setDisplayedImage(const std::string& imageName);
 
-    inline GLGuiWidget* getImageWidget() {return &this->_image;};
-    inline GLGuiWidget* getValueWidget() {return &this->_valueText;};
-    inline GLGuiWidget* getBarWidget() {return &this->_bar;};
+    inline GLGuiImage* getImageWidget() {return &this->_image;};
+    inline GLGuiText* getValueWidget() {return &this->_valueText;};
+    inline GLGuiBar* getBarWidget() {return &this->_bar;};
 
   protected:

branches/playability/src/world_entities/elements/glgui_radar.cc

@@ -122 +122 @@
           this->_dotLists[i].positions.push_back(Vector2D(((*it)->getAbsCoor().x - _centerNode->getAbsCoor().x) * this->getSizeX2D() ,
                                                  ((*it)->getAbsCoor().z - _centerNode->getAbsCoor().z) * this->getSizeY2D()  )
-                                                 / (2.0f * _range));
+                                                 / (3.0f * _range));
         }