Changeset 10194 in orxonox.OLD for branches/playability/src/world_entities

Timestamp:

Jan 8, 2007, 9:19:39 PM (18 years ago)

Author:

muellmic

Message:

implementing interface 'by hand' without still buggy packing-function. can't test with spaceship because of segfault

Location:

branches/playability/src/world_entities

Files:

• elements/glgui_energywidgetvertical.cc (modified) (7 diffs)
• elements/glgui_energywidgetvertical.h (modified) (4 diffs)
• space_ships/space_ship.cc (modified) (3 diffs)
• world_entity.cc (modified) (1 diff)

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

@@ -19 +19 @@
 
 #include "multi_type.h"
+#include <iostream>
+#include "math.h"
 
 namespace OrxGui
@@ -33 +35 @@
     //this->_name.setRelCoor2D(20,0);
     //this->_valueText.setRelCoor2D(,0);
-    this->shiftDir2D(270);
-    this->setOrientation(OrxGui::Horizontal);
-    this->pack(&this->_name);
-    this->pack(&this->_valueText);
-    this->_bar.setParent2D(&this->_valueText);
+    this->setAbsDir2D(270);
+    //std::cout << "absAngle: " << int(this->getAbsDir2D()) << ", relAngle: " << int(this->getRelDir2D()) << '\n';
+    //this->setOrientation(OrxGui::Vertical);
 
-    this->_name.setForegroundColor(Color(1,1,1,.8));
+    //this->pack(&this->_name);
+    //this->pack(&this->_valueText);
+
+    this->_image.setParent2D(this);
+    this->_image.setSize2D(20,20);
+    this->_image.setBackgroundColor(Color(1,1,1,.8));
+    this->_image.setBackgroundTexture("maps/TE2.png");
+    this->_image.setRelCoor2D(borderLeft(), borderTop() + this->_bar.getSizeX2D());
+
+    this->_valueText.setParent2D(this);
+    this->_valueText.setSize2D(100,20);
+    this->_valueText.setRelCoor2D(borderLeft(), borderTop() + this->_bar.getSizeX2D());
     this->_valueText.setChangedTextColor(Color::white);
-    this->_bar.setBackgroundTexture(Texture());
 
     this->setBackgroundTexture(Texture());
-    this->setBackgroundColor(Color(.5,.5,.5,0.5));
+    this->setBackgroundColor(Color(.5,.5,.5,0));
+    this->setSize2D(120,20);
 
     //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));
@@ -53 +66 @@
     this->_bar.setForegroundColor(Color(.5, .5, .5, 1));
     this->_bar.setChangedValueColor(Color::black);
+    this->_bar.setSize2D(100,20);
+    this->_bar.setRelCoor2D(borderLeft(), 0);
   }
 
@@ -61 +76 @@
   GLGuiEnergyWidgetVertical::~GLGuiEnergyWidgetVertical ()
   {
-  }
-
-
-  void GLGuiEnergyWidgetVertical::setDisplayedName(const std::string& name)
-  {
-    this->_name.setText(name);
-    this->_bar.setWidgetSize(this->_name.getSize2D());
   }
 
@@ -85 +93 @@
     this->_bar.setFrontColor(Color(1,1,1,1), true);
     this->_valueText.setText(val.getString());
+    //this->_valueText.setText("asdfas");
   }
 
   void GLGuiEnergyWidgetVertical::resize()
   {
-    GLGuiBox::resize();
+    //GLGuiBox::resize();
   }
 
@@ -95 +104 @@
   void GLGuiEnergyWidgetVertical::showing()
   {
-    this->_name.show();
+    this->_image.show();
     this->_valueText.show();
     this->_bar.show();
@@ -102 +111 @@
   void GLGuiEnergyWidgetVertical::hiding()
   {
-    this->_name.hide();
+    this->_image.hide();
     this->_valueText.hide();
     this->_bar.hide();

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

@@ -10 +10 @@
 #include "glgui_bar.h"
 #include "glgui_text.h"
+#include "glgui_widget.h"
 
 namespace OrxGui
@@ -15 +16 @@
 
   //! A class for ...
-  class GLGuiEnergyWidgetVertical : public GLGuiBox
+  class GLGuiEnergyWidgetVertical : public GLGuiWidget
   {
 
@@ -22 +23 @@
     virtual ~GLGuiEnergyWidgetVertical();
 
-    void setDisplayedName(const std::string& name);
     void setMaximum(float max);
     void setValue(float value);
 
-    inline GLGuiWidget* getNameWidget() {return &this->_name;};
+    inline GLGuiWidget* getImageWidget() {return &this->_image;};
     inline GLGuiWidget* getValueWidget() {return &this->_valueText;};
     inline GLGuiWidget* getBarWidget() {return &this->_bar;};
@@ -36 +36 @@
 
   private:
-    GLGuiText               _name;
+    GLGuiWidget             _image;
     GLGuiText               _valueText;
     GLGuiBar                _bar;

branches/playability/src/world_entities/space_ships/space_ship.cc

@@ -416 +416 @@
   this->secWeaponMan.showCrosshair();
   this->toList( OM_GROUP_01 );
-  dynamic_cast <OrxGui::GLGuiEnergyWidgetVertical*> (State::getPlayer()->hud().getArmorWidget())->setDisplayedName("Armor");
+  //dynamic_cast <OrxGui::GLGuiEnergyWidgetVertical*> (State::getPlayer()->hud().getArmorWidget())->setDisplayedName("Armor");
   //dynamic_cast<Element2D*>(this->secWeaponMan.getFixedTarget())->setVisibility( true);
   //this->attachCamera();
@@ -1047 +1047 @@
   { //create the widget
     this->electronicWidget = new OrxGui::GLGuiEnergyWidgetVertical();
-    this->electronicWidget->setDisplayedName("Electronics:");
+    //this->electronicWidget->setDisplayedName("Electronics:");
     //this->electronicWidget->setSize2D(100,20);
     //this->electronicWidget->setAbsCoor2D(150,200);
@@ -1066 +1066 @@
   {
     this->shieldWidget = new OrxGui::GLGuiEnergyWidgetVertical();
-    this->shieldWidget->setDisplayedName("Shield:");
+    //this->shieldWidget->setDisplayedName("Shield:");
     //his->shieldWidget->setSize2D(100,20);
     //this->shieldWidget->setAbsCoor2D(200,200);

branches/playability/src/world_entities/world_entity.cc

@@ -752 +752 @@
   {
     this->healthWidget = new OrxGui::GLGuiEnergyWidgetVertical();
-    this->healthWidget->setDisplayedName("Health");
+    //this->healthWidget->setDisplayedName("Health");
     //this->healthWidget->setSize2D(100,20);
     //this->healthWidget->setAbsCoor2D(100,200);