X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fobject%2Fdisplay_effect.cpp;h=c2b1538d6fb17503dd387e11d71b20fb14b5980e;hb=f3e5e57c9996168a4889ae8e195be25f8b7e629b;hp=3c3bc4c5d74af794ae3cd538d7f53ec2ea433153;hpb=071c31e7fcf8bfbd00ec8d7d19313d7f6e433885;p=supertux.git

diff --git a/src/object/display_effect.cpp b/src/object/display_effect.cpp
index 3c3bc4c5d..c2b1538d6 100644
--- a/src/object/display_effect.cpp
+++ b/src/object/display_effect.cpp
@@ -3,12 +3,16 @@
 
 #include <assert.h>
 #include "video/drawing_context.hpp"
+#include "scripting/wrapper_util.hpp"
 #include "main.hpp"
 
+static const float BORDER_SIZE = 75;
+
 DisplayEffect::DisplayEffect()
-    : type(NO_FADE), fadetime(0), fading(0), black(false)
+    : screen_fade(NO_FADE), screen_fadetime(0), screen_fading(0),
+      border_fade(NO_FADE), border_fadetime(0), border_size(0),
+      black(false), borders(false)
 {
-  cutscene_borders = false;
 }
 
 DisplayEffect::~DisplayEffect()
@@ -16,27 +20,67 @@ DisplayEffect::~DisplayEffect()
 }
 
 void
+DisplayEffect::expose(HSQUIRRELVM vm, int table_idx)
+{
+  Scripting::DisplayEffect* interface = static_cast<Scripting::DisplayEffect*> (this);
+  expose_object(vm, table_idx, interface, "Effect", false);
+}
+
+void
+DisplayEffect::unexpose(HSQUIRRELVM vm, int table_idx)
+{
+  try {
+    Scripting::unexpose_object(vm, table_idx, "Effect");
+  } catch(...) {
+    // for now...
+  }
+}
+
+void
 DisplayEffect::update(float elapsed_time)
 {
-    switch(type) {
+    switch(screen_fade) {
         case NO_FADE:
-            return;
+            break;
         case FADE_IN:
-            fading -= elapsed_time;
-            if(fading < 0) {
-                type = NO_FADE;
+            screen_fading -= elapsed_time;
+            if(screen_fading < 0) {
+                screen_fade = NO_FADE;
             }
             break;
         case FADE_OUT:
-            fading -= elapsed_time;
-            if(fading < 0) {
-                type = NO_FADE;
+            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);
+    }       
 }
 
 void
@@ -45,19 +89,17 @@ DisplayEffect::draw(DrawingContext& context)
     context.push_transform();
     context.set_translation(Vector(0, 0));
 
-    if(black || type != NO_FADE) {    
-      uint8_t alpha;
+    if(black || screen_fade != NO_FADE) {    
+      float alpha;
       if(black) {
-          alpha = 255;
+          alpha = 1.0f;
       } else {
-          switch(type) {
+          switch(screen_fade) {
               case FADE_IN:
-                  alpha = static_cast<uint8_t>
-                      (fading * 255.0 / fadetime);
+                  alpha = screen_fading / screen_fadetime;
                   break;
               case FADE_OUT:
-                  alpha = static_cast<uint8_t>
-                      ((fadetime-fading) * 255.0 / fadetime);
+                  alpha = (screen_fadetime - screen_fading) / screen_fadetime;
                   break;
               default:
                   alpha = 0;
@@ -68,11 +110,11 @@ DisplayEffect::draw(DrawingContext& context)
               Color(0, 0, 0, alpha), LAYER_GUI-10);
     }
 
-    if (cutscene_borders) {
-      context.draw_filled_rect(Vector(0, 0), Vector(SCREEN_WIDTH, 75),
-              Color(0, 0, 0, 255), LAYER_GUI-10);
-      context.draw_filled_rect(Vector(0, SCREEN_HEIGHT - 75), Vector(SCREEN_WIDTH, 75),
-              Color(0, 0, 0, 255), 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();
@@ -82,18 +124,18 @@ void
 DisplayEffect::fade_out(float fadetime)
 {
     black = false;
-    this->fadetime = fadetime;
-    fading = fadetime;
-    type = FADE_OUT;
+    screen_fadetime = fadetime;
+    screen_fading = fadetime;
+    screen_fade = FADE_OUT;
 }
 
 void
 DisplayEffect::fade_in(float fadetime)
 {
     black = false;
-    this->fadetime = fadetime;
-    fading = fadetime;
-    type = FADE_IN;
+    this->screen_fadetime = fadetime;
+    screen_fading = fadetime;
+    screen_fade = FADE_IN;
 }
 
 void
@@ -109,13 +151,30 @@ DisplayEffect::is_black()
 }
 
 void
-DisplayEffect::sixteen_to_nine()
+DisplayEffect::sixteen_to_nine(float fadetime)
 {
-  cutscene_borders = true;
+  if(fadetime == 0) {
+    borders = true;
+    border_size = BORDER_SIZE;
+  } else {
+    borders = true;
+    border_size = 0;
+    border_fade = FADE_IN;
+    border_fadetime = fadetime;
+    border_fading = border_fadetime;
+  }
 }
 
 void
-DisplayEffect::four_to_three()
+DisplayEffect::four_to_three(float fadetime)
 {
-  cutscene_borders = false;
+  if(fadetime == 0) {
+    borders = false;
+  } else {
+    border_size = BORDER_SIZE;
+    border_fade = FADE_OUT;
+    border_fadetime = fadetime;
+    border_fading = border_fadetime;
+  }
 }
+