[Gzz-commits] libvob org/nongnu/libvob/demo/fpfont.py org/non...

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/libvob
Module name:    libvob
Changes by:     Tuomas J. Lukka <address@hidden>        03/04/09 11:05:24

Modified files:
        org/nongnu/libvob/demo: fpfont.py 
        org/nongnu/libvob/putil: demo.py 
        src/jni        : Modules 
Added files:
        include/vob/vobs: Program.hxx 

Log message:
        Now can adjust filter on lego controller \!

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/include/vob/vobs/Program.hxx?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/org/nongnu/libvob/demo/fpfont.py.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/org/nongnu/libvob/putil/demo.py.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/src/jni/Modules.diff?tr1=1.1&tr2=1.2&r1=text&r2=text

Patches:
Index: libvob/org/nongnu/libvob/demo/fpfont.py
diff -u libvob/org/nongnu/libvob/demo/fpfont.py:1.15 
libvob/org/nongnu/libvob/demo/fpfont.py:1.16
--- libvob/org/nongnu/libvob/demo/fpfont.py:1.15        Wed Apr  9 10:09:25 2003
+++ libvob/org/nongnu/libvob/demo/fpfont.py     Wed Apr  9 11:05:24 2003
@@ -117,25 +117,25 @@
 
 # Sample in an X pattern.
 
-DEFINE rad=.2;
+MOV R15, p[0].x;
 
-MAD R11, rad, R8, R10;
-MAD R11, rad, R9, R10;
+MAD R11, R15, R8, R10;
+MAD R11, R15, R9, R11;
 TEX R12, R11, TEX0, 2D;
 MAD R1.x, R12.w, 256, R12.x;
 
-MAD R11, -rad, R8, R10;
-MAD R11, -rad, R9, R10;
+MAD R11, -R15, R8, R10;
+MAD R11, -R15, R9, R11;
 TEX R12, R11, TEX0, 2D;
 MAD R1.y, R12.w, 256, R12.x;
 
-MAD R11, rad, R8, R10;
-MAD R11, -rad, R9, R10;
+MAD R11, R15, R8, R10;
+MAD R11, -R15, R9, R11;
 TEX R12, R11, TEX0, 2D;
 MAD R1.z, R12.w, 256, R12.x;
 
-MAD R11, -rad, R8, R10;
-MAD R11, rad, R9, R10;
+MAD R11, -R15, R8, R10;
+MAD R11, R15, R9, R11;
 TEX R12, R11, TEX0, 2D;
 MAD R1.w, R12.w, 256, R12.x;
 
@@ -153,6 +153,9 @@
 # Further scale down by half for the X sampling pattern
 MUL R6, R6, .5;
 
+# Arbitrary scale
+MUL R6, R6, p[0].y;
+
 SLT R0, R1, R6;
 
 # Then, what to do with this?
@@ -355,8 +358,8 @@
 """
 words = loremipsum.split(" ")
 
-vob.AbstractUpdateManager.dbg = 1
-vob.impl.gl.GLUpdateManager.dbg = 1
+vob.AbstractUpdateManager.dbg = 0
+vob.impl.gl.GLUpdateManager.dbg = 0
 
 t = 0
 class Scene(vob.util.PS2Reader.Listener):
@@ -372,6 +375,7 @@
            )
        self.mouser = vob.putil.demowindow.mouser
        self.mouser.setListener(self)
+       self.ext = 0
        self.mouser.start()
 
     def makeDist(self, foo, foo2):
@@ -400,7 +404,13 @@
        vob.putil.demowindow.w.renderStill(vs, 0)
 
     def scene(self, vs):
-       print "GLUP DBG: ",vob.impl.gl.GLUpdateManager.dbg
+       if hasattr(self, "vs") and self.ext:
+           self.ext = 0
+           self.setCS()
+           AbstractUpdateManager.setNoAnimation()
+           AbstractUpdateManager.chg()
+           return self.vs
+
        putnoc(vs, background((1,1,1)))
 
        fpid =  fp[self.prognum].getProgId()
@@ -435,7 +445,11 @@
         cs = vs.orthoCS(0, "a", 0, self.x, self.y, 1, 1)
 
        print "x,y:", self.mouser.x, self.mouser.y
-        cs = vs.orthoCS(cs, "a", 0, self.mouser.x, self.mouser.y, 1, 1)
+        parcs = vs.orthoCS(0, "para", 0, 0, 0, 0, 0)
+
+
+       vs.put( GLRen.createProgramLocalParameterARB("FRAGMENT_PROGRAM_ARB", 0),
+           parcs)
 
        cs = vs.rotateCS(cs, "b", self.a)
 
@@ -446,15 +460,25 @@
        tx = vob.gl.GLRen.createText1(f, "address@hidden", 0, 0)
 
        y = 0
-       for i in range(7,20,2):
+       for i in range(7,16,2):
            y += i*1.5
            csi = vs.orthoCS(cs, str(i), 0, 0, y, 2*i, 2*i)
             vs.put(tx, csi)
         
         putnoc(vs, getDListNocoords("PopAttrib"))
 
-    def chg(*args):
+       self.vs = vs
+       self.parcs = parcs
+       self.setCS()
+
+
+    def setCS(self):
+       self.vs.coords.setOrthoParams(self.parcs, 0,
+           self.mouser.x / 100.0, self.mouser.y / 100.0, self.mouser.z / 
100.0, 1)
+
+    def chg(self, *args):
        print "chg ",args
+       self.ext = 1
        AbstractUpdateManager.setNoAnimation()
        AbstractUpdateManager.chg()
 
Index: libvob/org/nongnu/libvob/putil/demo.py
diff -u libvob/org/nongnu/libvob/putil/demo.py:1.3 
libvob/org/nongnu/libvob/putil/demo.py:1.4
--- libvob/org/nongnu/libvob/putil/demo.py:1.3  Thu Mar 27 02:51:17 2003
+++ libvob/org/nongnu/libvob/putil/demo.py      Wed Apr  9 11:05:24 2003
@@ -257,15 +257,19 @@
            replacingScene = None
        else:
            vs = w.createVobScene()
-           currentScene.scene(vs)
+           ret = currentScene.scene(vs)
+           if ret: return ret
            if showHelp:
                addHelp(vs)
        return vs
 
-def replaceNewScene(vs):
-    global replacingScene
-    vob.AbstractUpdateManager.setNoAnimation()
-    replacingScene = vs
+# Disabled - there's a problem so
+# We'll define return value of scene()
+# to mean replacing
+#def replaceNewScene(vs):
+#    global replacingScene
+#    vob.AbstractUpdateManager.setNoAnimation()
+#    replacingScene = vs
     
 
 class Main(Runnable):
Index: libvob/src/jni/Modules
diff -u libvob/src/jni/Modules:1.1 libvob/src/jni/Modules:1.2
--- libvob/src/jni/Modules:1.1  Fri Apr  4 07:41:22 2003
+++ libvob/src/jni/Modules      Wed Apr  9 11:05:24 2003
@@ -10,5 +10,7 @@
        Pixel                           \
        Text                            \
        Paper                           \
-       Irregu
+       Irregu                          \
+       Program
+