+// $Id$
+//
+// SuperTux
+// Copyright (C) 2004 Tobias Glaesser <tobi.web@gmx.de>
//
-// C Implementation: texture
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
//
-// Description:
-//
-//
-// Author: Tobias Glaesser <tobi.web@gmx.de>, (C) 2004
-//
-// Copyright: See COPYING file that comes with this distribution
-//
-//
-
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+// 02111-1307, USA.
+
+#include <assert.h>
+#include <iostream>
#include "SDL.h"
#include "SDL_image.h"
+#include "texture.h"
#include "globals.h"
-#include "screen.h"
#include "setup.h"
-#include "texture.h"
-void (*texture_load) (texture_type* ptexture, const std::string& file, int use_alpha);
-void (*texture_load_part)(texture_type* ptexture, const std::string& file, int x, int y, int w, int h, int use_alpha);
-void (*texture_free) (texture_type* ptexture);
-void (*texture_draw) (texture_type* ptexture, float x, float y, int update);
-void (*texture_draw_bg) (texture_type* ptexture, int update);
-void (*texture_draw_part)(texture_type* ptexture, float sx, float sy, float x, float y, float w, float h, int update);
+Surface::Surfaces Surface::surfaces;
+
+SurfaceData::SurfaceData(SDL_Surface* temp, int use_alpha_)
+ : type(SURFACE), use_alpha(use_alpha_)
+{
+ // Copy the given surface and make sure that it is not stored in
+ // video memory
+ surface = SDL_CreateRGBSurface(temp->flags & (~SDL_HWSURFACE),
+ temp->w, temp->h,
+ temp->format->BitsPerPixel,
+ temp->format->Rmask,
+ temp->format->Gmask,
+ temp->format->Bmask,
+ temp->format->Amask);
+ SDL_SetAlpha(temp,0,0);
+ SDL_BlitSurface(temp, NULL, surface, NULL);
+}
+SurfaceData::SurfaceData(const std::string& file_, int use_alpha_)
+ : type(LOAD), file(file_), use_alpha(use_alpha_)
+{
+}
+
+SurfaceData::SurfaceData(const std::string& file_, int x_, int y_, int w_, int h_, int use_alpha_)
+ : type(LOAD_PART), file(file_), use_alpha(use_alpha_),
+ x(x_), y(y_), w(w_), h(h_)
+{
+}
-void texture_setup(void)
+SurfaceData::~SurfaceData()
{
-#ifdef NOOPENGL
- texture_load = texture_load_sdl;
- texture_load_part = texture_load_part_sdl;
- texture_free = texture_free_sdl;
- texture_draw = texture_draw_sdl;
- texture_draw_bg = texture_draw_bg_sdl;
- texture_draw_part = texture_draw_part_sdl;
-#else
+
+}
+
+SurfaceImpl*
+SurfaceData::create()
+{
+ if (use_gl)
+ return create_SurfaceOpenGL();
+ else
+ return create_SurfaceSDL();
+}
+
+SurfaceSDL*
+SurfaceData::create_SurfaceSDL()
+{
+ switch(type)
+ {
+ case LOAD:
+ return new SurfaceSDL(file, use_alpha);
+ case LOAD_PART:
+ return new SurfaceSDL(file, x, y, w, h, use_alpha);
+ case SURFACE:
+ return new SurfaceSDL(surface, use_alpha);
+ }
+ assert(0);
+}
+
+SurfaceOpenGL*
+SurfaceData::create_SurfaceOpenGL()
+{
+ switch(type)
+ {
+ case LOAD:
+ return new SurfaceOpenGL(file, use_alpha);
+ case LOAD_PART:
+ return new SurfaceOpenGL(file, x, y, w, h, use_alpha);
+ case SURFACE:
+ return new SurfaceOpenGL(surface, use_alpha);
+ }
+ assert(0);
+}
+
+
+/* Quick utility function for texture creation */
+static int power_of_two(int input)
+{
+ int value = 1;
+
+ while ( value < input ) {
+ value <<= 1;
+ }
+ return value;
+}
+
+Surface::Surface(SDL_Surface* surf, int use_alpha)
+ : data(surf, use_alpha), w(0), h(0)
+{
+ impl = data.create();
+ if (impl)
+ {
+ w = impl->w;
+ h = impl->h;
+ }
+ surfaces.push_back(this);
+}
+
+Surface::Surface(const std::string& file, int use_alpha)
+ : data(file, use_alpha), w(0), h(0)
+{
+ impl = data.create();
+ if (impl)
+ {
+ w = impl->w;
+ h = impl->h;
+ }
+ surfaces.push_back(this);
+}
+
+Surface::Surface(const std::string& file, int x, int y, int w, int h, int use_alpha)
+ : data(file, x, y, w, h, use_alpha), w(0), h(0)
+{
+ impl = data.create();
+ if (impl)
+ {
+ w = impl->w;
+ h = impl->h;
+ }
+ surfaces.push_back(this);
+}
+
+void
+Surface::reload()
+{
+ delete impl;
+ impl = data.create();
+ if (impl)
+ {
+ w = impl->w;
+ h = impl->h;
+ }
+}
+
+Surface::~Surface()
+{
+ surfaces.remove(this);
+ delete impl;
+}
+
+void
+Surface::reload_all()
+{
+ for(Surfaces::iterator i = surfaces.begin(); i != surfaces.end(); ++i)
+ {
+ (*i)->reload();
+ }
+}
+
+void
+Surface::draw(float x, float y, Uint8 alpha, bool update)
+{
+ if (impl)
+ {
+ if (impl->draw(x, y, alpha, update) == -2)
+ reload();
+ }
+}
+
+void
+Surface::draw_bg(Uint8 alpha, bool update)
+{
+ if (impl)
+ {
+ if (impl->draw_bg(alpha, update) == -2)
+ reload();
+ }
+}
+
+void
+Surface::draw_part(float sx, float sy, float x, float y, float w, float h, Uint8 alpha, bool update)
+{
+ if (impl)
+ {
+ if (impl->draw_part(sx, sy, x, y, w, h, alpha, update) == -2)
+ reload();
+ }
+}
+
+SDL_Surface*
+sdl_surface_part_from_file(const std::string& file, int x, int y, int w, int h, int use_alpha)
+{
+ SDL_Rect src;
+ SDL_Surface * sdl_surface;
+ SDL_Surface * temp;
+ SDL_Surface * conv;
+
+ temp = IMG_Load(file.c_str());
+
+ if (temp == NULL)
+ st_abort("Can't load", file);
+
+ /* Set source rectangle for conv: */
+
+ src.x = x;
+ src.y = y;
+ src.w = w;
+ src.h = h;
+
+ conv = SDL_CreateRGBSurface(temp->flags, 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);
+ if(use_alpha == IGNORE_ALPHA && !use_gl)
+ sdl_surface = SDL_DisplayFormat(conv);
+ else
+ sdl_surface = SDL_DisplayFormatAlpha(conv);
+
+ if (sdl_surface == NULL)
+ st_abort("Can't covert to display format", file);
+
+ if (use_alpha == IGNORE_ALPHA && !use_gl)
+ SDL_SetAlpha(sdl_surface, 0, 0);
+
+ SDL_FreeSurface(temp);
+ SDL_FreeSurface(conv);
+
+ return sdl_surface;
+}
+
+SDL_Surface*
+sdl_surface_from_file(const std::string& file, int use_alpha)
+{
+ SDL_Surface* sdl_surface;
+ SDL_Surface* temp;
+
+ temp = IMG_Load(file.c_str());
+
+ if (temp == NULL)
+ st_abort("Can't load", file);
+
+ if(use_alpha == IGNORE_ALPHA && !use_gl)
+ sdl_surface = SDL_DisplayFormat(temp);
+ else
+ sdl_surface = SDL_DisplayFormatAlpha(temp);
+
+ if (sdl_surface == NULL)
+ st_abort("Can't covert to display format", file);
+
+ if (use_alpha == IGNORE_ALPHA && !use_gl)
+ SDL_SetAlpha(sdl_surface, 0, 0);
+
+ SDL_FreeSurface(temp);
- if(use_gl)
+ return sdl_surface;
+}
+
+SDL_Surface*
+sdl_surface_from_sdl_surface(SDL_Surface* sdl_surf, int use_alpha)
+{
+ SDL_Surface* sdl_surface;
+ Uint32 saved_flags;
+ Uint8 saved_alpha;
+
+ /* Save the alpha blending attributes */
+ saved_flags = sdl_surf->flags&(SDL_SRCALPHA|SDL_RLEACCELOK);
+ saved_alpha = sdl_surf->format->alpha;
+ if ( (saved_flags & SDL_SRCALPHA)
+ == SDL_SRCALPHA )
{
- texture_load = texture_load_gl;
- texture_load_part = texture_load_part_gl;
- texture_free = texture_free_gl;
- texture_draw = texture_draw_gl;
- texture_draw_bg = texture_draw_bg_gl;
- texture_draw_part = texture_draw_part_gl;
+ SDL_SetAlpha(sdl_surf, 0, 0);
}
+
+ if(use_alpha == IGNORE_ALPHA && !use_gl)
+ sdl_surface = SDL_DisplayFormat(sdl_surf);
else
+ sdl_surface = SDL_DisplayFormatAlpha(sdl_surf);
+
+ /* Restore the alpha blending attributes */
+ if ( (saved_flags & SDL_SRCALPHA)
+ == SDL_SRCALPHA )
{
- texture_load = texture_load_sdl;
- texture_load_part = texture_load_part_sdl;
- texture_free = texture_free_sdl;
- texture_draw = texture_draw_sdl;
- texture_draw_bg = texture_draw_bg_sdl;
- texture_draw_part = texture_draw_part_sdl;
+ SDL_SetAlpha(sdl_surface, saved_flags, saved_alpha);
}
-#endif
+
+ if (sdl_surface == NULL)
+ st_abort("Can't covert to display format", "SURFACE");
+
+ if (use_alpha == IGNORE_ALPHA && !use_gl)
+ SDL_SetAlpha(sdl_surface, 0, 0);
+
+ return sdl_surface;
}
#ifndef NOOPENGL
-void texture_load_gl(texture_type* ptexture, const std::string& file, int use_alpha)
+SurfaceOpenGL::SurfaceOpenGL(SDL_Surface* surf, int use_alpha)
{
- texture_load_sdl(ptexture,file,use_alpha);
- texture_create_gl(ptexture->sdl_surface,&ptexture->gl_texture);
+ sdl_surface = sdl_surface_from_sdl_surface(surf, use_alpha);
+ create_gl(sdl_surface,&gl_texture);
+
+ w = sdl_surface->w;
+ h = sdl_surface->h;
}
-void texture_load_part_gl(texture_type* ptexture, const std::string& file, int x, int y, int w, int h, int use_alpha)
+SurfaceOpenGL::SurfaceOpenGL(const std::string& file, int use_alpha)
{
- texture_load_part_sdl(ptexture,file,x,y,w,h,use_alpha);
- texture_create_gl(ptexture->sdl_surface,&ptexture->gl_texture);
+ sdl_surface = sdl_surface_from_file(file, use_alpha);
+ create_gl(sdl_surface,&gl_texture);
+
+ w = sdl_surface->w;
+ h = sdl_surface->h;
}
-/* Quick utility function for texture creation */
-static int power_of_two(int input)
+SurfaceOpenGL::SurfaceOpenGL(const std::string& file, int x, int y, int w, int h, int use_alpha)
{
- int value = 1;
+ 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;
+}
- while ( value < input ) {
- value <<= 1;
- }
- return value;
+SurfaceOpenGL::~SurfaceOpenGL()
+{
+ SDL_FreeSurface(sdl_surface);
+ glDeleteTextures(1, &gl_texture);
}
-void texture_create_gl(SDL_Surface * surf, GLuint * tex)
+void
+SurfaceOpenGL::create_gl(SDL_Surface * surf, GLuint * tex)
{
Uint32 saved_flags;
Uint8 saved_alpha;
int w, h;
SDL_Surface *conv;
-
+
w = power_of_two(surf->w);
h = power_of_two(surf->h),
- conv = SDL_CreateRGBSurface(SDL_SWSURFACE, w, h, surf->format->BitsPerPixel,
+
#if SDL_BYTEORDER == SDL_BIG_ENDIAN
- 0xff000000, 0x00ff0000, 0x0000ff00, 0x000000ff);
+ conv = SDL_CreateRGBSurface(SDL_SWSURFACE, w, h, surf->format->BitsPerPixel,
+ 0xff000000, 0x00ff0000, 0x0000ff00, 0x000000ff);
#else
-
+ conv = SDL_CreateRGBSurface(SDL_SWSURFACE, w, h, surf->format->BitsPerPixel,
0x000000ff, 0x0000ff00, 0x00ff0000, 0xff000000);
#endif
SDL_FreeSurface(conv);
}
-void texture_free_gl(texture_type* ptexture)
-{
- SDL_FreeSurface(ptexture->sdl_surface);
- glDeleteTextures(1, &ptexture->gl_texture);
-}
-
-void texture_draw_gl(texture_type* ptexture, float x, float y, int update)
+int
+SurfaceOpenGL::draw(float x, float y, Uint8 alpha, bool update)
{
-float pw = power_of_two(ptexture->w);
-float ph = power_of_two(ptexture->h);
+ float pw = power_of_two(w);
+ float ph = power_of_two(h);
glEnable(GL_TEXTURE_2D);
glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
- glColor4ub(255, 255, 255,255);
+ glColor4ub(alpha, alpha, alpha, alpha);
- glBindTexture(GL_TEXTURE_2D, ptexture->gl_texture);
+ glBindTexture(GL_TEXTURE_2D, gl_texture);
glBegin(GL_QUADS);
glTexCoord2f(0, 0);
glVertex2f(x, y);
- glTexCoord2f((float)ptexture->w / pw, 0);
- glVertex2f((float)ptexture->w+x, y);
- glTexCoord2f((float)ptexture->w / pw, (float)ptexture->h / ph); glVertex2f((float)ptexture->w+x, (float)ptexture->h+y);
- glTexCoord2f(0, (float)ptexture->h / ph);
- glVertex2f(x, (float)ptexture->h+y);
+ glTexCoord2f((float)w / pw, 0);
+ glVertex2f((float)w+x, y);
+ glTexCoord2f((float)w / pw, (float)h / ph); glVertex2f((float)w+x, (float)h+y);
+ glTexCoord2f(0, (float)h / ph);
+ glVertex2f(x, (float)h+y);
glEnd();
glDisable(GL_TEXTURE_2D);
glDisable(GL_BLEND);
+
+ /* Avoid compiler warnings */
+ if(update)
+ {}
+
+ return 0;
}
-void texture_draw_bg_gl(texture_type* ptexture, int update)
+int
+SurfaceOpenGL::draw_bg(Uint8 alpha, bool update)
{
-float pw = power_of_two(ptexture->w);
-float ph = power_of_two(ptexture->h);
+ float pw = power_of_two(w);
+ float ph = power_of_two(h);
- glColor3ub(255, 255, 255);
+ glColor3ub(alpha, alpha, alpha);
glEnable(GL_TEXTURE_2D);
- glBindTexture(GL_TEXTURE_2D, ptexture->gl_texture);
+ glBindTexture(GL_TEXTURE_2D, gl_texture);
glBegin(GL_QUADS);
glTexCoord2f(0, 0);
glVertex2f(0, 0);
- glTexCoord2f((float)ptexture->w / pw, 0);
+ glTexCoord2f((float)w / pw, 0);
glVertex2f(screen->w, 0);
- glTexCoord2f((float)ptexture->w / pw, (float)ptexture->h / ph);
+ glTexCoord2f((float)w / pw, (float)h / ph);
glVertex2f(screen->w, screen->h);
- glTexCoord2f(0, (float)ptexture->h / ph);
+ glTexCoord2f(0, (float)h / ph);
glVertex2f(0, screen->h);
glEnd();
glDisable(GL_TEXTURE_2D);
+
+ /* Avoid compiler warnings */
+ if(update)
+ {}
+
+ return 0;
}
-void texture_draw_part_gl(texture_type* ptexture,float sx, float sy, float x, float y, float w, float h, int update)
+int
+SurfaceOpenGL::draw_part(float sx, float sy, float x, float y, float w, float h, Uint8 alpha, bool update)
{
-float pw = power_of_two(ptexture->w);
-float ph = power_of_two(ptexture->h);
+ float pw = power_of_two(int(this->w));
+ float ph = power_of_two(int(this->h));
- glBindTexture(GL_TEXTURE_2D, ptexture->gl_texture);
+ glBindTexture(GL_TEXTURE_2D, gl_texture);
glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
- glColor4ub(255, 255, 255,255);
+ glColor4ub(alpha, alpha, alpha, alpha);
glEnable(GL_TEXTURE_2D);
glDisable(GL_TEXTURE_2D);
glDisable(GL_BLEND);
+ /* Avoid compiler warnings */
+ if(update)
+ {}
+ return 0;
}
#endif
-void texture_load_sdl(texture_type* ptexture, const std::string& file, int use_alpha)
+SurfaceSDL::SurfaceSDL(SDL_Surface* surf, int use_alpha)
{
- SDL_Surface * temp;
-
- temp = IMG_Load(file.c_str());
-
- if (temp == NULL)
- st_abort("Can't load", file.c_str());
-
- if(use_alpha == IGNORE_ALPHA && !use_gl)
- ptexture->sdl_surface = SDL_DisplayFormat(temp);
- else
- ptexture->sdl_surface = SDL_DisplayFormatAlpha(temp);
-
- if (ptexture->sdl_surface == NULL)
- st_abort("Can't covert to display format", file.c_str());
-
- if (use_alpha == IGNORE_ALPHA && !use_gl)
- SDL_SetAlpha(ptexture->sdl_surface, 0, 0);
-
- SDL_FreeSurface(temp);
-
- ptexture->w = ptexture->sdl_surface->w;
- ptexture->h = ptexture->sdl_surface->h;
-
+ sdl_surface = sdl_surface_from_sdl_surface(surf, use_alpha);
+ w = sdl_surface->w;
+ h = sdl_surface->h;
}
-void texture_load_part_sdl(texture_type* ptexture, const std::string& file, int x, int y, int w, int h, int use_alpha)
+SurfaceSDL::SurfaceSDL(const std::string& file, int use_alpha)
{
-
- SDL_Rect src;
- SDL_Surface * temp;
- SDL_Surface * conv;
-
- temp = IMG_Load(file.c_str());
-
- if (temp == NULL)
- st_abort("Can't load", file.c_str());
-
- /* Set source rectangle for conv: */
-
- src.x = x;
- src.y = y;
- src.w = w;
- src.h = h;
-
- conv = SDL_CreateRGBSurface(temp->flags, 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);
- if(use_alpha == IGNORE_ALPHA && !use_gl)
- ptexture->sdl_surface = SDL_DisplayFormat(conv);
- else
- ptexture->sdl_surface = SDL_DisplayFormatAlpha(conv);
-
- if (ptexture->sdl_surface == NULL)
- st_abort("Can't covert to display format", file.c_str());
-
- if (use_alpha == IGNORE_ALPHA && !use_gl)
- SDL_SetAlpha(ptexture->sdl_surface, 0, 0);
-
- SDL_FreeSurface(temp);
- SDL_FreeSurface(conv);
-
- ptexture->w = ptexture->sdl_surface->w;
- ptexture->h = ptexture->sdl_surface->h;
+ sdl_surface = sdl_surface_from_file(file, use_alpha);
+ w = sdl_surface->w;
+ h = sdl_surface->h;
}
-void texture_from_sdl_surface(texture_type* ptexture, SDL_Surface* sdl_surf, int use_alpha)
+SurfaceSDL::SurfaceSDL(const std::string& file, int x, int y, int w, int h, int use_alpha)
{
- Uint32 saved_flags;
- Uint8 saved_alpha;
-
- /* Save the alpha blending attributes */
- saved_flags = sdl_surf->flags&(SDL_SRCALPHA|SDL_RLEACCELOK);
- saved_alpha = sdl_surf->format->alpha;
- if ( (saved_flags & SDL_SRCALPHA)
- == SDL_SRCALPHA )
- {
- SDL_SetAlpha(sdl_surf, 0, 0);
- }
-
- if(use_alpha == IGNORE_ALPHA && !use_gl)
- ptexture->sdl_surface = SDL_DisplayFormat(sdl_surf);
- else
- ptexture->sdl_surface = SDL_DisplayFormatAlpha(sdl_surf);
-
- /* Restore the alpha blending attributes */
- if ( (saved_flags & SDL_SRCALPHA)
- == SDL_SRCALPHA )
- {
- SDL_SetAlpha(ptexture->sdl_surface, saved_flags, saved_alpha);
- }
-
- if (ptexture->sdl_surface == NULL)
- st_abort("Can't covert to display format", "SURFACE");
-
- if (use_alpha == IGNORE_ALPHA && !use_gl)
- SDL_SetAlpha(ptexture->sdl_surface, 0, 0);
-
- ptexture->w = ptexture->sdl_surface->w;
- ptexture->h = ptexture->sdl_surface->h;
-
-#ifndef NOOPENGL
-
- if(use_gl)
- {
- texture_create_gl(ptexture->sdl_surface,&ptexture->gl_texture);
- }
-#endif
+ sdl_surface = sdl_surface_part_from_file(file, x, y, w, h, use_alpha);
+ w = sdl_surface->w;
+ h = sdl_surface->h;
}
-void texture_draw_sdl(texture_type* ptexture, float x, float y, int update)
+int
+SurfaceSDL::draw(float x, float y, Uint8 alpha, bool update)
{
-
SDL_Rect dest;
dest.x = (int)x;
dest.y = (int)y;
- dest.w = ptexture->w;
- dest.h = ptexture->h;
- SDL_BlitSurface(ptexture->sdl_surface, NULL, screen, &dest);
+ dest.w = w;
+ dest.h = h;
+
+ if(alpha != 255) /* SDL isn't capable of this kind of alpha :( therefore we'll leave now. */
+ return -1;
+
+ SDL_SetAlpha(sdl_surface ,SDL_SRCALPHA,alpha);
+ int ret = SDL_BlitSurface(sdl_surface, NULL, screen, &dest);
if (update == UPDATE)
SDL_UpdateRect(screen, dest.x, dest.y, dest.w, dest.h);
-}
+ return ret;
+}
-void texture_draw_bg_sdl(texture_type* ptexture, int update)
+int
+SurfaceSDL::draw_bg(Uint8 alpha, bool update)
{
SDL_Rect dest;
dest.y = 0;
dest.w = screen->w;
dest.h = screen->h;
+
+ if(alpha != 255)
+ SDL_SetAlpha(sdl_surface ,SDL_SRCALPHA,alpha);
- SDL_SoftStretch(ptexture->sdl_surface, NULL, screen, &dest);
+ int ret = SDL_SoftStretch(sdl_surface, NULL, screen, &dest);
if (update == UPDATE)
SDL_UpdateRect(screen, dest.x, dest.y, dest.w, dest.h);
+
+ return ret;
}
-void texture_draw_part_sdl(texture_type* ptexture, float sx, float sy, float x, float y, float w, float h, int update)
+int
+SurfaceSDL::draw_part(float sx, float sy, float x, float y, float w, float h, Uint8 alpha, bool update)
{
SDL_Rect src, dest;
dest.w = (int)w;
dest.h = (int)h;
-
- SDL_BlitSurface(ptexture->sdl_surface, &src, screen, &dest);
+ if(alpha != 255)
+ SDL_SetAlpha(sdl_surface ,SDL_SRCALPHA,alpha);
+
+ int ret = SDL_BlitSurface(sdl_surface, &src, screen, &dest);
if (update == UPDATE)
update_rect(screen, dest.x, dest.y, dest.w, dest.h);
+
+ return ret;
}
-void texture_free_sdl(texture_type* ptexture)
+SurfaceSDL::~SurfaceSDL()
{
- SDL_FreeSurface(ptexture->sdl_surface);
+ SDL_FreeSurface(sdl_surface);
}
+/* EOF */
projects / supertux.git / blobdiff