[Gzz-commits] gzz Documentation/Manuscripts/Irregu/Makefile D...

[Janne V. Kujala]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Janne V. Kujala <address@hidden>        02/12/01 03:04:33

Modified files:
        Documentation/Manuscripts/Irregu: Makefile irregu.tex 
                                          shape1Dcolor.png 
                                          shape1Ddispl.png 
                                          shape1Ddispltex.png 
                                          shape1Ddispltex_color.png 
                                          shape1Doffset.png 
                                          shape1Doffsettex.png 
                                          shape1Doffsettex_color.png 
                                          shape2D.png shape2Dorig.png 
        gfx/demo       : irregu4.py 
Added files:
        Documentation/Manuscripts/Irregu: shape1Dcolortex.png 

Log message:
        shape figs

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/Documentation/Manuscripts/Irregu/shape1Dcolortex.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/Documentation/Manuscripts/Irregu/Makefile.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/Documentation/Manuscripts/Irregu/irregu.tex.diff?tr1=1.129&tr2=1.130&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/Documentation/Manuscripts/Irregu/shape1Dcolor.png.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/Documentation/Manuscripts/Irregu/shape1Ddispl.png.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/Documentation/Manuscripts/Irregu/shape1Ddispltex.png.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/Documentation/Manuscripts/Irregu/shape1Ddispltex_color.png.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/Documentation/Manuscripts/Irregu/shape1Doffset.png.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/Documentation/Manuscripts/Irregu/shape1Doffsettex.png.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/Documentation/Manuscripts/Irregu/shape1Doffsettex_color.png.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/Documentation/Manuscripts/Irregu/shape2D.png.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/Documentation/Manuscripts/Irregu/shape2Dorig.png.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/demo/irregu4.py.diff?tr1=1.36&tr2=1.37&r1=text&r2=text

Patches:
Index: gzz/Documentation/Manuscripts/Irregu/Makefile
diff -u gzz/Documentation/Manuscripts/Irregu/Makefile:1.7 
gzz/Documentation/Manuscripts/Irregu/Makefile:1.8
--- gzz/Documentation/Manuscripts/Irregu/Makefile:1.7   Sun Dec  1 01:45:11 2002
+++ gzz/Documentation/Manuscripts/Irregu/Makefile       Sun Dec  1 03:04:33 2002
@@ -14,13 +14,13 @@
 motion.ps: motion.png 
        pngtopnm < motion.png | pnmtops -noturn -imagewidth 3 > motion.ps; 
 
-SHAPEPS = shape1Dcolor.ps shape1Ddispl.ps shape1Ddispltex.ps 
shape1Ddispltex_color.ps shape1Doffset.ps shape1Doffsettex.ps 
shape1Doffsettex_color.ps shape2D.ps shape2Dorig.ps
-SHAPEPNG = shape1Dcolor.png shape1Ddispl.png shape1Ddispltex.png 
shape1Ddispltex_color.png shape1Doffset.png shape1Doffsettex.png 
shape1Doffsettex_color.png shape2D.png shape2Dorig.png
+SHAPEPS = shape1Dcolor.ps shape1Dcolortex.ps shape1Ddispl.ps 
shape1Ddispltex.ps shape1Ddispltex_color.ps shape1Doffset.ps 
shape1Doffsettex.ps shape1Doffsettex_color.ps shape2D.ps shape2Dorig.ps
+SHAPEPNG = shape1Dcolor.png shape1Dcolortex.png shape1Ddispl.png 
shape1Ddispltex.png shape1Ddispltex_color.png shape1Doffset.png 
shape1Doffsettex.png shape1Doffsettex_color.png shape2D.png shape2Dorig.png
 
 $(SHAPEPS): $(SHAPEPNG) Makefile
        for file in $(SHAPEPNG); do \
                pngtopnm < motion.png | pnmtops -noturn -imagewidth 3 > 
motion.ps; \
-           pngtopnm <$$file | pnmtops -noturn -imagewidth .75  > `basename 
$$file .png`.ps; \
+           pngtopnm <$$file | pnmtops -noturn -imagewidth 1.3  > `basename 
$$file .png`.ps; \
        done
 
 
