[Gzz-commits] gzz gfx/anim/paper.py gzz/util/saveimage.py

[Janne V. Kujala]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Janne V. Kujala <address@hidden>        02/12/01 14:11:20

Modified files:
        gfx/anim       : paper.py 
        gzz/util       : saveimage.py 

Log message:
        animcode

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/anim/paper.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/util/saveimage.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text

Patches:
Index: gzz/gfx/anim/paper.py
diff -u gzz/gfx/anim/paper.py:1.2 gzz/gfx/anim/paper.py:1.3
--- gzz/gfx/anim/paper.py:1.2   Sun Dec  1 13:13:10 2002
+++ gzz/gfx/anim/paper.py       Sun Dec  1 14:11:20 2002
@@ -2,13 +2,14 @@
 from gfx.libutil import saveanim
 from math import exp
 
-dryrun = 1
+# number of skipped frames
+dry = 1000
 
 frame = 0
 
 def _saveframe(w):
     global frame
-    if not dryrun:
+    if frame > dry:
         saveanim.saveframe("tmpfilm/paper%03i.jpg" % frame, w)
     print "Frame", frame
     frame += 1
@@ -31,6 +32,7 @@
 
     if 1:
         execfile("gfx/demo/papertest.py", globals())
+        setFrame()
         ps = MultiPaperScene()
         ps.seed = 199871850
         ps.initpaper()
@@ -93,7 +95,7 @@
 
         saveframes(vs1, vs2, 48); vs1 = vs2;
 
-    if not dryrun:
+    if frame > dry:
         saveanim.encodefilm("tmpfilm/paper\\*.jpg", "paperfilm.avi")
 
 makeAnim()
Index: gzz/gzz/util/saveimage.py
diff -u gzz/gzz/util/saveimage.py:1.2 gzz/gzz/util/saveimage.py:1.3
--- gzz/gzz/util/saveimage.py:1.2       Fri Nov 15 03:11:44 2002
+++ gzz/gzz/util/saveimage.py   Sun Dec  1 14:11:20 2002
@@ -11,4 +11,5 @@
     SaveImage.writeBytesRGB(f, pixels)
     f.close()
     os.system("rawtoppm %(w)s %(h)s img.tmp | convert - %(filename)s" % 
locals())
-
+    #os.system("rawtoppm %(w)s %(h)s img.tmp | ppmtojpeg > %(filename)s" % 
locals())
+    # ppmtojpeg is a bit faster than convert