X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=lib%2Fvideo%2Fsurface.h;h=ad327e9b151e3f192a3bd70ab1d24ed304b938d5;hb=aaf0b7f4b4b2a0fd4e7def4825b013ad9827b197;hp=ea9e694964eb0220ac670b641f5865aa7fbee278;hpb=edaacb3651cf0560314dd008d7243be4b3b2f8c6;p=supertux.git diff --git a/lib/video/surface.h b/lib/video/surface.h index ea9e69496..ad327e9b1 100644 --- a/lib/video/surface.h +++ b/lib/video/surface.h @@ -30,8 +30,8 @@ #include "SDL.h" -#include "math/vector.h" -#include "video/screen.h" +#include "../math/vector.h" +#include "../video/screen.h" namespace SuperTux { @@ -50,8 +50,10 @@ namespace SuperTux NONE_EFFECT = 0x0000, /** Draw the Surface upside down */ VERTICAL_FLIP = 0x0001, + /** Draw the Surface from left to down */ + HORIZONTAL_FLIP = 0x0002, /** Draw the Surface with alpha equal to 128 */ - SEMI_TRANSPARENT = 0x0002 + SEMI_TRANSPARENT = 0x0004 }; /** This class holds all the data necessary to construct a surface */ @@ -129,10 +131,8 @@ namespace SuperTux /** Return 0 on success, -2 if surface needs to be reloaded */ virtual int draw(float x, float y, Uint8 alpha, Uint32 effect = NONE_EFFECT) = 0; virtual int draw_part(float sx, float sy, float x, float y, float w, float h, Uint8 alpha, Uint32 effect = NONE_EFFECT) = 0; -#if 0 + virtual int draw_stretched(float x, float y, int w, int h, Uint8 alpha, Uint32 effect = NONE_EFFECT) = 0; - virtual int draw_stretched(float x, float y, int w, int h, Uint8 alpha, bool update) = 0; -#endif int resize(int w_, int h_); @@ -150,10 +150,7 @@ namespace SuperTux int draw(float x, float y, Uint8 alpha, Uint32 effect = NONE_EFFECT); int draw_part(float sx, float sy, float x, float y, float w, float h, Uint8 alpha, Uint32 effect = NONE_EFFECT); -#if 0 - - int draw_stretched(float x, float y, int w, int h, Uint8 alpha); -#endif + int draw_stretched(float x, float y, int w, int h, Uint8 alpha, Uint32 effect = NONE_EFFECT); }; #ifndef NOOPENGL @@ -172,10 +169,8 @@ namespace SuperTux int draw(float x, float y, Uint8 alpha, Uint32 effect = NONE_EFFECT); int draw_part(float sx, float sy, float x, float y, float w, float h, Uint8 alpha, Uint32 effect = NONE_EFFECT); -#if 0 + int draw_stretched(float x, float y, int w, int h, Uint8 alpha, Uint32 effect = NONE_EFFECT); - int draw_stretched(float x, float y, int w, int h, Uint8 alpha); -#endif private: void create_gl(SDL_Surface * surf, GLuint * tex);