Changeset 8010 in orxonox.OLD for branches/gui/src/lib

Timestamp:

May 31, 2006, 2:03:21 AM (19 years ago)

Author:

bensch

Message:

gui: HOLY COW… The magical texture-viewer is here

Location:

branches/gui/src/lib/gui/gl_gui

Files:

• glgui_image.cc (modified) (3 diffs)
• glgui_text.h (modified) (1 diff)

branches/gui/src/lib/gui/gl_gui/glgui_image.cc

@@ -54 +54 @@
   void GLGuiImage::loadImageFromTexture(const Texture& texture)
   {
-    this->texture = texture;
+    this->frontMaterial().setDiffuseMap(texture);
+    this->frontMaterial().setDiffuse(1,1,1);
   }
 
@@ -74 +75 @@
   void GLGuiImage::resize()
   {
-    this->frontRect().setTopLeft(1, 1);
-    this->frontRect().setSize(this->getSizeX2D() -2, this->getSizeY2D() -2);
+    this->frontRect().setTopLeft(this->borderSize(), this->borderSize());
+    this->frontRect().setSize(this->getSizeX2D() -2.0*this->borderSize(), this->getSizeY2D() - 2.0* this->borderSize() );
     GLGuiWidget::resize();
   }
@@ -91 +92 @@
     this->drawRect(this->frontRect());
     this->endDraw();
-
-
   }
 }

branches/gui/src/lib/gui/gl_gui/glgui_text.h

@@ -26 +26 @@
     virtual ~GLGuiText();
 
+    void setText();
+
+    virtual void draw();
+
+  private:
     void init();
 
-    virtual void draw();
 
   private: