Changeset 5421 in orxonox.OLD for trunk/src

Timestamp:

Oct 22, 2005, 2:23:55 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: GUI-Element visible

Location:

trunk/src/lib

Files:

• graphics/graphics_engine.cc (modified) (3 diffs)
• graphics/text_engine/font.h (modified) (1 diff)
• graphics/text_engine/text.h (modified) (1 diff)
• gui/gl_gui/glgui_button.cc (modified) (1 diff)
• gui/gl_gui/glgui_button.h (modified) (1 diff)
• gui/gl_gui/glgui_pushbutton.cc (modified) (2 diffs)

trunk/src/lib/graphics/graphics_engine.cc

@@ -566 +566 @@
     this->geTextCFPS->setName("curFPS");
     this->geTextCFPS->setAlignment(TEXT_ALIGN_LEFT);
-    this->geTextCFPS->setAbsCoor2D(5, 15);
+    this->geTextCFPS->setAbsCoor2D(5, 0);
   }
   if (this->geTextMaxFPS == NULL)
@@ -573 +573 @@
     this->geTextMaxFPS->setName("MaxFPS");
     this->geTextMaxFPS->setAlignment(TEXT_ALIGN_LEFT);
-    this->geTextMaxFPS->setAbsCoor2D(5, 40);
+    this->geTextMaxFPS->setAbsCoor2D(5, 20);
   }
   if (this->geTextMinFPS == NULL)
@@ -580 +580 @@
     this->geTextMinFPS->setName("MinFPS");
     this->geTextMinFPS->setAlignment(TEXT_ALIGN_LEFT);
-    this->geTextMinFPS->setAbsCoor2D(5, 65);
+    this->geTextMinFPS->setAbsCoor2D(5, 40);
   }
 }

trunk/src/lib/graphics/text_engine/font.h

@@ -76 +76 @@
     inline GLuint getFastTextureID() const { return this->fastTextureID; };
     /** @returns the default Font */
-    inline static Font* getDefaultFont() { return Font::defaultFont; };
+    inline static Font* getDefaultFont() { if (Font::defaultFont == NULL) initDefaultFont(); return Font::defaultFont; };
 
     void createAsciiImage(const char* fileName);

trunk/src/lib/graphics/text_engine/text.h

@@ -18 +18 @@
 #define  TEXT_DEFAULT_BLENDING       1.0f                       //!< the default blending of the text, (no blending at all)
 
-#define TEXT_DEFAULT_ALIGNMENT       TEXT_ALIGN_CENTER          //!< default alignment
-#define TEXT_DEFAULT_SIZE            20                         //!< default size of the Text
+#define  TEXT_DEFAULT_ALIGNMENT      TEXT_ALIGN_LEFT            //!< default alignment
+#define  TEXT_DEFAULT_SIZE           20                         //!< default size of the Text
 
 

trunk/src/lib/gui/gl_gui/glgui_button.cc

@@ -57 +57 @@
 {
   this->label->setText(label);
+  this->label->setRelCoor2D(5, 5);
+  this->setSize2D(this->label->getSizeX2D()+10, this->label->getSizeY2D()+10);
 }
 

trunk/src/lib/gui/gl_gui/glgui_button.h

@@ -43 +43 @@
 
   private:
-
     GLGui_ButtonState    state;
 };

trunk/src/lib/gui/gl_gui/glgui_pushbutton.cc

@@ -50 +50 @@
   this->backMat = new Material();
   this->backMat->setDiffuse(0, 0, 0);
-
-  this->setSize2D(label->getSizeX2D()+10, label->getSizeY2D()+10);
 }
 
@@ -82 +80 @@
 {
 
+
 }