3 # Copyright (C) 2006 Christoph Sommer <christoph.sommer@2006.expires.deltadevelopment.de>
5 # This program is free software; you can redistribute it and/or
6 # modify it under the terms of the GNU General Public License
7 # as published by the Free Software Foundation; either version 2
8 # of the License, or (at your option) any later version.
10 # This program is distributed in the hope that it will be useful,
11 # but WITHOUT ANY WARRANTY; without even the implied warranty of
12 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13 # GNU General Public License for more details.
15 # You should have received a copy of the GNU General Public License
16 # along with this program; if not, write to the Free Software
17 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
19 # -----------------------------------------------------------------------------
21 # This patch allows running the game on systems without OpenGL support.
23 # It modifies the video portion of the SuperTux engine to render all graphics
24 # with SDL functions only. Many features are removed from the video engine,
25 # so don't expect much.
27 # Note that the patched sources will need an additional library, SDL_gfx, to
30 # Installing the patch should be pretty straightforward. Simply run the
31 # following command prior to running autogen.sh and configure:
33 # patch -p1 < contrib/supertux-nogl.diff
35 # This patch works for revision 4099. It may break for later revisions.
37 # -----------------------------------------------------------------------------
38 diff -Naur supertux/INSTALL supertux-nogl/INSTALL
39 --- supertux/INSTALL 2006-03-03 21:49:07.000000000 +0100
40 +++ supertux-nogl/INSTALL 2006-04-07 04:13:00.000000000 +0200
42 - Install instructions for SuperTux -
43 http://supertux.berlios.de/
45 -Last update: October 11, 2005 by Ondra Hosek
46 +Last update: March 4, 2006 by Christoph Sommer
51 Download: ftp://ftp.perforce.com/pub/jam
52 Homepage: http://www.perforce.com/jam/jam.html
54 -* OpenGL headers and libraries
55 - opengl libraries and headers are specific to your graphics card. Make sure
56 - that you have hardware accelerated opengl drivers installed. Software
57 - renderers like Mesa will make supertux unplayable slow.
59 * SDL 1.2.5 or later (1.2.8 is recommended on MacOS/X)
62 * SDL_image (any version)
63 http://www.libsdl.org/projects/SDL_image
65 +* SDL_gfx (2.0.13 or later)
66 + http://www.ferzkopp.net/Software/SDL_gfx-2.0/
68 * PhysicsFS (1.0.0, the development branch 1.1.x is buggy and does not work,
69 1.2.0 and later should work when it is released)
70 http://www.icculus.org/physfs
71 diff -Naur supertux/README supertux-nogl/README
72 --- supertux/README 2006-03-03 20:43:38.000000000 +0100
73 +++ supertux-nogl/README 2006-04-07 04:13:00.000000000 +0200
75 - An introduction for SuperTux -
76 http://supertux.berlios.de/
78 -Last update: October 13, 2005
79 +Last update: March 4, 2006 by Christoph Sommer
84 Also, notice that SuperTux saves the options, so it's often enough to
87 - The game uses OpenGL to render the graphics. You will either need a CPU
88 - with about 10 GHz or an accelerated video card with the vendor's drivers.
89 - (On Linux, the team recommends using cards from NVidia with the proprietary
90 - drivers, but ATI or another verndor should do.)
91 + The game uses SDL to render the graphics. You will either need a CPU
92 + with about 1 GHz or go get the original version of SuperTux which uses
97 diff -Naur supertux/configure.ac supertux-nogl/configure.ac
98 --- supertux/configure.ac 2006-03-03 20:43:38.000000000 +0100
99 +++ supertux-nogl/configure.ac 2006-04-07 04:13:00.000000000 +0200
102 dnl Process this file with autoconf to produce a configure script.
104 -AC_INIT(supertux, 0.2-svn)
105 +AC_INIT(supertux, 0.2-nogl-svn)
106 AC_CONFIG_SRCDIR([src/main.cpp])
107 AC_CONFIG_AUX_DIR([mk/autoconf])
110 [AC_MSG_ERROR([Please install SDLImage >= 1.2.1])],
111 [$SDL_CFLAGS], [$SDL_LIBS])
113 +dnl FIXME: This is far from perfect
114 +NP_FINDLIB([SDLGFX], [SDL_gfx], [SDL_gfx >= 2.0.13],
115 + NP_LANG_PROGRAM([#include <SDL_rotozoom.h>], [0;]),
118 + [AC_MSG_ERROR([Please install SDL_gfx >= 2.0.13])],
119 + [$SDL_CFLAGS], [$SDL_LIBS])
121 NP_FINDLIB([PHYSFS], [physfs], [physfs >= 1.0.0],
125 [AC_MSG_ERROR([Please intall OpenAL])],
129 -if test "$no_gl" = "yes"; then
130 - AC_MSG_ERROR([Please install opengl libraries and headers])
133 dnl Checks for library functions.
134 AC_CHECK_FUNCS(mkdir strdup strstr)
136 diff -Naur supertux/src/Jamfile supertux-nogl/src/Jamfile
137 --- supertux/src/Jamfile 2006-03-03 20:34:49.000000000 +0100
138 +++ supertux-nogl/src/Jamfile 2006-04-07 04:11:50.000000000 +0200
140 Application supertux : $(sources) $(wrapper_objects) : linkerfile ;
141 C++Flags supertux : -DAPPDATADIR='\"$(appdatadir)\"' ;
142 LinkWith supertux : squirrel ;
143 -ExternalLibs supertux : SDL SDLIMAGE GL OPENAL VORBIS VORBISFILE OGG ICONV PHYSFS BINRELOC ;
144 +ExternalLibs supertux : SDL SDLIMAGE SDLGFX OPENAL VORBIS VORBISFILE OGG ICONV PHYSFS BINRELOC ;
145 Help supertux : "Build the supertux executable" ;
146 IncludeDir supertux : squirrel/include squirrel ;
148 diff -Naur supertux/src/main.cpp supertux-nogl/src/main.cpp
149 --- supertux/src/main.cpp 2006-04-07 03:32:14.000000000 +0200
150 +++ supertux-nogl/src/main.cpp 2006-04-07 04:11:50.000000000 +0200
154 #include <SDL_image.h>
157 #include "gameconfig.hpp"
158 #include "resources.hpp"
160 SDL_GL_SetAttribute(SDL_GL_GREEN_SIZE, 5);
161 SDL_GL_SetAttribute(SDL_GL_BLUE_SIZE, 5);
163 - int flags = SDL_OPENGL;
164 + int flags = SDL_SWSURFACE;
165 if(config->use_fullscreen)
166 flags |= SDL_FULLSCREEN;
167 int width = config->screenwidth;
172 - // setup opengl state and transform
173 - glDisable(GL_DEPTH_TEST);
174 - glDisable(GL_CULL_FACE);
175 - glEnable(GL_TEXTURE_2D);
176 - glEnable(GL_BLEND);
177 - glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
179 - glViewport(0, 0, screen->w, screen->h);
180 - glMatrixMode(GL_PROJECTION);
182 - // logical resolution here not real monitor resolution
183 - glOrtho(0, 800, 600, 0, -1.0, 1.0);
184 - glMatrixMode(GL_MODELVIEW);
186 - glTranslatef(0, 0, 0);
188 - check_gl_error("Setting up view matrices");
190 if(texture_manager != NULL)
191 texture_manager->reload_textures();
193 diff -aur supertux/src/video/drawing_context.cpp supertux-nogl/src/video/drawing_context.cpp
194 --- supertux/src/video/drawing_context.cpp 2006-07-03 02:00:48.000000000 +0200
195 +++ supertux-nogl/src/video/drawing_context.cpp 2006-07-03 02:00:29.000000000 +0200
199 #include <SDL_image.h>
202 #include "drawing_context.hpp"
203 #include "surface.hpp"
206 screen = SDL_GetVideoSurface();
208 - lightmap_width = screen->w / LIGHTMAP_DIV;
209 - lightmap_height = screen->h / LIGHTMAP_DIV;
210 - unsigned int width = next_po2(lightmap_width);
211 - unsigned int height = next_po2(lightmap_height);
213 - lightmap = new Texture(width, height, GL_RGB);
215 - lightmap_uv_right = static_cast<float>(lightmap_width) / static_cast<float>(width);
216 - lightmap_uv_bottom = static_cast<float>(lightmap_height) / static_cast<float>(height);
217 - texture_manager->register_texture(lightmap);
220 requests = &drawing_requests;
223 DrawingContext::~DrawingContext()
225 - texture_manager->remove_texture(lightmap);
231 float angle, const Color& color, const Blend& blend,
234 + if(target != NORMAL) return;
236 assert(surface != 0);
238 DrawingRequest request;
240 DrawingContext::draw_surface_part(const Surface* surface, const Vector& source,
241 const Vector& size, const Vector& dest, int layer)
243 + if(target != NORMAL) return;
245 assert(surface != 0);
247 DrawingRequest request;
249 DrawingContext::draw_text(const Font* font, const std::string& text,
250 const Vector& position, FontAlignment alignment, int layer)
252 + if(target != NORMAL) return;
254 DrawingRequest request;
258 DrawingContext::draw_center_text(const Font* font, const std::string& text,
259 const Vector& position, int layer)
261 + if(target != NORMAL) return;
263 draw_text(font, text, Vector(position.x + SCREEN_WIDTH/2, position.y),
264 CENTER_ALLIGN, layer);
268 DrawingContext::draw_gradient(const Color& top, const Color& bottom, int layer)
270 + if(target != NORMAL) return;
272 DrawingRequest request;
274 request.type = GRADIENT;
276 DrawingContext::draw_filled_rect(const Vector& topleft, const Vector& size,
277 const Color& color, int layer)
279 + if(target != NORMAL) return;
281 DrawingRequest request;
283 request.type = FILLRECT;
285 DrawingContext::draw_filled_rect(const Rect& rect, const Color& color,
288 + if(target != NORMAL) return;
290 DrawingRequest request;
292 request.type = FILLRECT;
293 @@ -252,23 +253,55 @@
294 delete surfacepartrequest;
299 + void fillrect(SDL_Surface* screen, float x, float y, float w, float h, int r, int g, int b, int a)
310 + SDL_Rect src, rect;
311 + SDL_Surface *temp = NULL;
319 + temp = SDL_CreateRGBSurface(screen->flags, rect.w, rect.h, screen->format->BitsPerPixel, screen->format->Rmask, screen->format->Gmask, screen->format->Bmask, screen->format->Amask);
326 + SDL_FillRect(temp, &src, SDL_MapRGB(screen->format, r, g, b));
327 + SDL_SetAlpha(temp, SDL_SRCALPHA, a);
328 + SDL_BlitSurface(temp,0,screen,&rect);
329 + SDL_FreeSurface(temp);
331 + SDL_FillRect(screen, &rect, SDL_MapRGB(screen->format, r, g, b));
337 DrawingContext::draw_gradient(DrawingRequest& request)
339 GradientRequest* gradientrequest = (GradientRequest*) request.request_data;
340 const Color& top = gradientrequest->top;
341 const Color& bottom = gradientrequest->bottom;
343 - glDisable(GL_TEXTURE_2D);
345 - glColor4f(top.red, top.green, top.blue, top.alpha);
347 - glVertex2f(SCREEN_WIDTH, 0);
348 - glColor4f(bottom.red, bottom.green, bottom.blue, bottom.alpha);
349 - glVertex2f(SCREEN_WIDTH, SCREEN_HEIGHT);
350 - glVertex2f(0, SCREEN_HEIGHT);
352 - glEnable(GL_TEXTURE_2D);
355 + for(float y = 0; y < height; y += 2) ::fillrect(screen, 0, (int)y, width, 2, (int)(((float)(top.red-bottom.red)/(0-height)) * y + top.red), (int)(((float)(top.green-bottom.green)/(0-height)) * y + top.green), (int)(((float)(top.blue-bottom.blue)/(0-height)) * y + top.blue), 255);
357 delete gradientrequest;
359 @@ -294,18 +327,13 @@
360 float w = fillrectrequest->size.x;
361 float h = fillrectrequest->size.y;
363 - glDisable(GL_TEXTURE_2D);
364 - glColor4f(fillrectrequest->color.red, fillrectrequest->color.green,
365 - fillrectrequest->color.blue, fillrectrequest->color.alpha);
369 - glVertex2f(x+w, y);
370 - glVertex2f(x+w, y+h);
371 - glVertex2f(x, y+h);
373 - glEnable(GL_TEXTURE_2D);
374 + int r = static_cast<int>(fillrectrequest->color.red);
375 + int g = static_cast<int>(fillrectrequest->color.green);
376 + int b = static_cast<int>(fillrectrequest->color.blue);
377 + int a = static_cast<int>(fillrectrequest->color.alpha);
379 + ::fillrect(screen, x, y, w, h, r, g, b, a);
381 delete fillrectrequest;
384 @@ -319,67 +347,10 @@
385 transformstack.clear();
386 target_stack.clear();
388 - bool use_lightmap = lightmap_requests.size() != 0;
390 - // PART1: create lightmap
392 - glViewport(0, screen->h - lightmap_height, lightmap_width, lightmap_height);
393 - glMatrixMode(GL_PROJECTION);
395 - glOrtho(0, SCREEN_WIDTH, SCREEN_HEIGHT, 0, -1.0, 1.0);
396 - glMatrixMode(GL_MODELVIEW);
399 - // FIXME: Add ambient light support here
400 - glClearColor(0.3, 0.3, 0.4, 1);
401 - glClear(GL_COLOR_BUFFER_BIT);
402 - handle_drawing_requests(lightmap_requests);
403 - lightmap_requests.clear();
405 - glDisable(GL_BLEND);
406 - glBindTexture(GL_TEXTURE_2D, lightmap->get_handle());
407 - glCopyTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 0, screen->h - lightmap_height, lightmap_width, lightmap_height);
409 - glViewport(0, 0, screen->w, screen->h);
410 - glMatrixMode(GL_PROJECTION);
412 - glOrtho(0, SCREEN_WIDTH, SCREEN_HEIGHT, 0, -1.0, 1.0);
413 - glMatrixMode(GL_MODELVIEW);
415 - glEnable(GL_BLEND);
418 - //glClear(GL_COLOR_BUFFER_BIT);
419 handle_drawing_requests(drawing_requests);
420 drawing_requests.clear();
423 - // multiple the lightmap with the framebuffer
424 - glBlendFunc(GL_DST_COLOR, GL_ZERO);
426 - glBindTexture(GL_TEXTURE_2D, lightmap->get_handle());
429 - glTexCoord2f(0, lightmap_uv_bottom);
432 - glTexCoord2f(lightmap_uv_right, lightmap_uv_bottom);
433 - glVertex2f(SCREEN_WIDTH, 0);
435 - glTexCoord2f(lightmap_uv_right, 0);
436 - glVertex2f(SCREEN_WIDTH, SCREEN_HEIGHT);
438 - glTexCoord2f(0, 0);
439 - glVertex2f(0, SCREEN_HEIGHT);
443 - glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
446 - assert_gl("drawing");
448 - SDL_GL_SwapBuffers();
454 DrawingContext::set_target(Target target)
456 this->target = target;
457 - if(target == LIGHTMAP)
458 - requests = &lightmap_requests;
460 - requests = &drawing_requests;
462 diff -aur supertux/src/video/drawing_context.hpp supertux-nogl/src/video/drawing_context.hpp
463 --- supertux/src/video/drawing_context.hpp 2006-07-03 02:00:48.000000000 +0200
464 +++ supertux-nogl/src/video/drawing_context.hpp 2006-07-03 02:00:29.000000000 +0200
477 +#include "glutil.hpp"
482 // some constants for predefined layer values
484 @@ -222,16 +222,12 @@
485 void draw_filled_rect(DrawingRequest& request);
487 DrawingRequests drawing_requests;
488 - DrawingRequests lightmap_requests;
490 DrawingRequests* requests;
494 std::vector<Target> target_stack;
496 - int lightmap_width, lightmap_height;
497 - float lightmap_uv_right, lightmap_uv_bottom;
501 diff -aur supertux/src/video/glutil.hpp supertux-nogl/src/video/glutil.hpp
502 --- supertux/src/video/glutil.hpp 2006-07-03 02:00:48.000000000 +0200
503 +++ supertux-nogl/src/video/glutil.hpp 2006-07-03 02:00:29.000000000 +0200
510 -static inline void check_gl_error(const char* message)
513 - GLenum error = glGetError();
514 - if(error != GL_NO_ERROR) {
515 - std::ostringstream msg;
516 - msg << "OpenGLError while '" << message << "': ";
518 - case GL_INVALID_ENUM:
519 - msg << "INVALID_ENUM: An unacceptable value is specified for an "
520 - "enumerated argument.";
522 - case GL_INVALID_VALUE:
523 - msg << "INVALID_VALUE: A numeric argument is out of range.";
525 - case GL_INVALID_OPERATION:
526 - msg << "INVALID_OPERATION: The specified operation is not allowed "
527 - "in the current state.";
529 - case GL_STACK_OVERFLOW:
530 - msg << "STACK_OVERFLOW: This command would cause a stack overflow.";
532 - case GL_STACK_UNDERFLOW:
533 - msg << "STACK_UNDERFLOW: This command would cause a stack underflow.";
535 - case GL_OUT_OF_MEMORY:
536 - msg << "OUT_OF_MEMORY: There is not enough memory left to execute the "
539 -#ifdef GL_TABLE_TOO_LARGE
540 - case GL_TABLE_TOO_LARGE:
541 - msg << "TABLE_TOO_LARGE: table is too large";
545 - msg << "Unknown error (code " << error << ")";
548 - throw std::runtime_error(msg.str());
554 +#define GL_SRC_ALPHA 0
555 +#define GL_ONE_MINUS_SRC_ALPHA 1
559 -static inline void assert_gl(const char* message)
562 - check_gl_error(message);
569 diff -aur supertux/src/video/surface.cpp supertux-nogl/src/video/surface.cpp
570 --- supertux/src/video/surface.cpp 2006-07-03 02:00:48.000000000 +0200
571 +++ supertux-nogl/src/video/surface.cpp 2006-07-03 02:00:29.000000000 +0200
575 #include <SDL_image.h>
576 +#include <SDL_rotozoom.h>
578 #include "gameconfig.hpp"
579 #include "physfs/physfs_sdl.hpp"
582 texture = texture_manager->get(file);
586 - uv_right = texture->get_uv_right();
587 - uv_bottom = texture->get_uv_bottom();
589 - width = texture->get_image_width();
590 - height = texture->get_image_height();
593 + width = static_cast<int>(texture->get_image_width());
594 + height = static_cast<int>(texture->get_image_height());
599 Surface::Surface(const std::string& file, int x, int y, int w, int h)
601 texture = texture_manager->get(file);
604 - float tex_w = static_cast<float> (texture->get_width());
605 - float tex_h = static_cast<float> (texture->get_height());
606 - uv_left = static_cast<float>(x) / tex_w;
607 - uv_top = static_cast<float>(y) / tex_h;
608 - uv_right = static_cast<float>(x+w) / tex_w;
609 - uv_bottom = static_cast<float>(y+h) / tex_h;
619 Surface::Surface(const Surface& other)
621 texture = other.texture;
624 - uv_left = other.uv_left;
625 - uv_top = other.uv_top;
626 - uv_right = other.uv_right;
627 - uv_bottom = other.uv_bottom;
628 + offsetx = other.offsetx;
629 + offsety = other.offsety;
631 height = other.height;
633 + flipx = other.flipx;
639 texture = other.texture;
641 - uv_left = other.uv_left;
642 - uv_top = other.uv_top;
643 - uv_right = other.uv_right;
644 - uv_bottom = other.uv_bottom;
645 + offsetx = other.offsetx;
646 + offsety = other.offsety;
648 height = other.height;
650 + flipx = other.flipx;
659 + for (std::list<TransformedSurface*>::iterator i = transformedSurfaces.begin(); i != transformedSurfaces.end(); i++) {
660 + SDL_FreeSurface((*i)->surface);
668 - std::swap(uv_left, uv_right);
672 -static inline void intern_draw(float left, float top, float right, float bottom, float uv_left, float uv_top,
673 - float uv_right, float uv_bottom,
674 - DrawingEffect effect)
676 - if(effect & HORIZONTAL_FLIP)
677 - std::swap(uv_left, uv_right);
678 - if(effect & VERTICAL_FLIP) {
679 - std::swap(uv_top, uv_bottom);
683 - glTexCoord2f(uv_left, uv_top);
684 - glVertex2f(left, top);
686 - glTexCoord2f(uv_right, uv_top);
687 - glVertex2f(right, top);
689 - glTexCoord2f(uv_right, uv_bottom);
690 - glVertex2f(right, bottom);
692 - glTexCoord2f(uv_left, uv_bottom);
693 - glVertex2f(left, bottom);
698 static inline void intern_draw2(float left, float top, float right, float bottom,
699 float uv_left, float uv_top,
700 float uv_right, float uv_bottom,
701 @@ -182,50 +161,76 @@
702 glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
703 glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
708 -Surface::draw(float x, float y, float alpha, float angle, const Color& color, const Blend& blend, DrawingEffect effect) const
709 +Surface::draw(float x, float y, float alpha, float, const Color&, const Blend&, DrawingEffect effect) const
711 - glColor4f(1.0f, 1.0f, 1.0f, alpha);
712 - glBindTexture(GL_TEXTURE_2D, texture->get_handle());
715 - x + width, y + height,
716 - uv_left, uv_top, uv_right, uv_bottom,
721 + draw_part(0, 0, x, y, width, height, alpha, effect);
725 Surface::draw(float x, float y, float alpha, DrawingEffect effect) const
727 - glColor4f(1.0f, 1.0f, 1.0f, alpha);
728 - glBindTexture(GL_TEXTURE_2D, texture->get_handle());
731 - x + width, y + height,
732 - uv_left, uv_top, uv_right, uv_bottom, effect);
733 + draw_part(0, 0, x, y, width, height, alpha, effect);
737 Surface::draw_part(float src_x, float src_y, float dst_x, float dst_y,
738 - float width, float height, float alpha,
739 + float width, float height, float ,
740 DrawingEffect effect) const
742 - float uv_width = uv_right - uv_left;
743 - float uv_height = uv_bottom - uv_top;
744 + //FIXME: support parameter "alpha"
745 + SDL_Surface* surface = texture->getSurface();
747 - float uv_left = this->uv_left + (uv_width * src_x) / this->width;
748 - float uv_top = this->uv_top + (uv_height * src_y) / this->height;
749 - float uv_right = this->uv_left + (uv_width * (src_x + width)) / this->width;
750 - float uv_bottom = this->uv_top + (uv_height * (src_y + height)) / this->height;
751 + // get and check SDL_Surface
752 + if (surface == 0) {
753 + std::cerr << "Warning: Tried to draw NULL surface, skipped draw" << std::endl;
757 - glColor4f(1.0f, 1.0f, 1.0f, alpha);
758 - glBindTexture(GL_TEXTURE_2D, texture->get_handle());
759 + SDL_Surface* transformedSurface = surface;
761 - intern_draw(dst_x, dst_y,
762 - dst_x + width, dst_y + height,
763 - uv_left, uv_top, uv_right, uv_bottom, effect);
764 + if (flipx) effect = HORIZONTAL_FLIP;
766 + if (effect != NO_EFFECT) {
767 + transformedSurface = 0;
769 + // check if we have this effect buffered
770 + for (std::list<TransformedSurface*>::const_iterator i = transformedSurfaces.begin(); i != transformedSurfaces.end(); i++) {
771 + if ((*i)->effect == effect) transformedSurface = (*i)->surface;
774 + // if not: transform and buffer
775 + if (!transformedSurface) {
776 + if (effect == HORIZONTAL_FLIP) transformedSurface = zoomSurface(surface, -1, 1, 0);
777 + if (effect == VERTICAL_FLIP) transformedSurface = zoomSurface(surface, 1, -1, 0);
778 + if (transformedSurface == 0) {
779 + std::cerr << "Warning: No known transformation applies to surface, skipped draw" << std::endl;
782 + TransformedSurface* su = new TransformedSurface();
783 + su->surface = transformedSurface;
784 + su->effect = effect;
786 + transformedSurfaces.push_front(su);
790 + int ox = offsetx; if (effect == HORIZONTAL_FLIP) ox = static_cast<int>(surface->w) - (ox+static_cast<int>(width));
791 + int oy = offsety; if (effect == VERTICAL_FLIP) oy = static_cast<int>(surface->h) - (oy+static_cast<int>(height));
792 + // draw surface to screen
793 + SDL_Surface* screen = SDL_GetVideoSurface();
796 + srcRect.x = static_cast<int>(ox+src_x);
797 + srcRect.y = static_cast<int>(oy+src_y);
798 + srcRect.w = static_cast<int>(width);
799 + srcRect.h = static_cast<int>(height);
802 + dstRect.x = static_cast<int>(dst_x);
803 + dstRect.y = static_cast<int>(dst_y);
805 + SDL_BlitSurface(transformedSurface, &srcRect, screen, &dstRect);
807 diff -aur supertux/src/video/surface.hpp supertux-nogl/src/video/surface.hpp
808 --- supertux/src/video/surface.hpp 2006-07-03 02:00:48.000000000 +0200
809 +++ supertux-nogl/src/video/surface.hpp 2006-07-03 02:00:29.000000000 +0200
811 #ifndef __SURFACE_HPP__
812 #define __SURFACE_HPP__
814 +#include <SDL_image.h>
824 + * Helper class to buffer a pre-transformed SDL_Surface
826 +class TransformedSurface {
828 + SDL_Surface* surface;
829 + DrawingEffect effect;
833 * A rectangular image.
834 * The class basically holds a reference to a texture with additional UV
835 * coordinates that specify a rectangular area on this texture
838 ImageTexture* texture;
846 + /** draw the surface on the screen, applying a ::DrawingEffect on-the-fly. Transformed Surfaces will be cached in ::transformedSurfaces */
847 void draw(float x, float y, float alpha, float angle, const Color& color, const Blend& blend, DrawingEffect effect) const;
849 + /** draw the surface on the screen, applying a ::DrawingEffect on-the-fly. Transformed Surfaces will be cached in ::transformedSurfaces */
850 void draw(float x, float y, float alpha, DrawingEffect effect) const;
852 + /** draw the surface on the screen, applying a ::DrawingEffect on-the-fly. Transformed Surfaces will be cached in ::transformedSurfaces */
853 void draw_part(float src_x, float src_y, float dst_x, float dst_y,
854 float width, float height,
855 float alpha, DrawingEffect effect) const;
859 + int offsetx; /**< Region in ::surface to be used for blitting */
860 + int offsety; /**< Region in ::surface to be used for blitting */
861 + int width; /**< Region in ::surface to be used for blitting */
862 + int height; /**< Region in ::surface to be used for blitting */
864 + mutable std::list<TransformedSurface*> transformedSurfaces; /**< Cache for pre-transformed surfaces */
867 Surface(const std::string& file);
868 Surface(const std::string& file, int x, int y, int w, int h);
869 diff -aur supertux/src/video/texture.cpp supertux-nogl/src/video/texture.cpp
870 --- supertux/src/video/texture.cpp 2006-07-03 02:00:48.000000000 +0200
871 +++ supertux-nogl/src/video/texture.cpp 2006-07-03 02:00:29.000000000 +0200
874 #include "texture.hpp"
878 #include "glutil.hpp"
881 return (v & (v-1)) == 0;
884 -Texture::Texture(unsigned int w, unsigned int h, GLenum glformat)
885 +Texture::Texture(unsigned int w, unsigned int h, GLenum)
887 assert(is_power_of_2(w));
888 assert(is_power_of_2(h));
893 - assert_gl("before creating texture");
894 - glGenTextures(1, &handle);
897 - glBindTexture(GL_TEXTURE_2D, handle);
899 - glTexImage2D(GL_TEXTURE_2D, 0, glformat, width, height, 0, GL_RGBA,
900 - GL_UNSIGNED_BYTE, 0);
902 - set_texture_params();
904 - glDeleteTextures(1, &handle);
910 -Texture::Texture(SDL_Surface* image, GLenum glformat)
911 +Texture::Texture(SDL_Surface* image, GLenum)
913 const SDL_PixelFormat* format = image->format;
914 if(!is_power_of_2(image->w) || !is_power_of_2(image->h))
916 this->width = image->w;
917 this->height = image->h;
919 - assert_gl("before creating texture");
920 - glGenTextures(1, &handle);
924 - if(format->BytesPerPixel == 3)
925 - sdl_format = GL_RGB;
926 - else if(format->BytesPerPixel == 4)
927 - sdl_format = GL_RGBA;
931 - glBindTexture(GL_TEXTURE_2D, handle);
932 - glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
933 - glPixelStorei(GL_UNPACK_ROW_LENGTH, image->pitch/format->BytesPerPixel);
934 - glTexImage2D(GL_TEXTURE_2D, 0, glformat, width, height, 0, sdl_format,
935 - GL_UNSIGNED_BYTE, image->pixels);
937 - assert_gl("creating texture");
939 - set_texture_params();
941 - glDeleteTextures(1, &handle);
944 + surface = SDL_DisplayFormatAlpha(image);
949 - glDeleteTextures(1, &handle);
953 Texture::set_texture_params()
955 - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
956 - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
957 - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP);
958 - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP);
960 - assert_gl("set texture params");
962 diff -aur supertux/src/video/texture.hpp supertux-nogl/src/video/texture.hpp
963 --- supertux/src/video/texture.hpp 2006-07-03 02:00:48.000000000 +0200
964 +++ supertux-nogl/src/video/texture.hpp 2006-07-03 02:00:29.000000000 +0200
966 #define __TEXTURE_HPP__
970 +#include "glutil.hpp"
973 * This class is a wrapper around a texture handle. It stores the texture width
978 + SDL_Surface* surface; /**< non-GL branch stores optimized surface */
980 friend class TextureManager;
986 Texture(SDL_Surface* surface, GLenum glformat);
989 - GLuint get_handle() const
994 unsigned int get_width() const
1001 + SDL_Surface* getSurface() {
1005 + void setSurface(SDL_Surface* surface) {
1006 + this->surface = surface;
1010 void set_texture_params();
1012 diff -aur supertux/src/video/texture_manager.cpp supertux-nogl/src/video/texture_manager.cpp
1013 --- supertux/src/video/texture_manager.cpp 2006-07-03 02:00:48.000000000 +0200
1014 +++ supertux-nogl/src/video/texture_manager.cpp 2006-07-03 02:00:29.000000000 +0200
1018 #include <SDL_image.h>
1020 -#include <GL/glext.h>
1023 #include <stdexcept>
1024 @@ -145,12 +143,6 @@
1026 TextureManager::save_textures()
1028 - glPixelStorei(GL_PACK_ROW_LENGTH, 0);
1029 - glPixelStorei(GL_PACK_IMAGE_HEIGHT, 0);
1030 - glPixelStorei(GL_PACK_SKIP_PIXELS, 0);
1031 - glPixelStorei(GL_PACK_SKIP_ROWS, 0);
1032 - glPixelStorei(GL_PACK_SKIP_IMAGES, 0);
1033 - glPixelStorei(GL_PACK_ALIGNMENT, 1);
1034 for(Textures::iterator i = textures.begin(); i != textures.end(); ++i) {
1037 @@ -165,74 +157,15 @@
1039 SavedTexture saved_texture;
1040 saved_texture.texture = texture;
1041 - glBindTexture(GL_TEXTURE_2D, texture->get_handle());
1042 - glGetTexLevelParameteriv(GL_TEXTURE_2D, 0, GL_TEXTURE_WIDTH,
1043 - &saved_texture.width);
1044 - glGetTexLevelParameteriv(GL_TEXTURE_2D, 0, GL_TEXTURE_HEIGHT,
1045 - &saved_texture.height);
1046 - glGetTexLevelParameteriv(GL_TEXTURE_2D, 0, GL_TEXTURE_BORDER,
1047 - &saved_texture.border);
1048 - glGetTexParameteriv(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER,
1049 - &saved_texture.min_filter);
1050 - glGetTexParameteriv(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER,
1051 - &saved_texture.mag_filter);
1052 - glGetTexParameteriv(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S,
1053 - &saved_texture.wrap_s);
1054 - glGetTexParameteriv(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T,
1055 - &saved_texture.wrap_t);
1057 size_t pixelssize = saved_texture.width * saved_texture.height * 4;
1058 saved_texture.pixels = new char[pixelssize];
1060 - glGetTexImage(GL_TEXTURE_2D, 0, GL_RGBA, GL_UNSIGNED_BYTE,
1061 - saved_texture.pixels);
1063 saved_textures.push_back(saved_texture);
1065 - glDeleteTextures(1, &(texture->handle));
1066 - texture->handle = 0;
1068 - assert_gl("retrieving texture for save");
1072 TextureManager::reload_textures()
1074 - glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);
1075 - glPixelStorei(GL_UNPACK_IMAGE_HEIGHT, 0);
1076 - glPixelStorei(GL_UNPACK_SKIP_PIXELS, 0);
1077 - glPixelStorei(GL_UNPACK_SKIP_ROWS, 0);
1078 - glPixelStorei(GL_UNPACK_SKIP_IMAGES, 0);
1079 - glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
1081 - for(std::vector<SavedTexture>::iterator i = saved_textures.begin();
1082 - i != saved_textures.end(); ++i) {
1083 - SavedTexture& saved_texture = *i;
1086 - glGenTextures(1, &handle);
1087 - assert_gl("creating texture handle");
1089 - glBindTexture(GL_TEXTURE_2D, handle);
1090 - glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA,
1091 - saved_texture.width, saved_texture.height,
1092 - saved_texture.border, GL_RGBA,
1093 - GL_UNSIGNED_BYTE, saved_texture.pixels);
1094 - delete[] saved_texture.pixels;
1095 - assert_gl("uploading texture pixel data");
1097 - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER,
1098 - saved_texture.min_filter);
1099 - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER,
1100 - saved_texture.mag_filter);
1101 - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S,
1102 - saved_texture.wrap_s);
1103 - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T,
1104 - saved_texture.wrap_t);
1106 - assert_gl("setting texture_params");
1107 - saved_texture.texture->handle = handle;
1110 saved_textures.clear();
1112 diff -aur supertux/src/video/texture_manager.hpp supertux-nogl/src/video/texture_manager.hpp
1113 --- supertux/src/video/texture_manager.hpp 2006-07-03 02:00:48.000000000 +0200
1114 +++ supertux-nogl/src/video/texture_manager.hpp 2006-07-03 02:00:29.000000000 +0200
1116 #ifndef __IMAGE_TEXTURE_MANAGER_HPP__
1117 #define __IMAGE_TEXTURE_MANAGER_HPP__
1120 +#include "video/glutil.hpp"