Index: gzz/Documentation/Manuscripts/Irregu/irregu.tex
diff -u gzz/Documentation/Manuscripts/Irregu/irregu.tex:1.129 
gzz/Documentation/Manuscripts/Irregu/irregu.tex:1.130
--- gzz/Documentation/Manuscripts/Irregu/irregu.tex:1.129       Sun Dec  1 
01:45:11 2002
+++ gzz/Documentation/Manuscripts/Irregu/irregu.tex     Sun Dec  1 03:04:33 2002
@@ -639,16 +639,19 @@
 
 \begin{figure}
 \centering
-\begin{tabular}{ccc}
-1) \includegraphics{shape2D.ps} &
-2) \includegraphics{shape2Dorig.ps} &
-3) \includegraphics{shape1Dcolor.ps} \\
-4) \includegraphics{shape1Ddispl.ps} &
-5) \includegraphics{shape1Ddispltex.ps} &
-6) \includegraphics{shape1Ddispltex_color.ps} \\
-7) \includegraphics{shape1Doffset.ps} &
-8) \includegraphics{shape1Doffsettex.ps} &
-9) \includegraphics{shape1Doffsettex_color.ps}
+\begin{tabular}{cc}
+a) \includegraphics{shape2D.ps} &
+b) \includegraphics{shape2Dorig.ps} \\
+
+c) \includegraphics{shape1Doffset.ps} &
+d) \includegraphics{shape1Doffsettex_color.ps} \\
+f) \includegraphics{shape1Dcolortex.ps} &
+e) \includegraphics{shape1Doffsettex.ps} \\
+
+g) \includegraphics{shape1Ddispl.ps} &
+h) \includegraphics{shape1Ddispltex_color.ps} \\
+j) \includegraphics{shape1Dcolor.ps} &
+i) \includegraphics{shape1Ddispltex.ps} 
 \end{tabular}
 
 \caption{
Index: gzz/Documentation/Manuscripts/Irregu/shape1Dcolor.png
Index: gzz/Documentation/Manuscripts/Irregu/shape1Ddispl.png
Index: gzz/Documentation/Manuscripts/Irregu/shape1Ddispltex.png
Index: gzz/Documentation/Manuscripts/Irregu/shape1Ddispltex_color.png
Index: gzz/Documentation/Manuscripts/Irregu/shape1Doffset.png
Index: gzz/Documentation/Manuscripts/Irregu/shape1Doffsettex.png
Index: gzz/Documentation/Manuscripts/Irregu/shape1Doffsettex_color.png
Index: gzz/Documentation/Manuscripts/Irregu/shape2D.png
Index: gzz/Documentation/Manuscripts/Irregu/shape2Dorig.png
Index: gzz/gfx/demo/irregu4.py
diff -u gzz/gfx/demo/irregu4.py:1.36 gzz/gfx/demo/irregu4.py:1.37
--- gzz/gfx/demo/irregu4.py:1.36        Sun Dec  1 02:11:07 2002
+++ gzz/gfx/demo/irregu4.py     Sun Dec  1 03:04:33 2002
@@ -337,7 +337,7 @@
                                   "color" : "0 0 0 0" }
 
         shape = self.shape
-        texscale = 1.0
+        texscale = 1
         linewidth = 2
         refsize = 128
         scale_pow = .5
@@ -652,7 +652,9 @@
     def key(self, k):
         pass
 
-    def __init__(self, type = 0, outer = 1, alphatest = 1, tex = 1, color = 1, 
inside = 1, xs = 600, ys = 600):
+    def __init__(self, type = 0, outer = 1, alphatest = 1, tex = 1, color = 1,
+                 inside = 1, xs = 600, ys = 600,
+                 dice = 16, wireframe = 0, border = 1):
         self.type = type
         self.outer = outer
         self.alphatest = alphatest
@@ -661,22 +663,25 @@
         self.color = color
         self.xs = xs
         self.ys = ys
+        self.dice = dice
+        self.wireframe = wireframe
+        self.border = border
     
     def scene(self, vs):
         putnoc(vs, background((1.0,1.0,1.0)))
 
