Added copyright lines for files I've edited this year.

[synfig.git] / synfig-core / trunk / src / synfig / layer_motionblur.cpp

diff --git a/synfig-core/trunk/src/synfig/layer_motionblur.cpp b/synfig-core/trunk/src/synfig/layer_motionblur.cpp
index 236ef3a..59f90f7 100644 (file)
--- a/synfig-core/trunk/src/synfig/layer_motionblur.cpp
+++ b/synfig-core/trunk/src/synfig/layer_motionblur.cpp
@@ -1,11 +1,12 @@
 /* === S Y N F I G ========================================================= */
-/*!    \file layer_motionblur.h
-**     \brief Template Header
+/*!    \file layer_motionblur.cpp
+**     \brief Implementation of the "Motion Blur" layer
 **
-**     $Id: layer_motionblur.cpp,v 1.1.1.1 2005/01/04 01:23:14 darco Exp $
+**     $Id$
 **
 **     \legal
 **     Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**     Copyright (c) 2007, 2008 Chris Moore
 **
 **     This package is free software; you can redistribute it and/or
 **     modify it under the terms of the GNU General Public License as
@@ -51,11 +52,11 @@ using namespace std;
 /* === G L O B A L S ======================================================= */
 
 SYNFIG_LAYER_INIT(Layer_MotionBlur);
-SYNFIG_LAYER_SET_NAME(Layer_MotionBlur,"MotionBlur");
-SYNFIG_LAYER_SET_LOCAL_NAME(Layer_MotionBlur,_("Motion Blur"));
-SYNFIG_LAYER_SET_CATEGORY(Layer_MotionBlur,_("Blurs"));
+SYNFIG_LAYER_SET_NAME(Layer_MotionBlur,"MotionBlur"); // todo: use motion_blur
+SYNFIG_LAYER_SET_LOCAL_NAME(Layer_MotionBlur,N_("Motion Blur"));
+SYNFIG_LAYER_SET_CATEGORY(Layer_MotionBlur,N_("Blurs"));
 SYNFIG_LAYER_SET_VERSION(Layer_MotionBlur,"0.1");
-SYNFIG_LAYER_SET_CVS_ID(Layer_MotionBlur,"$Id: layer_motionblur.cpp,v 1.1.1.1 2005/01/04 01:23:14 darco Exp $");
+SYNFIG_LAYER_SET_CVS_ID(Layer_MotionBlur,"$Id$");
 
 /* === M E M B E R S ======================================================= */
 
@@ -128,7 +129,7 @@ Layer_MotionBlur::get_param_vocab()const
 bool
 Layer_MotionBlur::accelerated_render(Context context,Surface *surface,int quality, const RendDesc &renddesc, ProgressCallback *cb)const
 {
-       if(aperture && quality<10)
+       if(aperture && quality<=10)
        {
                //int x, y;
                SuperCallback subimagecb;
@@ -160,7 +161,7 @@ Layer_MotionBlur::accelerated_render(Context context,Surface *surface,int qualit
                                samples=3;
                                break;
                        case 9:
-                               samples=3;
+                               samples=2;
                                break;
                        case 10: // Rough Quality
             default:
@@ -169,8 +170,11 @@ Layer_MotionBlur::accelerated_render(Context context,Surface *surface,int qualit
 
                }
 
+               if (samples == 1) return context.accelerated_render(surface,quality,renddesc,cb);
+
                Surface tmp;
                int i;
+               float scale, divisor = 0;
 
                surface->set_wh(renddesc.get_w(),renddesc.get_h());
                surface->clear();
@@ -178,16 +182,18 @@ Layer_MotionBlur::accelerated_render(Context context,Surface *surface,int qualit
                for(i=0;i<samples;i++)
                {
                        subimagecb=SuperCallback(cb,i*(5000/samples),(i+1)*(5000/samples),5000);
-                       context.set_time(time_cur+(aperture/samples)*i-aperture*0.5);
+                       context.set_time(time_cur-(aperture*(samples-1-i)/(samples-1)));
                        if(!context.accelerated_render(&tmp,quality,renddesc,&subimagecb))
                                return false;
+                       scale = 1.0/(samples-i);
+                       divisor += scale;
                        for(int y=0;y<renddesc.get_h();y++)
                                for(int x=0;x<renddesc.get_w();x++)
-                                       (*surface)[y][x]+=tmp[y][x].premult_alpha();
+                                       (*surface)[y][x]+=tmp[y][x].premult_alpha()*scale;
                }
                for(int y=0;y<renddesc.get_h();y++)
                        for(int x=0;x<renddesc.get_w();x++)
-                               (*surface)[y][x]=((*surface)[y][x]/(float)samples).demult_alpha();
+                               (*surface)[y][x]=((*surface)[y][x]/divisor).demult_alpha();
        }
        else
                return context.accelerated_render(surface,quality,renddesc,cb);