// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
+#include <config.h>
+
#include <cassert>
#include <iostream>
#include <algorithm>
#include "SDL.h"
#include "SDL_image.h"
-#include "../video/surface.h"
-#include "../app/globals.h"
-#include "../app/setup.h"
+#include "video/surface.h"
+#include "video/screen.h"
+#include "app/globals.h"
+#include "app/setup.h"
using namespace SuperTux;
Surface::Surfaces Surface::surfaces;
SurfaceData::SurfaceData(SDL_Surface* temp, bool use_alpha_)
- : type(SURFACE), surface(0), use_alpha(use_alpha_)
+ : type(SURFACE), surface(0), use_alpha(use_alpha_),
+ x(0), y(0), w(0), h(0)
{
// Copy the given surface and make sure that it is not stored in
// video memory
temp->format->Bmask,
temp->format->Amask);
if(!surface)
- st_abort("No memory left.", "");
+ Termination::abort("No memory left.", "");
SDL_SetAlpha(temp,0,0);
SDL_BlitSurface(temp, NULL, surface, NULL);
}
: type(LOAD), surface(0), file(file_), use_alpha(use_alpha_)
{}
-SurfaceData::SurfaceData(const std::string& file_, int x_, int y_, int w_, int h_, bool use_alpha_)
+SurfaceData::SurfaceData(const std::string& file_, int x_, int y_,
+ int w_, int h_, bool use_alpha_)
: type(LOAD_PART), surface(0), file(file_), use_alpha(use_alpha_),
x(x_), y(y_), w(w_), h(h_)
{}
-SurfaceData::SurfaceData(Color top_gradient_, Color bottom_gradient_, int w_, int h_)
+SurfaceData::SurfaceData(Color top_gradient_, Color bottom_gradient_,
+ int w_, int h_)
: type(GRADIENT), surface(0), use_alpha(false), w(w_), h(h_)
{
-top_gradient = top_gradient_;
-bottom_gradient = bottom_gradient_;
+ top_gradient = top_gradient_;
+ bottom_gradient = bottom_gradient_;
}
surfaces.push_back(this);
}
-Surface::Surface(const std::string& file, int x, int y, int w, int h, bool use_alpha)
- : data(file, x, y, w, h, use_alpha), w(0), h(0)
+Surface::Surface(const std::string& file, int x, int y, int w_, int h_, bool use_alpha)
+ : data(file, x, y, w_, h_, use_alpha), w(0), h(0)
{
impl = data.create();
if (impl)
}
Surface::Surface(Color top_background, Color bottom_background, int w_, int h_)
- : data(top_background, bottom_background, 0, 0), w(0), h(0)
+ : data(top_background, bottom_background, w_, h_), w(0), h(0)
{
- // FIXME: Gradient surfaces currently don't accept width/height
- // If nonzero values are passed to data.create(), supertux
- // crashes.
impl = data.create();
if (impl)
{
{
w = impl->w;
h = impl->h;
+ for(std::vector<SurfaceData::Filter>::iterator i =
+ data.applied_filters.begin(); i != data.applied_filters.end();
+ i++)
+ impl->apply_filter(i->type, i->color);
}
}
+void Surface::apply_filter(int filter, Color color)
+{
+ impl->apply_filter(filter, color);
+
+ SurfaceData::Filter apply_filter;
+ apply_filter.type = filter;
+ apply_filter.color = color;
+ data.applied_filters.push_back(apply_filter);
+}
+
Surface::~Surface()
{
#ifdef DEBUG
}
void
-Surface::resize(int w_, int h_)
+apply_filter_to_surface(SDL_Surface* surface, int filter, Color color)
{
- if (impl)
- {
- w = w_;
- h = h_;
- if (impl->resize(w_,h_) == -2)
- reload();
+ if(filter == HORIZONTAL_FLIP_FILTER) {
+ SDL_Surface* sur_copy = sdl_surface_from_sdl_surface(surface, true);
+ SDL_BlitSurface(surface, NULL, sur_copy, NULL);
+ SDL_SetAlpha(sur_copy,0,0);
+
+ SDL_Rect src, dst;
+ src.y = dst.y = 0;
+ src.w = dst.w = 1;
+ src.h = dst.h = sur_copy->h;
+ for(int x = 0; x < sur_copy->w; x++)
+ {
+ src.x = x; dst.x = sur_copy->w-1 - x;
+ SDL_BlitSurface(sur_copy, &src, surface, &dst);
+ }
+
+ SDL_FreeSurface(sur_copy);
+ } else if(filter == MASK_FILTER) {
+ SDL_Surface* sur_copy = sdl_surface_from_sdl_surface(surface, true);
+
+ Uint8 r,g,b,a;
+
+ SDL_LockSurface(sur_copy);
+ for(int x = 0; x < sur_copy->w; x++)
+ for(int y = 0; y < sur_copy->h; y++) {
+ SDL_GetRGBA(getpixel(sur_copy,x,y), sur_copy->format, &r,&g,&b,&a);
+ if(a != 0) {
+ putpixel(sur_copy, x,y, color.map_rgba(sur_copy));
+ }
+ }
+ SDL_UnlockSurface(sur_copy);
+
+ SDL_BlitSurface(sur_copy, NULL, surface, NULL);
+ SDL_FreeSurface(sur_copy);
}
}
temp = IMG_Load(file.c_str());
if (temp == NULL)
- st_abort("Can't load", file);
+ Termination::abort("Can't load", file);
/* Set source rectangle for conv: */
src.w = w;
src.h = h;
- conv = SDL_CreateRGBSurface(temp->flags, w, h, temp->format->BitsPerPixel,
+ conv = SDL_CreateRGBSurface(SDL_SWSURFACE, w, h, temp->format->BitsPerPixel,
temp->format->Rmask,
temp->format->Gmask,
temp->format->Bmask,
temp->format->Amask);
- /* #if SDL_BYTEORDER == SDL_BIG_ENDIAN
- 0xff000000, 0x00ff0000, 0x0000ff00, 0x000000ff);
- #else
-
- 0x000000ff, 0x0000ff00, 0x00ff0000, 0xff000000);
- #endif*/
-
SDL_SetAlpha(temp,0,0);
SDL_BlitSurface(temp, &src, conv, NULL);
sdl_surface = SDL_DisplayFormatAlpha(conv);
if (sdl_surface == NULL)
- st_abort("Can't covert to display format", file);
+ Termination::abort("Can't covert to display format", file);
if (use_alpha == false && !use_gl)
SDL_SetAlpha(sdl_surface, 0, 0);
temp = IMG_Load(file.c_str());
if (temp == NULL)
- st_abort("Can't load", file);
+ Termination::abort("Can't load", file);
if(use_alpha == false && !use_gl)
sdl_surface = SDL_DisplayFormat(temp);
sdl_surface = SDL_DisplayFormatAlpha(temp);
if (sdl_surface == NULL)
- st_abort("Can't covert to display format", file);
+ Termination::abort("Can't covert to display format", file);
if (use_alpha == false && !use_gl)
SDL_SetAlpha(sdl_surface, 0, 0);
SuperTux::sdl_surface_from_sdl_surface(SDL_Surface* sdl_surf, bool use_alpha)
{
SDL_Surface* sdl_surface;
+#if 0
Uint32 saved_flags;
Uint8 saved_alpha;
{
SDL_SetAlpha(sdl_surf, 0, 0);
}
+#endif
if(use_alpha == false && !use_gl)
sdl_surface = SDL_DisplayFormat(sdl_surf);
else
sdl_surface = SDL_DisplayFormatAlpha(sdl_surf);
+#if 0
/* Restore the alpha blending attributes */
if ( (saved_flags & SDL_SRCALPHA)
== SDL_SRCALPHA )
{
SDL_SetAlpha(sdl_surface, saved_flags, saved_alpha);
}
+#endif
if (sdl_surface == NULL)
- st_abort("Can't covert to display format", "SURFACE");
+ Termination::abort("Can't covert to display format", "SURFACE");
if (use_alpha == false && !use_gl)
SDL_SetAlpha(sdl_surface, 0, 0);
SDL_Surface*
sdl_surface_from_gradient(Color top, Color bottom, int w, int h)
{
- SDL_Surface* sdl_surface;
-
- sdl_surface = SDL_CreateRGBSurface(screen->flags, w, h,
+ SDL_Surface* sdl_surface
+ = SDL_CreateRGBSurface(SDL_SWSURFACE, w, h,
screen->format->BitsPerPixel, screen->format->Rmask,
- screen->format->Gmask, screen->format->Bmask, screen->format->Amask);
+ screen->format->Gmask, screen->format->Bmask, 0);
- if(sdl_surface == NULL)
- st_abort("Cannot create surface for the gradient", "SURFACE");
+ if(sdl_surface == 0)
+ Termination::abort("Cannot create surface for the gradient", "SURFACE");
- if(top == bottom)
- {
+ if(top == bottom) {
SDL_FillRect(sdl_surface, NULL, SDL_MapRGB(sdl_surface->format,
top.red, top.green, top.blue));
- }
- else
- {
+ } else {
float redstep = (float(bottom.red)-float(top.red)) / float(h);
float greenstep = (float(bottom.green)-float(top.green)) / float(h);
float bluestep = (float(bottom.blue) - float(top.blue)) / float(h);
rect.x = 0;
rect.w = w;
rect.h = 1;
- for(float y = 0; y < h; y++)
- {
+ for(float y = 0; y < h; y++) {
rect.y = (int)y;
SDL_FillRect(sdl_surface, &rect, SDL_MapRGB(sdl_surface->format,
- int(float(top.red) + redstep * y),
- int(float(top.green) + greenstep * y),
- int(float(top.blue) + bluestep * y)));
- }
+ int(float(top.red) + redstep * y),
+ int(float(top.green) + greenstep * y),
+ int(float(top.blue) + bluestep * y)));
}
+ }
return sdl_surface;
}
return sdl_surface;
}
-int SurfaceImpl::resize(int w_, int h_)
-{
- w = w_;
- h = h_;
- SDL_Rect dest;
- dest.x = 0;
- dest.y = 0;
- dest.w = w;
- dest.h = h;
- int ret = SDL_SoftStretch(sdl_surface, NULL,
- sdl_surface, &dest);
- return ret;
-}
-
#ifndef NOOPENGL
SurfaceOpenGL::SurfaceOpenGL(SDL_Surface* surf, bool use_alpha)
{
h = sdl_surface->h;
}
-SurfaceOpenGL::SurfaceOpenGL(const std::string& file_, int x_, int y_, int w_, int h_, bool use_alpha_)
+SurfaceOpenGL::SurfaceOpenGL(const std::string& file_, int x_, int y_,
+ int w_, int h_, bool use_alpha_)
{
sdl_surface = sdl_surface_part_from_file(file_,x_,y_,w_,h_,use_alpha_);
create_gl(sdl_surface, &gl_texture);
-
w = sdl_surface->w;
- h = sdl_surface->h;
+ h = sdl_surface->h;
}
-SurfaceOpenGL::SurfaceOpenGL(Color top_gradient, Color bottom_gradient, int w, int h)
+SurfaceOpenGL::SurfaceOpenGL(Color top_gradient, Color bottom_gradient,
+ int _w, int _h)
{
- sdl_surface = sdl_surface_from_gradient(top_gradient, bottom_gradient, w, h);
+ sdl_surface = sdl_surface_from_gradient(top_gradient, bottom_gradient,_w,_h);
create_gl(sdl_surface, &gl_texture);
-
w = sdl_surface->w;
- h = sdl_surface->h;
+ h = sdl_surface->h;
}
SurfaceOpenGL::~SurfaceOpenGL()
glBegin(GL_QUADS);
- if(effect & VERTICAL_FLIP)
+ if(effect & VERTICAL_FLIP & HORIZONTAL_FLIP)
+ {
+ glTexCoord2f(0, 0);
+ glVertex2f((float)w+x, (float)h+y);
+
+ glTexCoord2f((float)w / pw, 0);
+ glVertex2f(x, (float)h+y);
+
+ glTexCoord2f((float)w / pw, (float)h / ph);
+ glVertex2f(x, y);
+
+ glTexCoord2f(0, (float)h / ph);
+ glVertex2f((float)w+x, y);
+ }
+ else if(effect & VERTICAL_FLIP)
{
glTexCoord2f(0, 0);
glVertex2f(x, (float)h+y);
glTexCoord2f(0, (float)h / ph);
glVertex2f(x, y);
}
+ else if(effect & HORIZONTAL_FLIP)
+ {
+ glTexCoord2f(0, 0);
+ glVertex2f((float)w+x, y);
+
+ glTexCoord2f((float)w / pw, 0);
+ glVertex2f(x, y);
+
+ glTexCoord2f((float)w / pw, (float)h / ph);
+ glVertex2f(x, (float)h+y);
+
+ glTexCoord2f(0, (float)h / ph);
+ glVertex2f((float)w+x, (float)h+y);
+ }
else
{
glTexCoord2f(0, 0);
glBegin(GL_QUADS);
- if(effect & VERTICAL_FLIP)
+ if(effect & VERTICAL_FLIP & HORIZONTAL_FLIP)
+ {
+ glTexCoord2f(sx / pw, (float)(sy+h) / ph);
+ glVertex2f((float)w+x, (float)h+y);
+
+ glTexCoord2f((sx+w) / pw, (sy+h) / ph);
+ glVertex2f(x, (float)h+y);
+
+ glTexCoord2f((float)(sx + w) / pw, sy / ph);
+ glVertex2f(x, y);
+
+ glTexCoord2f(sx / pw, sy / ph);
+ glVertex2f((float)w+x, y);
+ }
+ else if(effect & VERTICAL_FLIP)
{
glTexCoord2f(sx / pw, sy / ph);
glVertex2f(x, y);
glTexCoord2f(sx / pw, (float)(sy+h) / ph);
glVertex2f(x, h+y);
}
+ else if(effect & HORIZONTAL_FLIP)
+ {
+ glTexCoord2f(sx / pw, sy / ph);
+ glVertex2f((float)w+x, y);
+
+ glTexCoord2f((float)(sx + w) / pw, sy / ph);
+ glVertex2f(x, y);
+
+ glTexCoord2f((sx+w) / pw, (sy+h) / ph);
+ glVertex2f(x, (float)h+y);
+
+ glTexCoord2f(sx / pw, (float)(sy+h) / ph);
+ glVertex2f((float)w+x, (float)h+y);
+ }
else
{
glTexCoord2f(sx / pw, (float)(sy+h) / ph);
return 0;
}
-#if 0
int
-SurfaceOpenGL::draw_stretched(float x, float y, int sw, int sh, Uint8 alpha)
+SurfaceOpenGL::draw_stretched(float x, float y, int sw, int sh, Uint8 alpha, Uint32 effect)
{
- float pw = power_of_two(int(this->w));
- float ph = power_of_two(int(this->h));
+ float pw = power_of_two(sw);
+ float ph = power_of_two(sh);
- glBindTexture(GL_TEXTURE_2D, gl_texture);
+ if(effect & SEMI_TRANSPARENT)
+ alpha = 128;
+ glEnable(GL_TEXTURE_2D);
glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
glColor4ub(alpha, alpha, alpha, alpha);
- glEnable(GL_TEXTURE_2D);
-
+ glBindTexture(GL_TEXTURE_2D, gl_texture);
glBegin(GL_QUADS);
- glTexCoord2f(0, 0);
- glVertex2f(x, y);
- glTexCoord2f((float)w / pw, 0);
- glVertex2f(sw+x, y);
- glTexCoord2f((float)w / pw, (float)h / ph); glVertex2f((float)sw+x, (float)sh+y);
- glVertex2f(sw +x, sh+y);
- glTexCoord2f(0, (float)h / ph);
- glVertex2f(x, sh+y);
+
+ if(effect & VERTICAL_FLIP & HORIZONTAL_FLIP)
+ {
+ glTexCoord2f(0, 0);
+ glVertex2f((float)sw+x, (float)sh+y);
+
+ glTexCoord2f((float)w / pw, 0);
+ glVertex2f(x, (float)sh+y);
+
+ glTexCoord2f((float)w / pw, (float)h / ph);
+ glVertex2f(x, y);
+
+ glTexCoord2f(0, (float)h / ph);
+ glVertex2f((float)sw+x, y);
+ }
+ else if(effect & VERTICAL_FLIP)
+ {
+ glTexCoord2f(0, 0);
+ glVertex2f(x, (float)sh+y);
+
+ glTexCoord2f((float)w / pw, 0);
+ glVertex2f((float)sw+x, (float)sh+y);
+
+ glTexCoord2f((float)w / pw, (float)h / ph);
+ glVertex2f((float)sw+x, y);
+
+ glTexCoord2f(0, (float)h / ph);
+ glVertex2f(x, y);
+ }
+ else if(effect & HORIZONTAL_FLIP)
+ {
+ glTexCoord2f(0, 0);
+ glVertex2f((float)sw+x, y);
+
+ glTexCoord2f((float)w / pw, 0);
+ glVertex2f(x, y);
+
+ glTexCoord2f((float)w / pw, (float)h / ph);
+ glVertex2f(x, (float)sh+y);
+
+ glTexCoord2f(0, (float)h / ph);
+ glVertex2f((float)sw+x, (float)sh+y);
+ }
+ else
+ {
+ glTexCoord2f(0, 0);
+ glVertex2f(x, y);
+
+ glTexCoord2f((float)w / pw, 0);
+ glVertex2f((float)sw+x, y);
+
+ glTexCoord2f((float)w / pw, (float)h / ph);
+ glVertex2f((float)sw+x, (float)sh+y);
+
+ glTexCoord2f(0, (float)h / ph);
+ glVertex2f(x, (float)sh+y);
+ }
glEnd();
glDisable(GL_TEXTURE_2D);
return 0;
}
-#endif
+
+void
+SurfaceOpenGL::apply_filter(int filter, Color color)
+{
+ ::apply_filter_to_surface(sdl_surface, filter, color);
+ create_gl(sdl_surface,&gl_texture);
+
+ w = sdl_surface->w;
+ h = sdl_surface->h;
+}
#endif
h = sdl_surface->h;
}
-SurfaceSDL::SurfaceSDL(const std::string& file, int x, int y, int w, int h, bool use_alpha)
+SurfaceSDL::SurfaceSDL(const std::string& file, int x, int y, int _w, int _h,
+ bool use_alpha)
{
- sdl_surface = sdl_surface_part_from_file(file, x, y, w, h, use_alpha);
+ sdl_surface = sdl_surface_part_from_file(file, x, y, _w, _h, use_alpha);
w = sdl_surface->w;
- h = sdl_surface->h;
+ h = sdl_surface->h;
}
-SurfaceSDL::SurfaceSDL(Color top_gradient, Color bottom_gradient, int w, int h)
+SurfaceSDL::SurfaceSDL(Color top_gradient, Color bottom_gradient,
+ int _w, int _h)
{
- sdl_surface = sdl_surface_from_gradient(top_gradient, bottom_gradient, w, h);
+ sdl_surface = sdl_surface_from_gradient(top_gradient, bottom_gradient,_w,_h);
w = sdl_surface->w;
- h = sdl_surface->h;
+ h = sdl_surface->h;
}
int
if(effect & SEMI_TRANSPARENT)
alpha = 128;
- if(effect & VERTICAL_FLIP) // FIXME: feel free to replace this hack
+ if(effect & VERTICAL_FLIP & HORIZONTAL_FLIP)
+ {
+ // FIXME: this hack is damn slow. Just keep it cause it isn't that used.
+ for(float sx = 0; sx < w; sx++)
+ for(float sy = 0; sy < h; sy++)
+ if(draw_part(sx, sy, x+(w-sx), y+(h-sy), 1, 1, alpha, NONE_EFFECT) == -2)
+ return -2;
+ return 0;
+ }
+ else if(effect & VERTICAL_FLIP) // FIXME: feel free to replace this hack
{
for(float sy = 0; sy < h; sy++)
if(draw_part(0, sy, x, y+(h-sy), w, 1, alpha, NONE_EFFECT) == -2)
return -2;
return 0;
}
+ else if(effect & HORIZONTAL_FLIP) // FIXME: feel free to replace this hack
+ {
+ for(float sx = 0; sx < w; sx++)
+ if(draw_part(sx, 0, x+(w-sx), y, 1, h, alpha, NONE_EFFECT) == -2)
+ return -2;
+ return 0;
+ }
if(alpha != 255)
{
if(effect & SEMI_TRANSPARENT)
alpha = 128;
- if(effect & VERTICAL_FLIP) // FIXME: feel free to replace this hack
+ if(effect & VERTICAL_FLIP & HORIZONTAL_FLIP)
+ {
+ // FIXME: this hack is damn slow. Just keep it cause it isn't that used.
+ for(float sx_ = 0; sx_ < w; sx++)
+ for(float sy_ = 0; sy_ < h; sy++)
+ if(draw_part(sx_, sy_, sx+(w-sx_), sy+(h-sy_), 1, 1, alpha, NONE_EFFECT) == -2)
+ return -2;
+ return 0;
+ }
+ else if(effect & VERTICAL_FLIP) // FIXME: feel free to replace this hack
{
for(float sy_ = sy; sy_ < h; sy_++)
if(draw_part(sx, sy_, x, y+(h-sy_), w, 1, alpha, NONE_EFFECT) == -2)
return -2;
return 0;
}
+ else if(effect & HORIZONTAL_FLIP) // FIXME: feel free to replace this hack
+ {
+ for(float sx_ = 0; sx_ < w; sx_++)
+ if(draw_part(sx_, 0, sx+(w-sx_), sy, 1, h, alpha, NONE_EFFECT) == -2)
+ return -2;
+ return 0;
+ }
if(alpha != 255)
{
/* Create a Surface, make it using colorkey, blit surface into temp, apply alpha
to temp sur, blit the temp into the screen */
/* Note: this has to be done, since SDL doesn't allow to set alpha to surfaces that
- already have an alpha mask yet... */
+ already have an alpha mask, yet... */
SDL_Surface* sdl_surface_copy = SDL_CreateRGBSurface (sdl_surface->flags,
- sdl_surface->w, sdl_surface->h, sdl_surface->format->BitsPerPixel,
+ (int)w, (int)h, sdl_surface->format->BitsPerPixel,
sdl_surface->format->Rmask, sdl_surface->format->Gmask,
sdl_surface->format->Bmask,
0);
SDL_SetColorKey(sdl_surface_copy, SDL_SRCCOLORKEY, colorkey);
- SDL_BlitSurface(sdl_surface, NULL, sdl_surface_copy, NULL);
+ SDL_BlitSurface(sdl_surface, &src, sdl_surface_copy, NULL);
SDL_SetAlpha(sdl_surface_copy ,SDL_SRCALPHA,alpha);
int ret = SDL_BlitSurface(sdl_surface_copy, NULL, screen, &dest);
return ret;
}
-#if 0
int
-SurfaceSDL::draw_stretched(float x, float y, int sw, int sh, Uint8 alpha, bool update)
+SurfaceSDL::draw_stretched(float x, float y, int sw, int sh, Uint8 alpha, Uint32 effect)
{
SDL_Rect dest;
dest.w = (int)sw;
dest.h = (int)sh;
- if(alpha != 255)
- SDL_SetAlpha(sdl_surface ,SDL_SRCALPHA,alpha);
-
+ if(effect & SEMI_TRANSPARENT)
+ alpha = 128;
SDL_Surface* sdl_surface_copy = SDL_CreateRGBSurface (sdl_surface->flags,
sw, sh, sdl_surface->format->BitsPerPixel,
SDL_BlitSurface(sdl_surface, NULL, sdl_surface_copy, NULL);
SDL_SoftStretch(sdl_surface_copy, NULL, sdl_surface_copy, &dest);
+ if(alpha != 255)
+ SDL_SetAlpha(sdl_surface_copy,SDL_SRCALPHA,alpha);
+
int ret = SDL_BlitSurface(sdl_surface_copy,NULL,screen,&dest);
SDL_FreeSurface(sdl_surface_copy);
- if (update == UPDATE)
- update_rect(screen, dest.x, dest.y, dest.w, dest.h);
-
return ret;
}
-#endif
+
+void
+SurfaceSDL::apply_filter(int filter, Color color)
+{
+ ::apply_filter_to_surface(sdl_surface, filter, color);
+
+ w = sdl_surface->w;
+ h = sdl_surface->h;
+}
SurfaceSDL::~SurfaceSDL()
{}
-/* EOF */
projects / supertux.git / blobdiff