I allways noticed that in the SDL mode, the gradient was sometimes different than...

[supertux.git] / src / screen.cpp

diff --git a/src/screen.cpp b/src/screen.cpp
index 88525ed..66248b3 100644 (file)
--- a/src/screen.cpp
+++ b/src/screen.cpp
@@ -1,15 +1,23 @@
-/*
-  screen.c
-  
-  Super Tux - Screen Functions
-  
-  by Bill Kendrick
-  bill@newbreedsoftware.com
-  http://www.newbreedsoftware.com/supertux/
-  
-  April 11, 2000 - March 15, 2004
-*/
-
+//  $Id$
+//
+//  SuperTux -  A Jump'n Run
+//  Copyright (C) 2000 Bill Kendrick <bill@newbreedsoftware.com>
+//
+//  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.
+//
+//  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 <iostream>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -64,21 +72,24 @@ void drawgradient(Color top_clr, Color bot_clr)
       glBegin(GL_QUADS);
       glColor3ub(top_clr.red, top_clr.green, top_clr.blue);
       glVertex2f(0, 0);
-      glVertex2f(640, 0);
+      glVertex2f(screen->w, 0);
       glColor3ub(bot_clr.red, bot_clr.green, bot_clr.blue);
-      glVertex2f(640, 480);
-      glVertex2f(0, 480);
+      glVertex2f(screen->w, screen->h);
+      glVertex2f(0, screen->h);
       glEnd();
     }
   else
   {
 #endif
 
-    for(float y = 0; y < 480; y += 2)
-      fillrect(0, (int)y, 640, 2,
-                     (int)(((float)(top_clr.red-bot_clr.red)/(0-480)) * y + top_clr.red),
-                     (int)(((float)(top_clr.green-bot_clr.green)/(0-480)) * y + top_clr.green),
-                     (int)(((float)(top_clr.blue-bot_clr.blue)/(0-480)) * y + top_clr.blue), 255);
+//void fillrect(float x, float y, float w, float h, int r, int g, int b, int a)
+
+    for(float y = 0; y < screen->h; y += 2)
+      fillrect(0, (int)y, screen->w, 2,
+       (int)(((float)(top_clr.red-bot_clr.red)/(0-screen->h)) * y + top_clr.red),
+       (int)(((float)(top_clr.green-bot_clr.green)/(0-screen->h)) * y + top_clr.green),
+       (int)(((float)(top_clr.blue-bot_clr.blue)/(0-screen->h)) * y + top_clr.blue),
+       255);
 /* calculates the color for each line, based in the generic equation for functions: y = mx + b */
 
 #ifndef NOOPENGL
@@ -87,6 +98,48 @@ void drawgradient(Color top_clr, Color bot_clr)
 #endif
 }
 
+/* --- FADE IN --- */
+
+/** Fades the given surface into a black one. If fade_out is true, it will fade out, else
+it will fade in */
+
+void fade(Surface *surface, int seconds, bool fade_out);
+
+void fade(const std::string& surface, int seconds, bool fade_out)
+{
+Surface* sur = new Surface(datadir + surface, IGNORE_ALPHA);
+fade(sur, seconds, fade_out);
+delete sur;
+}
+
+void fade(Surface *surface, int seconds, bool fade_out)
+{
+float alpha;
+if (fade_out)
+  alpha = 0;
+else
+  alpha = 255;
+
+  int cur_time, old_time;
+  cur_time = SDL_GetTicks();
+
+  while(alpha >= 0 && alpha < 256)
+    {
+    surface->draw(0,0,(int)alpha);
+    flipscreen();
+
+    old_time = cur_time;
+    cur_time = SDL_GetTicks();
+
+    /* Calculate the next alpha value */
+    float calc = (float) ((cur_time - old_time) / seconds);
+    if(fade_out)
+      alpha += 255 * calc;
+    else
+      alpha -= 255 * calc;
+    }
+}
+
 /* 'Stolen' from the SDL documentation.
  * Set the pixel at (x, y) to the given value
  * NOTE: The surface must be locked before calling this!
@@ -307,6 +360,13 @@ void flipscreen(void)
     SDL_Flip(screen);
 }
 
+void fadeout()
+{
+  clearscreen(0, 0, 0);
+  white_text->draw_align("Loading...", screen->w/2, screen->h/2, A_HMIDDLE, A_TOP);
+  flipscreen();
+}
+
 void update_rect(SDL_Surface *scr, Sint32 x, Sint32 y, Sint32 w, Sint32 h)
 {
   if(!use_gl)