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

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Tuomas J. Lukka <address@hidden>        02/12/03 10:00:46

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

Log message:
        twids

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

Patches:
Index: gzz/TODO
diff -u gzz/TODO:1.432 gzz/TODO:1.433
--- gzz/TODO:1.432      Tue Dec  3 09:39:21 2002
+++ gzz/TODO    Tue Dec  3 10:00:45 2002
@@ -21,6 +21,7 @@
        + think about modeling textures
        + script to save 100 textures every day
     tjl, jvk:
+       + paper: small high-frequency components
        - paper: small high-frequency components
        + irregu
                - better sawnoise texture: less intermediate freqs
@@ -52,7 +53,8 @@
     mudyc:
        -fix documentation script
     tjl:        
-       - return ANKOS to Agora
+       - return ANKOS to Agora [ blocked by: waiting for trip to agora ]
+       - fix memleak in making movies
        - demo movie of irregu general stuff
        - demo movie of xupdf
        - irregu:
Index: gzz/gfx/anim/paper.py
diff -u gzz/gfx/anim/paper.py:1.3 gzz/gfx/anim/paper.py:1.4
--- gzz/gfx/anim/paper.py:1.3   Sun Dec  1 14:11:20 2002
+++ gzz/gfx/anim/paper.py       Tue Dec  3 10:00:46 2002
@@ -1,9 +1,10 @@
 
 from gfx.libutil import saveanim
 from math import exp
+import java
 
 # number of skipped frames
-dry = 1000
+dry = 0
 
 frame = 0
 
@@ -13,6 +14,7 @@
         saveanim.saveframe("tmpfilm/paper%03i.jpg" % frame, w)
     print "Frame", frame
     frame += 1
+    java.lang.System.gc()
 
 def saveframe(sc):
     vs = w.createVobScene()
@@ -37,9 +39,9 @@
         ps.seed = 199871850
         ps.initpaper()
 
-        for i in range(0,48):
+        for i in range(0,100):
             global zoom
-            zoom = 900 * exp((i * .03)**2)
+            zoom = 900 * exp((i * .015)**2)
             saveframe(ps)
 
     if 1:
@@ -47,9 +49,9 @@
 
         ps = PaperFlowScene()
         ps.pt.y0 -= .2
-        for i in range(0,48):
+        for i in range(0,100):
             ps.pt.x0 += .01
-            ps.pt.y0 += sin(i * .0005)
+            ps.pt.y0 += sin(i * .00025)
             saveframe(ps)
 
     if 1:
@@ -69,31 +71,31 @@
         ps.moveToCell(cells[1], 2, .5)
         ps.scene(vs2)
         
-        saveframes(vs1, vs2, 48); vs1 = vs2;
+        saveframes(vs1, vs2, 100); vs1 = vs2;
 
         vs2 = w.createVobScene()
         ps.moveToCell(cells[0], .5, .5)
         ps.scene(vs2)
 
-        saveframes(vs1, vs2, 48); vs1 = vs2;
+        saveframes(vs1, vs2, 100); vs1 = vs2;
 
         vs2 = w.createVobScene()
         ps.moveToCell(cells[0], 2, .5)
         ps.scene(vs2)
 
-        saveframes(vs1, vs2, 48); vs1 = vs2;
+        saveframes(vs1, vs2, 100); vs1 = vs2;
 
         vs2 = w.createVobScene()
         ps.moveToCell(cells[2], .5, .5)
         ps.scene(vs2)
 
-        saveframes(vs1, vs2, 48); vs1 = vs2;
+        saveframes(vs1, vs2, 100); vs1 = vs2;
 
         vs2 = w.createVobScene()
         ps.moveToCell(cells[2], 2, .5)
         ps.scene(vs2)
 
-        saveframes(vs1, vs2, 48); vs1 = vs2;
+        saveframes(vs1, vs2, 100); vs1 = vs2;
 
     if frame > dry:
         saveanim.encodefilm("tmpfilm/paper\\*.jpg", "paperfilm.avi")
Index: gzz/gzz/util/saveimage.py
diff -u gzz/gzz/util/saveimage.py:1.3 gzz/gzz/util/saveimage.py:1.4
--- gzz/gzz/util/saveimage.py:1.3       Sun Dec  1 14:11:20 2002
+++ gzz/gzz/util/saveimage.py   Tue Dec  3 10:00:46 2002
@@ -10,6 +10,8 @@
     f = FileOutputStream("img.tmp")
     SaveImage.writeBytesRGB(f, pixels)
     f.close()
+    print "To system"
     os.system("rawtoppm %(w)s %(h)s img.tmp | convert - %(filename)s" % 
locals())
+    print "Done system"
     #os.system("rawtoppm %(w)s %(h)s img.tmp | ppmtojpeg > %(filename)s" % 
locals())
     # ppmtojpeg is a bit faster than convert