Changeset 10301 in orxonox.OLD

Timestamp:

Jan 23, 2007, 3:20:26 PM (17 years ago)

Author:

rennerc

Message:

fixed crash on esc bug

Location:

branches/playability/src/world_entities/elements

Files:

• glgui_energywidgetvertical.cc (modified) (7 diffs)
• glgui_energywidgetvertical.h (modified) (2 diffs)

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

@@ -30 +30 @@
   GLGuiEnergyWidgetVertical::GLGuiEnergyWidgetVertical ()
   {
+    this->_bar = new GLGuiBar();
+    this->_valueText = new GLGuiText();
+    this->_image = new GLGuiImage();
 
     this->setAbsDir2D(270);
@@ -40 +43 @@
     this->setWidgetSize(120,50);
 
-    this->_bar.setParent2D(this);
-    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->setParent2D(this);
+    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->setRelCoor2D(0,0);
 
-    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->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->setRelCoor2D(0,0);
+    this->_image->setRelDir2D(90);
+    this->_image->setVisibility(true);
 
-    this->_valueText.setParent2D(&this->_bar);
-    this->_valueText.setWidgetSize(100,20);
+
+    this->_valueText->setParent2D(this->_bar);
+    this->_valueText->setWidgetSize(100,20);
     //this->_valueText.setRelCoor2D(borderLeft(), borderTop() + this->_bar.getSizeX2D());
-    this->_valueText.setAbsCoor2D(-15,-20);
-    this->_valueText.setChangedTextColor(Color::white);
-    this->_valueText.setForegroundColor(Color::white);
-    this->_valueText.setBackgroundTexture(Texture());
-    this->_valueText.setBackgroundColor(Color(0,0,0,0));
+    this->_valueText->setAbsCoor2D(-15,-20);
+    this->_valueText->setChangedTextColor(Color::white);
+    this->_valueText->setForegroundColor(Color::white);
+    this->_valueText->setBackgroundTexture(Texture());
+    this->_valueText->setBackgroundColor(Color(0,0,0,0));
   }
 
@@ -85 +89 @@
   GLGuiEnergyWidgetVertical::~GLGuiEnergyWidgetVertical ()
   {
+    if ( this->_valueText )
+    {
+      delete this->_valueText;
+      this->_valueText = NULL;
+    }
+    
+    if ( this->_image )
+    {
+      delete this->_image;
+      this->_image = NULL;
+    }
   }
 
   void GLGuiEnergyWidgetVertical::setMaximum(float max)
   {
-    this->_bar.setMaximum(max);
+    this->_bar->setMaximum(max);
   }
 
@@ -99 +114 @@
 
 
-    this->_bar.setValue(value);
-    this->_bar.setForegroundColor(Color::slerpHSVColor(Color::red, Color::green, value/this->_bar.maximum()));
+    this->_bar->setValue(value);
+    this->_bar->setForegroundColor(Color::slerpHSVColor(Color::red, Color::green, value/this->_bar->maximum()));
     //this->_bar.setFrontColor(Color(1,1,1,1), true);
-    this->_valueText.setText(val.getString());
+    this->_valueText->setText(val.getString());
     //this->_valueText.setText("asdfas");
   }
@@ -108 +123 @@
   void GLGuiEnergyWidgetVertical::setDisplayedImage(const std::string& imageName)
   {
-    this->_image.loadImageFromFile(imageName);
+    this->_image->loadImageFromFile(imageName);
   }
 
@@ -120 +135 @@
     this->setBorderRight(widgetSize.x * 0.2);
     
-    this->_bar.setWidgetSize(widgetSize.x * 0.8, widgetSize.y * 0.6);
-    this->_image.setWidgetSize(widgetSize.y * 0.6, widgetSize.y * 0.6);
-    this->_valueText.setWidgetSize(widgetSize.x* 0.8, widgetSize.y * 0.4);
+    this->_bar->setWidgetSize(widgetSize.x * 0.8, widgetSize.y * 0.6);
+    this->_image->setWidgetSize(widgetSize.y * 0.6, widgetSize.y * 0.6);
+    this->_valueText->setWidgetSize(widgetSize.x* 0.8, widgetSize.y * 0.4);
   }
 
@@ -129 +144 @@
   {
    
-    this->_bar.show();
-    this->_image.show();
-    this->_valueText.show();
+    this->_bar->show();
+    this->_image->show();
+    this->_valueText->show();
   }
 
   void GLGuiEnergyWidgetVertical::hiding()
   {
-    this->_image.hide();
-    this->_valueText.hide();
-    this->_bar.hide();
+    this->_image->hide();
+    this->_valueText->hide();
+    this->_bar->hide();
   }
 }

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

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