contrib/supertux-nogl.diff

   1 #
   2 #  SuperTux -nogl patch
   3 #  Copyright (C) 2006 Christoph Sommer <christoph.sommer@2006.expires.deltadevelopment.de>
   4 #
   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.
   9 #
  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.
  14 #
  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.
  18 #
  19 # -----------------------------------------------------------------------------
  20 #
  21 #  This patch allows running the game on systems without OpenGL support.
  22 #
  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.
  26 #
  27 #  Note that the patched sources will need an additional library, SDL_gfx, to
  28 #  compile.
  29 #
  30 #  Installing the patch should be pretty straightforward. Simply run the
  31 #  following command prior to running autogen.sh and configure:
  32 #
  33 #  patch -p1 < contrib/supertux-nogl.diff
  34 #
  35 #  This patch works for revision 3858. It may break for later revisions.
  36 #
  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
  41 @@ -1,7 +1,7 @@
  42  - Install instructions for SuperTux -
  43  http://supertux.berlios.de/
  44
  45 -Last update: October 11, 2005 by Ondra Hosek
  46 +Last update: March 4, 2006 by Christoph Sommer
  47
  48  BINARIES
  49  --------
  50 @@ -34,17 +34,15 @@
  51      Download: ftp://ftp.perforce.com/pub/jam
  52      Homepage: http://www.perforce.com/jam/jam.html
  53
  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.
  58 -
  59  * SDL 1.2.5 or later (1.2.8 is recommended on MacOS/X)
  60      http://www.libsdl.org
  61
  62  * SDL_image (any version)
  63      http://www.libsdl.org/projects/SDL_image
  64
  65 +* SDL_gfx (2.0.13 or later)
  66 +    http://www.ferzkopp.net/Software/SDL_gfx-2.0/
  67 +
  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
  74 @@ -2,7 +2,7 @@
  75  - An introduction for SuperTux -
  76  http://supertux.berlios.de/
  77
  78 -Last update: October 13, 2005
  79 +Last update: March 4, 2006 by Christoph Sommer
  80
  81  DESCRIPTION
  82  -----------
  83 @@ -75,10 +75,9 @@
  84    Also, notice that SuperTux saves the options, so it's often enough to
  85    specify them once.
  86
  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
  93 +  OpenGL.
  94
  95
  96  PLAYING THE GAME
  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
 100 @@ -11,7 +11,7 @@
 101
 102  dnl Process this file with autoconf to produce a configure script.
 103  AC_PREREQ([2.54])
 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])
 108  AC_CANONICAL_TARGET
 109 @@ -112,6 +105,14 @@
 110          [AC_MSG_ERROR([Please install SDLImage >= 1.2.1])],
 111          [$SDL_CFLAGS], [$SDL_LIBS])
 112
 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;]),
 116 +        [], [-lSDL_gfx],
 117 +        [],
 118 +        [AC_MSG_ERROR([Please install SDL_gfx >= 2.0.13])],
 119 +        [$SDL_CFLAGS], [$SDL_LIBS])
 120 +
 121  NP_FINDLIB([PHYSFS], [physfs], [physfs >= 1.0.0],
 122          NP_LANG_PROGRAM([
 123  #include <stdio.h>
 124 @@ -131,11 +132,6 @@
 125           [AC_MSG_ERROR([Please intall OpenAL])],
 126           [], [])
 127
 128 -AX_CHECK_GL
 129 -if test "$no_gl" = "yes"; then
 130 -  AC_MSG_ERROR([Please install opengl libraries and headers])
 131 -fi
 132 -
 133  dnl Checks for library functions.
 134  AC_CHECK_FUNCS(mkdir strdup strstr)
 135
 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
 139 @@ -24,7 +24,7 @@
 140  Application supertux : $(sources) $(wrapper_objects) ;
 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 ;
 147
 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
 151 @@ -35,7 +35,6 @@
 152  #include <physfs.h>
 153  #include <SDL.h>
 154  #include <SDL_image.h>
 155 -#include <GL/gl.h>
 156
 157  #include "gameconfig.hpp"
 158  #include "resources.hpp"
 159 @@ -317,7 +275,7 @@
 160    SDL_GL_SetAttribute(SDL_GL_GREEN_SIZE, 5);
 161    SDL_GL_SetAttribute(SDL_GL_BLUE_SIZE, 5);
 162
 163 -  int flags = SDL_OPENGL;
 164 +  int flags = SDL_SWSURFACE;
 165    if(config->use_fullscreen)
 166      flags |= SDL_FULLSCREEN;
 167    int width = config->screenwidth;
 168 @@ -347,24 +305,6 @@
 169    }
 170  #endif
 171
 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);
 178 -
 179 -  glViewport(0, 0, screen->w, screen->h);
 180 -  glMatrixMode(GL_PROJECTION);
 181 -  glLoadIdentity();
 182 -  // logical resolution here not real monitor resolution
 183 -  glOrtho(0, 800, 600, 0, -1.0, 1.0);
 184 -  glMatrixMode(GL_MODELVIEW);
 185 -  glLoadIdentity();
 186 -  glTranslatef(0, 0, 0);
 187 -
 188 -  check_gl_error("Setting up view matrices");
 189 -
 190    if(texture_manager != NULL)
 191      texture_manager->reload_textures();
 192    else
 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
 196 @@ -23,7 +23,6 @@
 197  #include <cassert>
 198  #include <iostream>
 199  #include <SDL_image.h>
 200 -#include <GL/gl.h>
 201
 202  #include "drawing_context.hpp"
 203  #include "surface.hpp"
 204 @@ -49,30 +48,20 @@
 205  {
 206    screen = SDL_GetVideoSurface();
 207
 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);
 212 -
 213 -  lightmap = new Texture(width, height, GL_RGB);
 214 -
 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);
 218 -
 219 +  target = NORMAL;
 220    requests = &drawing_requests;
 221  }
 222
 223  DrawingContext::~DrawingContext()
 224  {
 225 -  texture_manager->remove_texture(lightmap);
 226 -  delete lightmap;
 227  }
 228
 229  void
 230  DrawingContext::draw_surface(const Surface* surface, const Vector& position, float angle,
 231      int layer)
 232  {
 233 +  if(target != NORMAL) return;
 234 +
 235    assert(surface != 0);
 236
 237    DrawingRequest request;
 238 @@ -105,6 +94,8 @@
 239  DrawingContext::draw_surface_part(const Surface* surface, const Vector& source,
 240      const Vector& size, const Vector& dest, int layer)
 241  {
 242 +  if(target != NORMAL) return;
 243 +
 244    assert(surface != 0);
 245
 246    DrawingRequest request;
 247 @@ -144,6 +135,8 @@
 248  DrawingContext::draw_text(const Font* font, const std::string& text,
 249      const Vector& position, FontAlignment alignment, int layer)
 250  {
 251 +  if(target != NORMAL) return;
 252 +
 253    DrawingRequest request;
 254
 255    request.type = TEXT;
 256 @@ -165,6 +158,8 @@
 257  DrawingContext::draw_center_text(const Font* font, const std::string& text,
 258      const Vector& position, int layer)
 259  {
 260 +  if(target != NORMAL) return;
 261 +
 262    draw_text(font, text, Vector(position.x + SCREEN_WIDTH/2, position.y),
 263        CENTER_ALLIGN, layer);
 264  }
 265 @@ -172,6 +167,8 @@
 266  void
 267  DrawingContext::draw_gradient(const Color& top, const Color& bottom, int layer)
 268  {
 269 +  if(target != NORMAL) return;
 270 +
 271    DrawingRequest request;
 272
 273    request.type = GRADIENT;
 274 @@ -193,6 +190,8 @@
 275  DrawingContext::draw_filled_rect(const Vector& topleft, const Vector& size,
 276                                   const Color& color, int layer)
 277  {
 278 +  if(target != NORMAL) return;
 279 +
 280    DrawingRequest request;
 281
 282    request.type = FILLRECT;
 283 @@ -248,23 +247,55 @@
 284    delete surfacepartrequest;
 285  }
 286
 287 +namespace
 288 +{
 289 +  void fillrect(SDL_Surface* screen, float x, float y, float w, float h, int r, int g, int b, int a)
 290 +  {
 291 +    if(w < 0) {
 292 +      x += w;
 293 +      w = -w;
 294 +    }
 295 +    if(h < 0) {
 296 +      y += h;
 297 +      h = -h;
 298 +    }
 299 +
 300 +    SDL_Rect src, rect;
 301 +    SDL_Surface *temp = NULL;
 302 +
 303 +    rect.x = (int)x;
 304 +    rect.y = (int)y;
 305 +    rect.w = (int)w;
 306 +    rect.h = (int)h;
 307 +
 308 +    if(a != 255) {
 309 +      temp = SDL_CreateRGBSurface(screen->flags, rect.w, rect.h, screen->format->BitsPerPixel, screen->format->Rmask, screen->format->Gmask, screen->format->Bmask, screen->format->Amask);
 310 +
 311 +      src.x = 0;
 312 +      src.y = 0;
 313 +      src.w = rect.w;
 314 +      src.h = rect.h;
 315 +
 316 +      SDL_FillRect(temp, &src, SDL_MapRGB(screen->format, r, g, b));
 317 +      SDL_SetAlpha(temp, SDL_SRCALPHA, a);
 318 +      SDL_BlitSurface(temp,0,screen,&rect);
 319 +      SDL_FreeSurface(temp);
 320 +    } else {
 321 +      SDL_FillRect(screen, &rect, SDL_MapRGB(screen->format, r, g, b));
 322 +    }
 323 +  }
 324 +}
 325 +
 326  void
 327  DrawingContext::draw_gradient(DrawingRequest& request)
 328  {
 329    GradientRequest* gradientrequest = (GradientRequest*) request.request_data;
 330    const Color& top = gradientrequest->top;
 331    const Color& bottom = gradientrequest->bottom;
 332 -
 333 -  glDisable(GL_TEXTURE_2D);
 334 -  glBegin(GL_QUADS);
 335 -  glColor4f(top.red, top.green, top.blue, top.alpha);
 336 -  glVertex2f(0, 0);
 337 -  glVertex2f(SCREEN_WIDTH, 0);
 338 -  glColor4f(bottom.red, bottom.green, bottom.blue, bottom.alpha);
 339 -  glVertex2f(SCREEN_WIDTH, SCREEN_HEIGHT);
 340 -  glVertex2f(0, SCREEN_HEIGHT);
 341 -  glEnd();
 342 -  glEnable(GL_TEXTURE_2D);
 343 +
 344 +  int width = 800;
 345 +  int height = 600;
 346 +  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);
 347
 348    delete gradientrequest;
 349  }
 350 @@ -290,17 +321,12 @@
 351    float w = fillrectrequest->size.x;
 352    float h = fillrectrequest->size.y;
 353
 354 -  glDisable(GL_TEXTURE_2D);
 355 -  glColor4f(fillrectrequest->color.red, fillrectrequest->color.green,
 356 -            fillrectrequest->color.blue, fillrectrequest->color.alpha);
 357 -
 358 -  glBegin(GL_QUADS);
 359 -  glVertex2f(x, y);
 360 -  glVertex2f(x+w, y);
 361 -  glVertex2f(x+w, y+h);
 362 -  glVertex2f(x, y+h);
 363 -  glEnd();
 364 -  glEnable(GL_TEXTURE_2D);
 365 +  int r = static_cast<int>(fillrectrequest->color.red);
 366 +  int g = static_cast<int>(fillrectrequest->color.green);
 367 +  int b = static_cast<int>(fillrectrequest->color.blue);
 368 +  int a = static_cast<int>(fillrectrequest->color.alpha);
 369 +
 370 +  ::fillrect(screen, x, y, w, h, r, g, b, a);
 371
 372    delete fillrectrequest;
 373  }
 374 @@ -315,67 +341,10 @@
 375    transformstack.clear();
 376    target_stack.clear();
 377
 378 -  bool use_lightmap = lightmap_requests.size() != 0;
 379 -
 380 -  // PART1: create lightmap
 381 -  if(use_lightmap) {
 382 -    glViewport(0, screen->h - lightmap_height, lightmap_width, lightmap_height);
 383 -    glMatrixMode(GL_PROJECTION);
 384 -    glLoadIdentity();
 385 -    glOrtho(0, SCREEN_WIDTH, SCREEN_HEIGHT, 0, -1.0, 1.0);
 386 -    glMatrixMode(GL_MODELVIEW);
 387 -    glLoadIdentity();
 388 -
 389 -    // FIXME: Add ambient light support here
 390 -    glClearColor(0.3, 0.3, 0.4, 1);
 391 -    glClear(GL_COLOR_BUFFER_BIT);
 392 -    handle_drawing_requests(lightmap_requests);
 393 -    lightmap_requests.clear();
 394 -
 395 -    glDisable(GL_BLEND);
 396 -    glBindTexture(GL_TEXTURE_2D, lightmap->get_handle());
 397 -    glCopyTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 0, screen->h - lightmap_height, lightmap_width, lightmap_height);
 398 -
 399 -    glViewport(0, 0, screen->w, screen->h);
 400 -    glMatrixMode(GL_PROJECTION);
 401 -    glLoadIdentity();
 402 -    glOrtho(0, SCREEN_WIDTH, SCREEN_HEIGHT, 0, -1.0, 1.0);
 403 -    glMatrixMode(GL_MODELVIEW);
 404 -    glLoadIdentity();
 405 -    glEnable(GL_BLEND);
 406 -  }
 407 -
 408 -  //glClear(GL_COLOR_BUFFER_BIT);
 409    handle_drawing_requests(drawing_requests);
 410    drawing_requests.clear();
 411
 412 -  if(use_lightmap) {
 413 -    // multiple the lightmap with the framebuffer
 414 -    glBlendFunc(GL_DST_COLOR, GL_ZERO);
 415 -
 416 -    glBindTexture(GL_TEXTURE_2D, lightmap->get_handle());
 417 -    glBegin(GL_QUADS);
 418 -
 419 -    glTexCoord2f(0, lightmap_uv_bottom);
 420 -    glVertex2f(0, 0);
 421 -
 422 -    glTexCoord2f(lightmap_uv_right, lightmap_uv_bottom);
 423 -    glVertex2f(SCREEN_WIDTH, 0);
 424 -
 425 -    glTexCoord2f(lightmap_uv_right, 0);
 426 -    glVertex2f(SCREEN_WIDTH, SCREEN_HEIGHT);
 427 -
 428 -    glTexCoord2f(0, 0);
 429 -    glVertex2f(0, SCREEN_HEIGHT);
 430 -
 431 -    glEnd();
 432 -
 433 -    glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 434 -  }
 435 -
 436 -  assert_gl("drawing");
 437 -
 438 -  SDL_GL_SwapBuffers();
 439 +  SDL_Flip(screen);
 440  }
 441
 442  void
 443 @@ -467,9 +436,5 @@
 444  DrawingContext::set_target(Target target)
 445  {
 446    this->target = target;
 447 -  if(target == LIGHTMAP)
 448 -    requests = &lightmap_requests;
 449 -  else
 450 -    requests = &drawing_requests;
 451  }
 452
 453 diff -aur supertux/src/video/drawing_context.hpp supertux-nogl/src/video/drawing_context.hpp
 454 --- supertux/src/video/drawing_context.hpp      2006-07-03 02:00:48.000000000 +0200
 455 +++ supertux-nogl/src/video/drawing_context.hpp 2006-07-03 02:00:29.000000000 +0200
 456 @@ -24,7 +24,6 @@
 457  #include <string>
 458  #include <stdint.h>
 459
 460 -#include <GL/gl.h>
 461  #include <SDL.h>
 462  #include <stdint.h>
 463  #include <memory>
 464 @@ -35,8 +34,9 @@
 465  #include "font.hpp"
 466  #include "color.hpp"
 467
 468 +#include "glutil.hpp"
 469 +
 470  class Surface;
 471 -class Texture;
 472
 473  // some constants for predefined layer values
 474  enum {
 475 @@ -214,16 +214,12 @@
 476    void draw_filled_rect(DrawingRequest& request);
 477
 478    DrawingRequests drawing_requests;
 479 -  DrawingRequests lightmap_requests;
 480
 481    DrawingRequests* requests;
 482
 483    SDL_Surface* screen;
 484    Target target;
 485    std::vector<Target> target_stack;
 486 -  Texture* lightmap;
 487 -  int lightmap_width, lightmap_height;
 488 -  float lightmap_uv_right, lightmap_uv_bottom;
 489  };
 490
 491  #endif
 492 diff -aur supertux/src/video/glutil.hpp supertux-nogl/src/video/glutil.hpp
 493 --- supertux/src/video/glutil.hpp       2006-07-03 02:00:48.000000000 +0200
 494 +++ supertux-nogl/src/video/glutil.hpp  2006-07-03 02:00:29.000000000 +0200
 495 @@ -21,58 +21,11 @@
 496
 497  #include <sstream>
 498  #include <stdexcept>
 499 -#include <GL/gl.h>
 500
 501 -static inline void check_gl_error(const char* message)
 502 -{
 503 -#ifdef DEBUG
 504 -  GLenum error = glGetError();
 505 -  if(error != GL_NO_ERROR) {
 506 -    std::ostringstream msg;
 507 -    msg << "OpenGLError while '" << message << "': ";
 508 -    switch(error) {
 509 -      case GL_INVALID_ENUM:
 510 -        msg << "INVALID_ENUM: An unacceptable value is specified for an "
 511 -               "enumerated argument.";
 512 -        break;
 513 -      case GL_INVALID_VALUE:
 514 -        msg << "INVALID_VALUE: A numeric argument is out of range.";
 515 -        break;
 516 -      case GL_INVALID_OPERATION:
 517 -        msg << "INVALID_OPERATION: The specified operation is not allowed "
 518 -               "in the current state.";
 519 -        break;
 520 -      case GL_STACK_OVERFLOW:
 521 -        msg << "STACK_OVERFLOW: This command would cause a stack overflow.";
 522 -        break;
 523 -      case GL_STACK_UNDERFLOW:
 524 -        msg << "STACK_UNDERFLOW: This command would cause a stack underflow.";
 525 -        break;
 526 -      case GL_OUT_OF_MEMORY:
 527 -        msg << "OUT_OF_MEMORY: There is not enough memory left to execute the "
 528 -               "command.";
 529 -        break;
 530 -#ifdef GL_TABLE_TOO_LARGE
 531 -      case GL_TABLE_TOO_LARGE:
 532 -        msg << "TABLE_TOO_LARGE: table is too large";
 533 -        break;
 534 -#endif
 535 -      default:
 536 -        msg << "Unknown error (code " << error << ")";
 537 -    }
 538 -
 539 -    throw std::runtime_error(msg.str());
 540 -  }
 541 -#endif
 542 -}
 543 -
 544 -static inline void assert_gl(const char* message)
 545 -{
 546 -#ifdef DEBUG
 547 -  check_gl_error(message);
 548 -#else
 549 -  (void) message;
 550 -#endif
 551 -}
 552 +#define GLenum int
 553 +#define GLint int
 554 +#define GL_SRC_ALPHA 0
 555 +#define GL_ONE_MINUS_SRC_ALPHA 1
 556 +#define GL_RGBA 2
 557
 558  #endif
 559 diff -aur supertux/src/video/surface.cpp supertux-nogl/src/video/surface.cpp
 560 --- supertux/src/video/surface.cpp      2006-07-03 02:00:48.000000000 +0200
 561 +++ supertux-nogl/src/video/surface.cpp 2006-07-03 02:00:29.000000000 +0200
 562 @@ -28,6 +28,7 @@
 563
 564  #include <SDL.h>
 565  #include <SDL_image.h>
 566 +#include <SDL_rotozoom.h>
 567
 568  #include "gameconfig.hpp"
 569  #include "physfs/physfs_sdl.hpp"
 570 @@ -39,13 +40,13 @@
 571  {
 572    texture = texture_manager->get(file);
 573    texture->ref();
 574 -  uv_left = 0;
 575 -  uv_top = 0;
 576 -  uv_right = texture->get_uv_right();
 577 -  uv_bottom = texture->get_uv_bottom();
 578
 579 -  width = texture->get_image_width();
 580 -  height = texture->get_image_height();
 581 +  offsetx = 0;
 582 +  offsety = 0;
 583 +  width = static_cast<int>(texture->get_image_width());
 584 +  height = static_cast<int>(texture->get_image_height());
 585 +
 586 +  flipx = false;
 587  }
 588
 589  Surface::Surface(const std::string& file, int x, int y, int w, int h)
 590 @@ -53,15 +54,12 @@
 591    texture = texture_manager->get(file);
 592    texture->ref();
 593
 594 -  float tex_w = static_cast<float> (texture->get_width());
 595 -  float tex_h = static_cast<float> (texture->get_height());
 596 -  uv_left = static_cast<float>(x) / tex_w;
 597 -  uv_top = static_cast<float>(y) / tex_h;
 598 -  uv_right = static_cast<float>(x+w) / tex_w;
 599 -  uv_bottom = static_cast<float>(y+h) / tex_h;
 600 -
 601 +  offsetx = x;
 602 +  offsety = y;
 603    width = w;
 604    height = h;
 605 +
 606 +  flipx = false;
 607  }
 608
 609  Surface::Surface(const Surface& other)
 610 @@ -69,12 +67,12 @@
 611    texture = other.texture;
 612    texture->ref();
 613
 614 -  uv_left = other.uv_left;
 615 -  uv_top = other.uv_top;
 616 -  uv_right = other.uv_right;
 617 -  uv_bottom = other.uv_bottom;
 618 +  offsetx = other.offsetx;
 619 +  offsety = other.offsety;
 620    width = other.width;
 621    height = other.height;
 622 +
 623 +  flipx = other.flipx;
 624  }
 625
 626  const Surface&
 627 @@ -84,52 +82,33 @@
 628    texture->unref();
 629    texture = other.texture;
 630
 631 -  uv_left = other.uv_left;
 632 -  uv_top = other.uv_top;
 633 -  uv_right = other.uv_right;
 634 -  uv_bottom = other.uv_bottom;
 635 +  offsetx = other.offsetx;
 636 +  offsety = other.offsety;
 637    width = other.width;
 638    height = other.height;
 639
 640 +  flipx = other.flipx;
 641 +
 642    return *this;
 643  }
 644
 645  Surface::~Surface()
 646  {
 647    texture->unref();
 648 +
 649 +  for (std::list<TransformedSurface*>::iterator i = transformedSurfaces.begin(); i != transformedSurfaces.end(); i++) {
 650 +    SDL_FreeSurface((*i)->surface);
 651 +    delete (*i);
 652 +  }
 653  }
 654
 655  void
 656  Surface::hflip()
 657  {
 658 -  std::swap(uv_left, uv_right);
 659 -}
 660 -
 661 -static inline void intern_draw(float left, float top, float right, float bottom,                               float uv_left, float uv_top,
 662 -                               float uv_right, float uv_bottom,
 663 -                               DrawingEffect effect)
 664 -{
 665 -  if(effect & HORIZONTAL_FLIP)
 666 -    std::swap(uv_left, uv_right);
 667 -  if(effect & VERTICAL_FLIP) {
 668 -    std::swap(uv_top, uv_bottom);
 669 -  }
 670 -
 671 -  glBegin(GL_QUADS);
 672 -  glTexCoord2f(uv_left, uv_top);
 673 -  glVertex2f(left, top);
 674 -
 675 -  glTexCoord2f(uv_right, uv_top);
 676 -  glVertex2f(right, top);
 677 -
 678 -  glTexCoord2f(uv_right, uv_bottom);
 679 -  glVertex2f(right, bottom);
 680 -
 681 -  glTexCoord2f(uv_left, uv_bottom);
 682 -  glVertex2f(left, bottom);
 683 -  glEnd();
 684 +  flipx = !flipx;
 685  }
 686
 687 +/*
 688  static inline void intern_draw2(float left, float top, float right, float bottom,
 689                                  float uv_left, float uv_top,
 690                                  float uv_right, float uv_bottom,
 691 @@ -172,49 +151,77 @@
 692               left*sa + bottom*ca + center_y);
 693    glEnd();
 694  }
 695 +*/
 696
 697  void
 698 -Surface::draw(float x, float y, float alpha, float angle, DrawingEffect effect) const
 699 +Surface::draw(float x, float y, float alpha, float, DrawingEffect effect) const
 700  {
 701 -  glColor4f(1.0f, 1.0f, 1.0f, alpha);
 702 -  glBindTexture(GL_TEXTURE_2D, texture->get_handle());
 703 -
 704 -  intern_draw2(x, y,
 705 -               x + width, y + height,
 706 -               uv_left, uv_top, uv_right, uv_bottom,
 707 -               angle,
 708 -               effect);
 709 +  draw_part(0, 0, x, y, width, height, alpha, effect);
 710  }
 711
 712  void
 713  Surface::draw(float x, float y, float alpha, DrawingEffect effect) const
 714  {
 715 -  glColor4f(1.0f, 1.0f, 1.0f, alpha);
 716 -  glBindTexture(GL_TEXTURE_2D, texture->get_handle());
 717 -
 718 -  intern_draw(x, y,
 719 -              x + width, y + height,
 720 -              uv_left, uv_top, uv_right, uv_bottom, effect);
 721 +  draw_part(0, 0, x, y, width, height, alpha, effect);
 722  }
 723
 724  void
 725  Surface::draw_part(float src_x, float src_y, float dst_x, float dst_y,
 726 -                   float width, float height, float alpha,
 727 +                   float width, float height, float,
 728                     DrawingEffect effect) const
 729  {
 730 -  float uv_width = uv_right - uv_left;
 731 -  float uv_height = uv_bottom - uv_top;
 732 -
 733 -  float uv_left = this->uv_left + (uv_width * src_x) / this->width;
 734 -  float uv_top = this->uv_top + (uv_height * src_y) / this->height;
 735 -  float uv_right = this->uv_left + (uv_width * (src_x + width)) / this->width;
 736 -  float uv_bottom = this->uv_top + (uv_height * (src_y + height)) / this->height;
 737 -
 738 -  glColor4f(1.0f, 1.0f, 1.0f, alpha);
 739 -  glBindTexture(GL_TEXTURE_2D, texture->get_handle());
 740 -
 741 -  intern_draw(dst_x, dst_y,
 742 -              dst_x + width, dst_y + height,
 743 -              uv_left, uv_top, uv_right, uv_bottom, effect);
 744 +  //FIXME: support parameter "alpha"
 745 +  SDL_Surface* surface = texture->getSurface();
 746 +
 747 +  // get and check SDL_Surface
 748 +  if (surface == 0) {
 749 +    std::cerr << "Warning: Tried to draw NULL surface, skipped draw" << std::endl;
 750 +    return;
 751 +  }
 752 +
 753 +  SDL_Surface* transformedSurface = surface;
 754 +
 755 +  if (flipx) effect = HORIZONTAL_FLIP;
 756 +
 757 +  if (effect != NO_EFFECT) {
 758 +    transformedSurface = 0;
 759 +
 760 +    // check if we have this effect buffered
 761 +    for (std::list<TransformedSurface*>::const_iterator i = transformedSurfaces.begin(); i != transformedSurfaces.end(); i++) {
 762 +      if ((*i)->effect == effect) transformedSurface = (*i)->surface;
 763 +    }
 764 +
 765 +    // if not: transform and buffer
 766 +    if (!transformedSurface) {
 767 +      if (effect == HORIZONTAL_FLIP) transformedSurface = zoomSurface(surface, -1, 1, 0);
 768 +      if (effect == VERTICAL_FLIP) transformedSurface = zoomSurface(surface, 1, -1, 0);
 769 +      if (transformedSurface == 0) {
 770 +        std::cerr << "Warning: No known transformation applies to surface, skipped draw" << std::endl;
 771 +        return;
 772 +      }
 773 +      TransformedSurface* su = new TransformedSurface();
 774 +      su->surface = transformedSurface;
 775 +      su->effect = effect;
 776 +
 777 +      transformedSurfaces.push_front(su);
 778 +    }
 779 +  }
 780 +
 781 +  int ox = offsetx; if (effect == HORIZONTAL_FLIP) ox = static_cast<int>(surface->w) - (ox+static_cast<int>(width));
 782 +  int oy = offsety; if (effect == VERTICAL_FLIP) oy = static_cast<int>(surface->h) - (oy+static_cast<int>(height));
 783 +  // draw surface to screen
 784 +  SDL_Surface* screen = SDL_GetVideoSurface();
 785 +
 786 +  SDL_Rect srcRect;
 787 +  srcRect.x = static_cast<int>(ox+src_x);
 788 +  srcRect.y = static_cast<int>(oy+src_y);
 789 +  srcRect.w = static_cast<int>(width);
 790 +  srcRect.h = static_cast<int>(height);
 791 +
 792 +  SDL_Rect dstRect;
 793 +  dstRect.x = static_cast<int>(dst_x);
 794 +  dstRect.y = static_cast<int>(dst_y);
 795 +
 796 +  SDL_BlitSurface(transformedSurface, &srcRect, screen, &dstRect);
 797  }
 798
 799 diff -aur supertux/src/video/surface.hpp supertux-nogl/src/video/surface.hpp
 800 --- supertux/src/video/surface.hpp      2006-07-03 02:00:48.000000000 +0200
 801 +++ supertux-nogl/src/video/surface.hpp 2006-07-03 02:00:29.000000000 +0200
 802 @@ -20,7 +20,9 @@
 803  #ifndef __SURFACE_HPP__
 804  #define __SURFACE_HPP__
 805
 806 +#include <SDL_image.h>
 807  #include <string>
 808 +#include <list>
 809
 810  class ImageTexture;
 811
 812 @@ -35,6 +37,15 @@
 813  };
 814
 815  /**
 816 + * Helper class to buffer a pre-transformed SDL_Surface
 817 + */
 818 +class TransformedSurface {
 819 +    public:
 820 +       SDL_Surface* surface;
 821 +       DrawingEffect effect;
 822 +};
 823 +
 824 +/**
 825   * A rectangular image.
 826   * The class basically holds a reference to a texture with additional UV
 827   * coordinates that specify a rectangular area on this texture
 828 @@ -46,19 +57,26 @@
 829    friend class Font;
 830    ImageTexture* texture;
 831
 832 -  float uv_left;
 833 -  float uv_top;
 834 -  float uv_right;
 835 -  float uv_bottom;
 836 +  bool flipx;
 837
 838 +  /** draw the surface on the screen, applying a ::DrawingEffect on-the-fly. Transformed Surfaces will be cached in ::transformedSurfaces */
 839    void draw(float x, float y, float alpha, float angle, DrawingEffect effect) const;
 840 +
 841 +  /** draw the surface on the screen, applying a ::DrawingEffect on-the-fly. Transformed Surfaces will be cached in ::transformedSurfaces */
 842    void draw(float x, float y, float alpha, DrawingEffect effect) const;
 843 +
 844 +  /** draw the surface on the screen, applying a ::DrawingEffect on-the-fly. Transformed Surfaces will be cached in ::transformedSurfaces */
 845    void draw_part(float src_x, float src_y, float dst_x, float dst_y,
 846                   float width, float height,
 847                   float alpha, DrawingEffect effect) const;
 848
 849 -  float width;
 850 -  float height;
 851 +  int offsetx; /**< Region in ::surface to be used for blitting */
 852 +  int offsety; /**< Region in ::surface to be used for blitting */
 853 +  int width;   /**< Region in ::surface to be used for blitting */
 854 +  int height;  /**< Region in ::surface to be used for blitting */
 855 +
 856 +  mutable std::list<TransformedSurface*> transformedSurfaces; /**< Cache for pre-transformed surfaces */
 857 +
 858  public:
 859    Surface(const std::string& file);
 860    Surface(const std::string& file, int x, int y, int w, int h);
 861 diff -aur supertux/src/video/texture.cpp supertux-nogl/src/video/texture.cpp
 862 --- supertux/src/video/texture.cpp      2006-07-03 02:00:48.000000000 +0200
 863 +++ supertux-nogl/src/video/texture.cpp 2006-07-03 02:00:29.000000000 +0200
 864 @@ -21,7 +21,6 @@
 865
 866  #include "texture.hpp"
 867
 868 -#include <GL/gl.h>
 869  #include <assert.h>
 870  #include "glutil.hpp"
 871
 872 @@ -30,81 +29,37 @@
 873    return (v & (v-1)) == 0;
 874  }
 875
 876 -Texture::Texture(unsigned int w, unsigned int h, GLenum glformat)
 877 +Texture::Texture(unsigned int w, unsigned int h, GLenum)
 878  {
 879    assert(is_power_of_2(w));
 880    assert(is_power_of_2(h));
 881
 882    this->width = w;
 883    this->height = h;
 884 -
 885 -  assert_gl("before creating texture");
 886 -  glGenTextures(1, &handle);
 887 -
 888 -  try {
 889 -    glBindTexture(GL_TEXTURE_2D, handle);
 890 -
 891 -    glTexImage2D(GL_TEXTURE_2D, 0, glformat, width, height, 0, GL_RGBA,
 892 -                 GL_UNSIGNED_BYTE, 0);
 893 -
 894 -    set_texture_params();
 895 -  } catch(...) {
 896 -    glDeleteTextures(1, &handle);
 897 -    throw;
 898 -  }
 899 +
 900 +  surface = 0;
 901  }
 902
 903 -Texture::Texture(SDL_Surface* image, GLenum glformat)
 904 +Texture::Texture(SDL_Surface* image, GLenum)
 905  {
 906    const SDL_PixelFormat* format = image->format;
 907    if(!is_power_of_2(image->w) || !is_power_of_2(image->h))
 908      throw std::runtime_error("image has no power of 2 size");
 909    if(format->BitsPerPixel != 24 && format->BitsPerPixel != 32)
 910      throw std::runtime_error("image has no 24 or 32 bit color depth");
 911 -
 912 +
 913    this->width = image->w;
 914    this->height = image->h;
 915
 916 -  assert_gl("before creating texture");
 917 -  glGenTextures(1, &handle);
 918 -
 919 -  try {
 920 -    GLenum sdl_format;
 921 -    if(format->BytesPerPixel == 3)
 922 -      sdl_format = GL_RGB;
 923 -    else if(format->BytesPerPixel == 4)
 924 -      sdl_format = GL_RGBA;
 925 -    else
 926 -      assert(false);
 927 -
 928 -    glBindTexture(GL_TEXTURE_2D, handle);
 929 -    glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
 930 -    glPixelStorei(GL_UNPACK_ROW_LENGTH, image->pitch/format->BytesPerPixel);
 931 -    glTexImage2D(GL_TEXTURE_2D, 0, glformat, width, height, 0, sdl_format,
 932 -            GL_UNSIGNED_BYTE, image->pixels);
 933 -
 934 -    assert_gl("creating texture");
 935 -
 936 -    set_texture_params();
 937 -  } catch(...) {
 938 -    glDeleteTextures(1, &handle);
 939 -    throw;
 940 -  }
 941 +  surface = SDL_DisplayFormatAlpha(image);
 942  }
 943
 944  Texture::~Texture()
 945  {
 946 -  glDeleteTextures(1, &handle);
 947  }
 948
 949  void
 950  Texture::set_texture_params()
 951  {
 952 -  glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
 953 -  glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
 954 -  glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP);
 955 -  glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP);
 956 -
 957 -  assert_gl("set texture params");
 958  }
 959
 960 diff -aur supertux/src/video/texture.hpp supertux-nogl/src/video/texture.hpp
 961 --- supertux/src/video/texture.hpp      2006-07-03 02:00:48.000000000 +0200
 962 +++ supertux-nogl/src/video/texture.hpp 2006-07-03 02:00:29.000000000 +0200
 963 @@ -21,7 +21,7 @@
 964  #define __TEXTURE_HPP__
 965
 966  #include <SDL.h>
 967 -#include <GL/gl.h>
 968 +#include "glutil.hpp"
 969
 970  /**
 971   * This class is a wrapper around a texture handle. It stores the texture width
 972 @@ -31,8 +31,9 @@
 973  class Texture
 974  {
 975  protected:
 976 +  SDL_Surface* surface; /**< non-GL branch stores optimized surface */
 977 +
 978    friend class TextureManager;
 979 -  GLuint handle;
 980    unsigned int width;
 981    unsigned int height;
 982
 983 @@ -41,11 +42,6 @@
 984    Texture(SDL_Surface* surface, GLenum glformat);
 985    virtual ~Texture();
 986
 987 -  GLuint get_handle() const
 988 -  {
 989 -    return handle;
 990 -  }
 991 -
 992    unsigned int get_width() const
 993    {
 994      return width;
 995 @@ -56,6 +52,14 @@
 996      return height;
 997    }
 998
 999 +  SDL_Surface* getSurface() {
1000 +    return surface;
1001 +  }
1002 +
1003 +  void setSurface(SDL_Surface* surface) {
1004 +    this->surface = surface;
1005 +  }
1006 +
1007  private:
1008    void set_texture_params();
1009  };
1010 diff -aur supertux/src/video/texture_manager.cpp supertux-nogl/src/video/texture_manager.cpp
1011 --- supertux/src/video/texture_manager.cpp      2006-07-03 02:00:48.000000000 +0200
1012 +++ supertux-nogl/src/video/texture_manager.cpp 2006-07-03 02:00:29.000000000 +0200
1013 @@ -24,8 +24,6 @@
1014  #include <assert.h>
1015  #include <SDL.h>
1016  #include <SDL_image.h>
1017 -#include <GL/gl.h>
1018 -#include <GL/glext.h>
1019  #include <iostream>
1020  #include <sstream>
1021  #include <stdexcept>
1022 @@ -145,12 +143,6 @@
1023  void
1024  TextureManager::save_textures()
1025  {
1026 -  glPixelStorei(GL_PACK_ROW_LENGTH, 0);
1027 -  glPixelStorei(GL_PACK_IMAGE_HEIGHT, 0);
1028 -  glPixelStorei(GL_PACK_SKIP_PIXELS, 0);
1029 -  glPixelStorei(GL_PACK_SKIP_ROWS, 0);
1030 -  glPixelStorei(GL_PACK_SKIP_IMAGES, 0);
1031 -  glPixelStorei(GL_PACK_ALIGNMENT, 1);
1032    for(Textures::iterator i = textures.begin(); i != textures.end(); ++i) {
1033      save_texture(*i);
1034    }
1035 @@ -165,75 +157,16 @@
1036  {
1037    SavedTexture saved_texture;
1038    saved_texture.texture = texture;
1039 -  glBindTexture(GL_TEXTURE_2D, texture->get_handle());
1040 -  glGetTexLevelParameteriv(GL_TEXTURE_2D, 0, GL_TEXTURE_WIDTH,
1041 -                           &saved_texture.width);
1042 -  glGetTexLevelParameteriv(GL_TEXTURE_2D, 0, GL_TEXTURE_HEIGHT,
1043 -                           &saved_texture.height);
1044 -  glGetTexLevelParameteriv(GL_TEXTURE_2D, 0, GL_TEXTURE_BORDER,
1045 -                           &saved_texture.border);
1046 -  glGetTexParameteriv(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER,
1047 -                      &saved_texture.min_filter);
1048 -  glGetTexParameteriv(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER,
1049 -                      &saved_texture.mag_filter);
1050 -  glGetTexParameteriv(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S,
1051 -                      &saved_texture.wrap_s);
1052 -  glGetTexParameteriv(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T,
1053 -                      &saved_texture.wrap_t);
1054
1055    size_t pixelssize = saved_texture.width * saved_texture.height * 4;
1056    saved_texture.pixels = new char[pixelssize];
1057 -
1058 -  glGetTexImage(GL_TEXTURE_2D, 0, GL_RGBA, GL_UNSIGNED_BYTE,
1059 -                saved_texture.pixels);
1060
1061    saved_textures.push_back(saved_texture);
1062 -
1063 -  glDeleteTextures(1, &(texture->handle));
1064 -  texture->handle = 0;
1065 -
1066 -  assert_gl("retrieving texture for save");
1067  }
1068
1069  void
1070  TextureManager::reload_textures()
1071  {
1072 -  glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);
1073 -  glPixelStorei(GL_UNPACK_IMAGE_HEIGHT, 0);
1074 -  glPixelStorei(GL_UNPACK_SKIP_PIXELS, 0);
1075 -  glPixelStorei(GL_UNPACK_SKIP_ROWS, 0);
1076 -  glPixelStorei(GL_UNPACK_SKIP_IMAGES, 0);
1077 -  glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
1078 -
1079 -  for(std::vector<SavedTexture>::iterator i = saved_textures.begin();
1080 -      i != saved_textures.end(); ++i) {
1081 -    SavedTexture& saved_texture = *i;
1082 -
1083 -    GLuint handle;
1084 -    glGenTextures(1, &handle);
1085 -    assert_gl("creating texture handle");
1086 -
1087 -    glBindTexture(GL_TEXTURE_2D, handle);
1088 -    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA,
1089 -                 saved_texture.width, saved_texture.height,
1090 -                 saved_texture.border, GL_RGBA,
1091 -                 GL_UNSIGNED_BYTE, saved_texture.pixels);
1092 -    delete[] saved_texture.pixels;
1093 -    assert_gl("uploading texture pixel data");
1094 -
1095 -    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER,
1096 -                    saved_texture.min_filter);
1097 -    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER,
1098 -                    saved_texture.mag_filter);
1099 -    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S,
1100 -                    saved_texture.wrap_s);
1101 -    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T,
1102 -                    saved_texture.wrap_t);
1103 -
1104 -    assert_gl("setting texture_params");
1105 -    saved_texture.texture->handle = handle;
1106 -  }
1107 -
1108    saved_textures.clear();
1109  }
1110
1111 diff -aur supertux/src/video/texture_manager.hpp supertux-nogl/src/video/texture_manager.hpp
1112 --- supertux/src/video/texture_manager.hpp      2006-07-03 02:00:48.000000000 +0200
1113 +++ supertux-nogl/src/video/texture_manager.hpp 2006-07-03 02:00:29.000000000 +0200
1114 @@ -20,7 +20,7 @@
1115  #ifndef __IMAGE_TEXTURE_MANAGER_HPP__
1116  #define __IMAGE_TEXTURE_MANAGER_HPP__
1117
1118 -#include <GL/gl.h>
1119 +#include "video/glutil.hpp"
1120  #include <string>
1121  #include <vector>
1122  #include <map>