[Gzz-commits] gzz ./TODO gfx/demo/sqfillet.py gfx/demo/fillet...

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Tuomas J. Lukka <address@hidden>        02/12/12 05:04:40

Modified files:
        .              : TODO 
        gfx/demo       : sqfillet.py 
        gfx/demo/fillet: ambiguity.py zbuffer.py 
        gfx/util       : demo.py 

Log message:
        Start on help for gl demos

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/TODO.diff?tr1=1.456&tr2=1.457&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/demo/sqfillet.py.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/demo/fillet/ambiguity.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/demo/fillet/zbuffer.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/util/demo.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text

Patches:
Index: gzz/TODO
diff -u gzz/TODO:1.456 gzz/TODO:1.457
--- gzz/TODO:1.456      Thu Dec 12 04:45:20 2002
+++ gzz/TODO    Thu Dec 12 05:04:40 2002
@@ -50,8 +50,11 @@
          canonical blocks?
     tjl:
        + return ANKOS to Agora [ blocked by: waiting for trip to agora ]
+       - gl demo help
+           - HorizText: interpret newlines
+           - gldemo: draw / undraw doc text
        - go through most important GL demos and redo the interfaces
-           - fillets
+         and document
            - irregu
            - paper
            - xupdf
Index: gzz/gfx/demo/fillet/ambiguity.py
diff -u gzz/gfx/demo/fillet/ambiguity.py:1.2 
gzz/gfx/demo/fillet/ambiguity.py:1.3
--- gzz/gfx/demo/fillet/ambiguity.py:1.2        Wed Dec 11 00:48:30 2002
+++ gzz/gfx/demo/fillet/ambiguity.py    Thu Dec 12 05:04:40 2002
@@ -19,6 +19,11 @@
        self.shift = 0
        self.fillet = 0
     def key(self, k):
+       """Keys:
+
+       s: Toggle layout
+       f: Toggle filletting
+       """
        if k == "s":
            self.shift = 1-self.shift
        if k == "f":
Index: gzz/gfx/demo/fillet/zbuffer.py
diff -u gzz/gfx/demo/fillet/zbuffer.py:1.1 gzz/gfx/demo/fillet/zbuffer.py:1.2
--- gzz/gfx/demo/fillet/zbuffer.py:1.1  Thu Dec  5 12:33:52 2002
+++ gzz/gfx/demo/fillet/zbuffer.py      Thu Dec 12 05:04:40 2002
@@ -19,6 +19,15 @@
        self.polymode = 0
        initConnTexs()
     def key(self, k):
+       """Keys:
+
+       p: Rotate view to show Z-buffer use
+       t: Change fillet type
+       k: Use a connection
+       v: Change the color of the connecting segment
+       s: Toggle shifting of one cell
+       m: Toggle polygon mode to show the polygons drawn.
+       """
        if k == "t":
            self.ind += 1
            self.ind %= len(cellTexs)
Index: gzz/gfx/demo/sqfillet.py
diff -u gzz/gfx/demo/sqfillet.py:1.5 gzz/gfx/demo/sqfillet.py:1.6
--- gzz/gfx/demo/sqfillet.py:1.5        Thu Oct 24 22:57:17 2002
+++ gzz/gfx/demo/sqfillet.py    Thu Dec 12 05:04:40 2002
@@ -1,6 +1,6 @@
 from __future__ import nested_scopes
 
-AbstractUpdateManager.defaultAnimationTime = 150000
+AbstractUpdateManager.defaultAnimationTime = 15000
 from java.lang import Math
 
 class SqfScene:
@@ -77,7 +77,7 @@
 
        fil = GLRen.createSqFilletConnection(self.w, self.flags[0], 
self.blendw, self.power)
 
-       n = 20
+       n = 2
 
        for i in range(0, n):
            vs.map.put(fil, cs1, cs2)
Index: gzz/gfx/util/demo.py
diff -u gzz/gfx/util/demo.py:1.1 gzz/gfx/util/demo.py:1.2
--- gzz/gfx/util/demo.py:1.1    Wed Dec 11 01:18:12 2002
+++ gzz/gfx/util/demo.py        Thu Dec 12 05:04:40 2002
@@ -70,14 +70,19 @@
 
 usingNormalBindings = 1
 
+showHelp = 0
+
 class Bindings(AbstractBinder):
     def keystroke(self, s):
+       global showHelp
        # print "KEY: '%s'"%s
        if usingNormalBindings:
            if s == "q" or s == "Q":
                System.exit(43)
            elif s == "r" or s == "R":
                loadScenes()
+           elif s == "?":
+               showHelp = 1-showHelp
            elif not globalkey(s):
                currentScene.key(s)
        else:
@@ -95,6 +100,10 @@
 #      b = Bindings()
 #      w.registerBinder(b)
 #     def
+
+def addHelp(vs):
+    help = currentScene.__class__.__doc__ + currentScene.key.__doc__
+    print "Doc: ",help
 
 class Show(AbstractShower):
     def generate(self):