-        solid = 0 #XXX: draw solid instead of only edge
+        solid = 1 #XXX: draw solid instead of only edge
 
         shape = 9
-        texscale = 1.3
+        texscale = 1.7
         linewidth = 4
         refsize = 128
         scale_pow = 0
         border0 = -.25
-        border1 = .25 
+        border1 = .25 * self.border
         texslicing = 0.0
 
-        dice = 1.0 / 36 * 16 + 1E-5
+        dice = 1.0 / 36 * self.dice + 1E-5
 
         code = stdcode
 
@@ -743,7 +748,7 @@
                 
         cs1 = vs.coords.affineCoordsys(0, 10,
                                        self.xs*.5, self.ys*.5,
-                                       self.xs * .4, 0, 0, self.ys * .4,
+                                       self.xs * .33, 0, 0, self.ys * .33,
                                        )
             
         vs.matcher.add(cs1, "1")
@@ -757,6 +762,24 @@
 
         vs.map.put(inner, cs1, cs2)
 
+        if self.wireframe:
+            vs.map.put(
+                GLRen.createIrregularEdge(
+            shape,
+            texscale, linewidth, refsize, scale_pow,
+            border0, border1, texslicing, "", "",
+            0, 0,
+            SLICE_2D, """
+            PushAttrib ENABLE_BIT POLYGON_BIT
+            PolygonMode FRONT_AND_BACK LINE
+            LineWidth 3
+            Disable TEXTURE_2D
+            Disable ALPHA_TEST
+            Disable DEPTH_TEST
+            Color 0 0 0
+            """, dice), cs1, cs2)
+
+
 class StillMotionScene:
     def __init__(self, type = 0, flag = 0):
         self.scale = 700
@@ -987,26 +1010,26 @@
 
         ps = ShapeScene(type = 0)
         r(ps, "shots/shape1Ddispl.png")
-        ps = ShapeScene(type = 0, outer = 0, inside = 0, color = 1, alphatest 
= 0, tex = 0)
+        ps = ShapeScene(type = 0, outer = 0, inside = 0, color = 1, alphatest 
= 0, tex = 0, wireframe = 1)
         r(ps, "shots/shape1Dcolor.png")
+        ps = ShapeScene(type = 0, outer = 0, inside = 0, color = 1, alphatest 
= 0, tex = 0, dice = 128, border = 2)
+        r(ps, "shots/shape1Dcolortex.png")
         ps = ShapeScene(type = 0, outer = 0, inside = 0, color = 1, alphatest 
= 0, tex = 1)
         r(ps, "shots/shape1Ddispltex_color.png")
         ps = ShapeScene(type = 0, outer = 0, inside = 0, color = 0, alphatest 
= 0, tex = 1)
         r(ps, "shots/shape1Ddispltex.png")
-        ps = ShapeScene(type = 1)
+        ps = ShapeScene(type = 1, border = 2)
         r(ps, "shots/shape1Doffset.png")
-        ps = ShapeScene(type = 1, outer = 0, inside = 0, color = 1, alphatest 
= 0, tex = 1)
+        ps = ShapeScene(type = 1, outer = 0, inside = 0, color = 1, alphatest 
= 0, tex = 1, border = 2)
         r(ps, "shots/shape1Doffsettex_color.png")
-        ps = ShapeScene(type = 1, outer = 0, inside = 0, color = 0, alphatest 
= 0, tex = 1)
+        ps = ShapeScene(type = 1, outer = 0, inside = 0, color = 0, alphatest 
= 0, tex = 1, border = 2)
         r(ps, "shots/shape1Doffsettex.png")
-        ps = ShapeScene(type = 2)
+        ps = ShapeScene(type = 2, border = 2)
         r(ps, "shots/shape2D.png")
-        ps = ShapeScene(type = 2, outer = 0)
+        ps = ShapeScene(type = 2, outer = 0, border = 2)
         r(ps, "shots/shape2Dorig.png")
 
 currentScene = IrreguScene()
-
-#currentScene = ShapeScene(type = 2, outer = 0)
 
 #currentScene = StillMotionScene(type = 1, flag = 1)