[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/30 04:37:54

Modified files:
        vob/demo       : fpfil.py 

Log message:
        Findeing the right look

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

Patches:
Index: libvob/vob/demo/fpfil.py
diff -u libvob/vob/demo/fpfil.py:1.3 libvob/vob/demo/fpfil.py:1.4
--- libvob/vob/demo/fpfil.py:1.3        Tue Apr 29 08:21:47 2003
+++ libvob/vob/demo/fpfil.py    Wed Apr 30 04:37:54 2003
@@ -6,10 +6,22 @@
 from vob.paper.texcache import getCachedTexture
 
 noise = getCachedTexture(
-    [1024, 1024, 0, 4, "RGBA", "RGBA", "noise", 
+    [1024, 512, 0, 4, "RGBA", "RGBA", "noise", 
        [ "freq", "100", "bias", ".5", "scale", ".8" ]]
     )
 
+lnoise = getCachedTexture(
+    [256, 256, 0, 4, "RGBA", "RGBA", "noise", 
+       [ "freq", "10", "bias", ".5", "scale", ".8" ]]
+    )
+
+turb = getCachedTexture(
+    [512, 512, 0, 4, "RGBA", "RGBA", "fnoise", 
+       [ "turb", "1",  "freq", "1", "scale", ".3", "bias", ".3",
+           "freq2", "100", "df", "1",
+            ]]
+    )
+
 
 
 vp = [
@@ -35,6 +47,7 @@
     float inter = frac(4*pos.x);
     float edgeind = fmod(floor(4*pos.x), 4) ;
 
+
     float4 xa = float4(0,0,0,1);
     float4 xb = float4(0,0,0,1);
 
@@ -44,6 +57,11 @@
     xb.x = (edgeind >= 1 && edgeind < 3);
     xb.y = (edgeind >= 0 && edgeind < 2);
 
+/* DOESN'T WORK
+
+    float4 xa = edge[edgeind];
+    float4 xb = edge[edgeind+1];
+*/
 
 
     float4 x = lerp(xa, xb, inter);
@@ -90,14 +108,21 @@
 void main(
        float4 p: TEXCOORD0,
        out float4 ocol: COLOR,
-       uniform sampler2D t0: TEXUNIT0
+       uniform sampler2D t0: TEXUNIT0,
+       uniform sampler2D t1: TEXUNIT1
 ) {
     float3 dark = float3(186, 71, 18) / 255.0;
     float3 light = float3(249, 233, 50) / 255.0;
 
-    float4 dtex = tex2D(t0, p.xy * float2(4, 1));
+    float4 dtex = tex2D(t0, p.xy * float2(4, 2));
+    float4 atex = tex2D(t1, p.xy * float2(2, 2));
+
     ocol.xyz = lerp(dark, light, dtex.x);
-    ocol.w = .1 + .8*smoothstep(.5, 1.3, p.w);
+    ocol.w = .1 + .5*smoothstep(.5, 1.3, p.w) + 
+       (.5 * smoothstep(.5, .6, atex.x));
+
+    // ocol.xyz = 0;
+
 }
 """, "arbfp1")),
 ]
@@ -141,10 +166,20 @@
         TexParameter TEXTURE_2D TEXTURE_MAG_FILTER LINEAR
        TexParameter TEXTURE_2D TEXTURE_MAX_ANISOTROPY_EXT 20
 
+       ActiveTextureARB TEXTURE1
+
+       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
+
+       ActiveTextureARB TEXTURE0
+
        """ % (
                vp[0].getProgId(),
                fp[0].getProgId(),
-               noise.getTexId(),
+               turb.getTexId(),
+               lnoise.getTexId(),
                    )))
 
        vs.put(GLRen.createQuad(40,40,1),