X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fobject%2Fdisplay_effect.cpp;h=e884a2b33962c4164b16709dc0c741bf5a7adc03;hb=9af7ca781183b7d57410e5cd3b8bc7f8128ed1b0;hp=1667315c17a24c94931f443ed4703acb722b3677;hpb=07ddaed2a657e4d2a3d038fed223fc5827159caf;p=supertux.git diff --git a/src/object/display_effect.cpp b/src/object/display_effect.cpp index 1667315c1..e884a2b33 100644 --- a/src/object/display_effect.cpp +++ b/src/object/display_effect.cpp @@ -1,12 +1,10 @@ -// $Id$ -// // SuperTux // Copyright (C) 2006 Matthias Braun // -// 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 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 3 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 @@ -14,24 +12,28 @@ // 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. +// along with this program. If not, see . -#include -#include "display_effect.hpp" +#include "object/display_effect.hpp" -#include +#include "scripting/squirrel_util.hpp" +#include "supertux/globals.hpp" #include "video/drawing_context.hpp" -#include "scripting/wrapper_util.hpp" -#include "main.hpp" static const float BORDER_SIZE = 75; -DisplayEffect::DisplayEffect() - : screen_fade(NO_FADE), screen_fadetime(0), screen_fading(0), - border_fade(NO_FADE), border_fadetime(0), border_size(0), - black(false), borders(false) +DisplayEffect::DisplayEffect(const std::string& name_) : + screen_fade(NO_FADE), + screen_fadetime(0), + screen_fading(0), + border_fade(NO_FADE), + border_fadetime(0), + border_fading(), + border_size(0), + black(false), + borders(false) { + this->name = name_; } DisplayEffect::~DisplayEffect() @@ -39,134 +41,131 @@ DisplayEffect::~DisplayEffect() } void -DisplayEffect::expose(HSQUIRRELVM vm, int table_idx) +DisplayEffect::expose(HSQUIRRELVM vm, SQInteger table_idx) { - Scripting::DisplayEffect* interface = static_cast (this); - expose_object(vm, table_idx, interface, "Effect", false); + if (name.empty()) return; + expose_object(vm, table_idx, dynamic_cast(this), name, false); } void -DisplayEffect::unexpose(HSQUIRRELVM vm, int table_idx) +DisplayEffect::unexpose(HSQUIRRELVM vm, SQInteger table_idx) { - try { - Scripting::unexpose_object(vm, table_idx, "Effect"); - } catch(...) { - // for now... - } + if (name.empty()) return; + scripting::unexpose_object(vm, table_idx, name); } void DisplayEffect::update(float elapsed_time) { - switch(screen_fade) { - case NO_FADE: - break; - case FADE_IN: - screen_fading -= elapsed_time; - if(screen_fading < 0) { - screen_fade = NO_FADE; - } - break; - case FADE_OUT: - screen_fading -= elapsed_time; - if(screen_fading < 0) { - screen_fade = NO_FADE; - black = true; - } - break; - default: - assert(false); - } + switch(screen_fade) { + case NO_FADE: + break; + case FADE_IN: + screen_fading -= elapsed_time; + if(screen_fading < 0) { + screen_fade = NO_FADE; + } + break; + case FADE_OUT: + screen_fading -= elapsed_time; + if(screen_fading < 0) { + screen_fade = NO_FADE; + black = true; + } + break; + default: + assert(false); + } - switch(border_fade) { - case NO_FADE: - break; - case FADE_IN: - border_fading -= elapsed_time; - if(border_fading < 0) { - border_fade = NO_FADE; - } - border_size = border_fading / border_fading * BORDER_SIZE; - break; - case FADE_OUT: - border_fading -= elapsed_time; - if(border_fading < 0) { - borders = false; - border_fade = NO_FADE; - } - border_size = (border_fadetime - border_fading) - / border_fadetime * BORDER_SIZE; - break; - default: - assert(false); - } + switch(border_fade) { + case NO_FADE: + break; + case FADE_IN: + border_fading -= elapsed_time; + if(border_fading < 0) { + border_fade = NO_FADE; + } + border_size = (border_fadetime - border_fading) + / border_fadetime * BORDER_SIZE; + break; + case FADE_OUT: + border_fading -= elapsed_time; + if(border_fading < 0) { + borders = false; + border_fade = NO_FADE; + } + border_size = border_fading / border_fadetime * BORDER_SIZE; + break; + default: + assert(false); + } } void DisplayEffect::draw(DrawingContext& context) { - context.push_transform(); - context.set_translation(Vector(0, 0)); - - if(black || screen_fade != NO_FADE) { - float alpha; - if(black) { - alpha = 1.0f; - } else { - switch(screen_fade) { - case FADE_IN: - alpha = screen_fading / screen_fadetime; - break; - case FADE_OUT: - alpha = (screen_fadetime - screen_fading) / screen_fadetime; - break; - default: - alpha = 0; - assert(false); - } + context.push_transform(); + context.set_translation(Vector(0, 0)); + + if(black || screen_fade != NO_FADE) { + float alpha; + if(black) { + alpha = 1.0f; + } else { + switch(screen_fade) { + case FADE_IN: + alpha = screen_fading / screen_fadetime; + break; + case FADE_OUT: + alpha = (screen_fadetime - screen_fading) / screen_fadetime; + break; + default: + alpha = 0; + assert(false); } - context.draw_filled_rect(Vector(0, 0), Vector(SCREEN_WIDTH, SCREEN_HEIGHT), - Color(0, 0, 0, alpha), LAYER_GUI-10); } + context.draw_filled_rect(Vector(0, 0), Vector(SCREEN_WIDTH, SCREEN_HEIGHT), + Color(0, 0, 0, alpha), LAYER_GUI-10); + } - if (borders) { - context.draw_filled_rect(Vector(0, 0), Vector(SCREEN_WIDTH, border_size), - Color(0, 0, 0, 1.0f), LAYER_GUI-10); - context.draw_filled_rect(Vector(0, SCREEN_HEIGHT - border_size), Vector(SCREEN_WIDTH, border_size), - Color(0, 0, 0, 1.0f), LAYER_GUI-10); - } + if (borders) { + context.draw_filled_rect(Vector(0, 0), Vector(SCREEN_WIDTH, border_size), + Color(0, 0, 0, 1.0f), LAYER_GUI-10); + context.draw_filled_rect(Vector(0, SCREEN_HEIGHT - border_size), Vector(SCREEN_WIDTH, border_size), + Color(0, 0, 0, 1.0f), LAYER_GUI-10); + } - context.pop_transform(); + context.pop_transform(); } void DisplayEffect::fade_out(float fadetime) { - black = false; - screen_fadetime = fadetime; - screen_fading = fadetime; - screen_fade = FADE_OUT; + black = false; + screen_fadetime = fadetime; + screen_fading = fadetime; + screen_fade = FADE_OUT; } void DisplayEffect::fade_in(float fadetime) { - black = false; - this->screen_fadetime = fadetime; - screen_fading = fadetime; - screen_fade = FADE_IN; + black = false; + this->screen_fadetime = fadetime; + screen_fading = fadetime; + screen_fade = FADE_IN; } void DisplayEffect::set_black(bool enabled) { - black = enabled; + black = enabled; } bool DisplayEffect::is_black() { - return black; + return black; } void @@ -197,3 +196,4 @@ DisplayEffect::four_to_three(float fadetime) } } +/* EOF */