[Gzz-commits] libvob/vob/demo fpfil.py

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/libvob
Module name:    libvob
Changes by:     Tuomas J. Lukka <address@hidden>        03/04/29 07:41:03

Modified files:
        vob/demo       : fpfil.py 

Log message:
        Better visual

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/vob/demo/fpfil.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text

Patches:
Index: libvob/vob/demo/fpfil.py
diff -u libvob/vob/demo/fpfil.py:1.1 libvob/vob/demo/fpfil.py:1.2
--- libvob/vob/demo/fpfil.py:1.1        Tue Apr 29 07:22:41 2003
+++ libvob/vob/demo/fpfil.py    Tue Apr 29 07:41:03 2003
@@ -3,6 +3,13 @@
 from vob.putil import cg
 from vob.putil.misc import *
 from vob.putil.demokeys import *
+from vob.paper.texcache import getCachedTexture
+
+noise = getCachedTexture(
+    [1024, 1024, 0, 4, "RGBA", "RGBA", "noise", 
+       [ "freq", "100", "bias", ".5", "scale", ".8" ]]
+    )
+
 
 
 vp = [
@@ -20,8 +27,7 @@
        float4 t: TEXCOORD0,
        float4 pos: POSITION,
        out float4  opos: POSITION,
-       out float4 ocol : COLOR,
-       out float4  ot: TEXCOORD0
+       out float4 ocol : TEXCOORD0
 ) {
     float4 ctr1 = mul(glstate.matrix.program[0], float4(.5,.5,0,1));
     float4 ctr2 = mul(glstate.matrix.program[1], float4(.5,.5,0,1));
@@ -52,17 +58,25 @@
 
     float4 p = lerp(x1, x2, pos.y);
     opos = mul(glstate.matrix.projection, p);
-    ocol.xy = pos.xy;
-    ocol.w = .5;
+    ocol.xy = pos.xy; 
+    ocol.z = shri;
+//    ocol.w = .5;
  //   oc.z = 1;
-    ot = t;
 }
 """, "arbvp1")),
 ]
 
 fp = [
 GL.createProgram(cg.compile("""
-""", "vp30")),
+void main(
+       float4 p: TEXCOORD0,
+       out float4 ocol: COLOR,
+       uniform sampler2D t0: TEXUNIT0
+) {
+    ocol = tex2D(t0, p.xy * float2(4, 1));
+    ocol.w = .5;
+}
+""", "arbfp1")),
 ]
 
 
@@ -87,12 +101,27 @@
 
        vs.put(getDListNocoords("""
         PushAttrib ENABLE_BIT CURRENT_BIT COLOR_BUFFER_BIT TEXTURE_BIT 
+
         BindProgram VERTEX_PROGRAM_ARB %s
         Enable VERTEX_PROGRAM_ARB
+
+        BindProgram FRAGMENT_PROGRAM_ARB %s
+        Enable FRAGMENT_PROGRAM_ARB
+
        Enable BLEND
        Disable DEPTH_TEST
        BlendFunc SRC_ALPHA ONE_MINUS_SRC_ALPHA
-       """ % vp[0].getProgId()))
+
+       BindTexture TEXTURE_2D %s
+        TexParameter TEXTURE_2D TEXTURE_MIN_FILTER LINEAR_MIPMAP_LINEAR
+        TexParameter TEXTURE_2D TEXTURE_MAG_FILTER LINEAR
+       TexParameter TEXTURE_2D TEXTURE_MAX_ANISOTROPY_EXT 20
+
+       """ % (
+               vp[0].getProgId(),
+               fp[0].getProgId(),
+               noise.getTexId(),
+                   )))
 
        vs.put(GLRen.createQuad(20,20,1), 
            vs.orthoCS(0, "C", 0, 100, 500, 20, 20))