Changeset 8035 in orxonox.OLD for trunk/src/lib/gui/gl_gui/glgui_image.h

Timestamp:

May 31, 2006, 4:20:51 PM (18 years ago)

Author:

bensch

Message:

gui: merged the gui back to the trunk

File:

• trunk/src/lib/gui/gl_gui/glgui_image.h (modified) (2 diffs)

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

@@ -8 +8 @@
 #define _GLGUI_IMAGE_H
 
-#include "base_object.h"
+#include "glgui_widget.h"
 
 // FORWARD DECLARATION
@@ -26 +26 @@
     virtual ~GLGuiImage();
 
-    void init();
-    void loadImageFromFile(const char* fileName);
+    void loadImageFromTexture(const Texture& texture);
+
+    void loadImageFromFile(const std::string& fileName);
     void loadImageFromSDLSurface(SDL_Surface* surface);
-    void loadImageFromDisplayList(GLuint displayList);
+    void loadImageFromDisplayList(GLuint texture);
 
-    virtual void draw();
+    virtual void draw() const;
+
+    DeclareSignal0(imageChanged);
 
   private:
+    void init();
+    virtual void resize();
 
+  private:
+    Texture       texture;
   };
 }