Changeset 8448 in orxonox.OLD for trunk/src/lib/gui/gl/glgui_image.h

Timestamp:

Jun 15, 2006, 12:48:26 PM (18 years ago)

Author:

bensch

Message:

merged gui back to the trunk
merged with command
merge -r8377:HEAD ​https://svn.orxonox.net/orxonox/branches/gui .

File:

• trunk/src/lib/gui/gl/glgui_image.h (modified) (1 diff)

trunk/src/lib/gui/gl/glgui_image.h

@@ -36 +36 @@
     DeclareSignal0(imageChanged);
 
+  protected:
+    virtual void updateFrontColor();
+    virtual void resize();
+
+
   private:
     void init();
-    virtual void resize();
 
   private:
-    Texture       texture;
+    Rect2D        _imagePlane;
+    Material      _imageMaterial;
   };
 }