Nicer and longer fading.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30787 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/samples/splash/press.mpg b/samples/splash/press.mpg
index d185271d886ae75c4637df8bd0f68270bfa73ecb..ad349cf8cfe2c2554ed75a584cc47a413ebda405 100644 (file)
Binary files a/samples/splash/press.mpg and b/samples/splash/press.mpg differ

diff --git a/samples/splash/press.pov b/samples/splash/press.pov
index 093285781de6e8e0150adba28bf76d8c2263886f..78eeea89bb397015e6d1620885884e2a7efc0bd4 100644 (file)
--- a/samples/splash/press.pov
+++ b/samples/splash/press.pov
@@ -11,7 +11,9 @@
             
 #version 3.6;
 
             
 #version 3.6;
 

-// Rendering options : +FN +W80 +H60 +AM1 +A0.05 +R5 +J0 +KFF99
+// Rendering options : +FT +W80 +H60 +AM1 +A0.05 +R5 +J0 +KFF500
+// Produced TGA images converted to MPG with good old (1993) CMPEG tool
+// Conversion : cmpeg.exe -v1 ipb.ctl frames.lst press.mpg

 
 #include "colors.inc"
 #include "rad_def.inc"
 
 #include "colors.inc"
 #include "rad_def.inc"


@@ -58,18 +60,24 @@ camera{ orthographic look_at .5 location .5-z right 1.05*x up 1.05*y }
         #end
                 object{ Objects[ Counter ] }
             };
         #end
                 object{ Objects[ Counter ] }
             };

-    
-    #declare X0=Counter/(Items+1);
+
+    #declare Pause=0.1;    
+    #declare X0=(Counter+Pause)/(Items+2);

     #declare Y0=0;
     #declare Y0=0;

-    #declare X1=(Counter+1)/(Items+1);
+    #declare X1=(Counter+1)/(Items+2);

     #declare Y1=1;
     #declare Y1=1;

-    #declare X2=(Counter+2)/(Items+1);
+    #declare X2=(Counter+2-Pause)/(Items+2);

     #declare Y2=0;
 
     #declare Y2=0;
 

-    #declare increase=f_line(clock,X0,Y0,X1,Y1);    
-    #declare decrease=f_line(clock,X1,Y1,X2,Y2);    
+    #declare C1=f_line(clock,0,0,3/4,1);
+    #declare C2=(Items+1)/(Items+2);
+    #declare C3=f_line(clock,1/4,0,1,1);
+    #declare C=max(min(C1,C2),C3);
+    
+    #declare increase=f_line(C,X0,Y0,X1,Y1);    
+    #declare decrease=f_line(C,X1,Y1,X2,Y2);    

     #declare change=min(increase,decrease);
     #declare change=min(increase,decrease);

-    #declare level=max(change,0);
+    #declare level=min(max(change,0),1);

 
     object{
         Objects[ Counter ]
 
     object{
         Objects[ Counter ]