[Gzz-commits] gzz Documentation/Manuscripts/Irregu/motion.png...

[Janne V. Kujala]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Janne V. Kujala <address@hidden>        02/12/01 18:21:37

Modified files:
        Documentation/Manuscripts/Irregu: motion.png 
        gfx/demo       : irregu4.py 

Log message:
        motion fig

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/Documentation/Manuscripts/Irregu/motion.png.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/demo/irregu4.py.diff?tr1=1.38&tr2=1.39&r1=text&r2=text

Patches:
Index: gzz/Documentation/Manuscripts/Irregu/motion.png
Index: gzz/gfx/demo/irregu4.py
diff -u gzz/gfx/demo/irregu4.py:1.38 gzz/gfx/demo/irregu4.py:1.39
--- gzz/gfx/demo/irregu4.py:1.38        Sun Dec  1 04:56:02 2002
+++ gzz/gfx/demo/irregu4.py     Sun Dec  1 18:21:37 2002
@@ -640,7 +640,7 @@
             self.initcode()
        elif k == "0":
            self.film()
-        elif k == "p":
+        elif k == "Print":
             makeScreenshots()
 
     def film(self):
@@ -783,25 +783,26 @@
 class StillMotionScene:
     def __init__(self, type = 0, flag = 0):
         self.scale = 700
-        self.x0, self.y0 = -.35, -.65
-        self.x1, self.y1 = .35, .65
+        self.x0, self.y0 = -.4, -.6
+        self.x1, self.y1 = .4, .6
         self.xs, self.ys = .6,.4
         self.a1 = 0
         self.flag = flag
 
         if flag == 1:
-            self.x0, self.y0 = -.35, -.65
-            self.x1, self.y1 = .35, .65
-            self.xs, self.ys = .6,.4
+            pass
+            #self.x0, self.y0 = -.35, -.65
+            #self.x1, self.y1 = .35, .65
+            #self.xs, self.ys = .6,.4
     
         shape = 10
-        if type == 1: shape = 7
-        texscale = 1
-        linewidth = 4
+        #if type == 1: shape = 7
+        texscale = 2
+        linewidth = 5
         refsize = 128
         scale_pow = 0
-        border0 = -.5 * ripple_scale * texscale
-        border1 = .5 * ripple_scale * texscale 
+        border0 = -.125 
+        border1 = .125 
         texslicing = 0.0
 
         if type == 1:
@@ -952,16 +953,16 @@
                                        self.scale * 1)
        vs.matcher.add(cs1, "1")
 
-        for i in 0,1,2,3:
+        for i in range(0,5):
             
             cs2 = vs.coords.affineCoordsys(
-                0, 0, self.x1 + .02 * i, self.y1,
+                0, 0, self.x1 + .015 * i, self.y1,
                 self.xs * cos(self.a1), self.ys * -sin(self.a1),
                 self.xs * sin(self.a1), self.ys * cos(self.a1) )
 
             vs.matcher.add(cs2, "2." + str(i))
 
-            alpha = (.2, .3, .6, 1)[i]
+            alpha = (.2, .4, .6, .8, 1)[i]
             if self.flag:
                 self.putedge2(vs, cs1, cs2, alpha)
             else:
@@ -986,26 +987,28 @@
     # other parameters are hardcoded
     # with if's in StillMotionScene class
 
-    if 0:
+    if 1:
         w.setLocation(0,0,1024,768)
         ## pre-computed angles
         #ps = StillMotionScene(type = "0b", flag = 1)
         #r(ps, "shots/motion0b.png")
 
-        ps = StillMotionScene(type = 0)
+        #ps = StillMotionScene(type = 0)
+        #r(ps, "shots/motion.png")
+        ps = StillMotionScene(type = 1)
         r(ps, "shots/motion.png")
 
-        ps = StillMotionScene(type = 0, flag = 1)
-        r(ps, "shots/motion0.png")
-        ps = StillMotionScene(type = 1, flag = 1)
-        r(ps, "shots/motion1.png")
-
-        if globals().has_key("texHILO"):
-            ps = StillMotionScene(type = 2, flag = 2)
-            r(ps, "shots/motion2.png")
+        #ps = StillMotionScene(type = 0, flag = 1)
+        #r(ps, "shots/motion0.png")
+        #ps = StillMotionScene(type = 1, flag = 1)
+        #r(ps, "shots/motion1.png")
+
+        #if globals().has_key("texHILO"):
+        #    ps = StillMotionScene(type = 2, flag = 2)
+        #    r(ps, "shots/motion2.png")
 
 
-    if 1:
+    if 0:
         w.setLocation(0,0,600,600)
 
         ps = ShapeScene(type = 0)