diff options
| author | Alexander Sulfrian <alexander@sulfrian.net> | 2010-05-09 19:17:52 +0200 |
|---|---|---|
| committer | Alexander Sulfrian <alexander@sulfrian.net> | 2013-01-05 17:17:48 +0100 |
| commit | 1d595f048c9e59bbff14217e2fe3821ee3e1aaa1 (patch) | |
| tree | fe92fea4e73324bd3645afb52c681d103624b853 /src/menu/software_mouse_pointer.hpp | |
| parent | 3ca6e32a9ecaa8514b9a30711cec20cf80722c23 (diff) | |
| download | usdx-1d595f048c9e59bbff14217e2fe3821ee3e1aaa1.tar.gz usdx-1d595f048c9e59bbff14217e2fe3821ee3e1aaa1.tar.xz usdx-1d595f048c9e59bbff14217e2fe3821ee3e1aaa1.zip | |
changed from SDL rendering to OpenGL
draw, repaint methods do not have the SDL_Surface* parameter anymore
Diffstat (limited to 'src/menu/software_mouse_pointer.hpp')
| -rw-r--r-- | src/menu/software_mouse_pointer.hpp | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/src/menu/software_mouse_pointer.hpp b/src/menu/software_mouse_pointer.hpp index dad27543..3b29e50e 100644 --- a/src/menu/software_mouse_pointer.hpp +++ b/src/menu/software_mouse_pointer.hpp @@ -30,9 +30,11 @@ #include "drawable_control.hpp" #include "control.hpp" #include "event_manager.hpp" -#include "image.hpp" +#include "texture.hpp" #include <boost/signals2.hpp> +#include <boost/thread/mutex.hpp> +#include <GL/gl.h> namespace usdx { @@ -42,12 +44,19 @@ namespace usdx int x; int y; - Image* texture; + GLfloat vertices[12]; + GLubyte color[16]; + GLfloat texture[8]; + + Texture* texture_normal; + Texture* texture_pressed; boost::signals2::connection mouse_move_connection; + boost::mutex mutex; + protected: - void draw(SDL_Surface* display) const; + void draw(void); public: SoftwareMousePointer(Control* parent, EventManager* event_manager); |