X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fobject%2Fdisplay_effect.cpp;h=acf52bfc4a8e0ca6938b8eed5271ad173511ae84;hb=fea3446f05e1e7673607b835c269d3e8d1929ab3;hp=88a17d11cce5da13c11bfcd05a3b1e3e509f4650;hpb=fe138b9ec292ca9679b43cf5c4555f0193bab25d;p=supertux.git

diff --git a/src/object/display_effect.cpp b/src/object/display_effect.cpp
index 88a17d11c..acf52bfc4 100644
--- a/src/object/display_effect.cpp
+++ b/src/object/display_effect.cpp
@@ -27,11 +27,12 @@
 
 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(std::string name)
+  : screen_fade(NO_FADE), screen_fadetime(0), screen_fading(0),
+    border_fade(NO_FADE), border_fadetime(0), border_size(0), black(false),
+    borders(false)
 {
+  this->name = name;
 }
 
 DisplayEffect::~DisplayEffect()
@@ -41,132 +42,129 @@ DisplayEffect::~DisplayEffect()
 void
 DisplayEffect::expose(HSQUIRRELVM vm, SQInteger table_idx)
 {
-  Scripting::DisplayEffect* interface = static_cast<Scripting::DisplayEffect*> (this);
-  expose_object(vm, table_idx, interface, "Effect", false);
+  if (name.empty()) return;
+  expose_object(vm, table_idx, dynamic_cast<Scripting::DisplayEffect *>(this), name, false);
 }
 
 void
 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
@@ -196,4 +194,3 @@ DisplayEffect::four_to_three(float fadetime)
     border_fading = border_fadetime;
   }
 }
-