[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gzz-commits] libvob/vob demo/multifil/fillet3d.py fillet/lig...
From: |
Janne V. Kujala |
Subject: |
[Gzz-commits] libvob/vob demo/multifil/fillet3d.py fillet/lig... |
Date: |
Fri, 27 Jun 2003 06:08:43 -0400 |
CVSROOT: /cvsroot/libvob
Module name: libvob
Branch:
Changes by: Janne V. Kujala <address@hidden> 03/06/27 06:08:43
Modified files:
vob/demo/multifil: fillet3d.py
vob/fillet : light3d.py
Log message:
Edges
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/vob/demo/multifil/fillet3d.py.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/vob/fillet/light3d.py.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
Patches:
Index: libvob/vob/demo/multifil/fillet3d.py
diff -u libvob/vob/demo/multifil/fillet3d.py:1.5
libvob/vob/demo/multifil/fillet3d.py:1.6
--- libvob/vob/demo/multifil/fillet3d.py:1.5 Fri Jun 27 05:11:47 2003
+++ libvob/vob/demo/multifil/fillet3d.py Fri Jun 27 06:08:43 2003
@@ -62,7 +62,7 @@
SlideLin("dice", 20, 1, "Dice factor", "P", "p"),
)
def scene(self, vs):
- vs.put( background((.5,.25,0)))
+ vs.put( background((.8,.4,0)))
vs.put(getDListNocoords("""
PushAttrib POLYGON_BIT ENABLE_BIT
Enable DEPTH_TEST
@@ -137,6 +137,7 @@
Color 1 1 1
BindProgram FRAGMENT_PROGRAM_NV %s
Enable FRAGMENT_PROGRAM_NV
+ Enable BLEND
""" % light3d.edgefp.getProgId()))
vs.put(quad(), vs.orthoCS(0, "A", -100, 0, 0, 1024,768))
Index: libvob/vob/fillet/light3d.py
diff -u libvob/vob/fillet/light3d.py:1.3 libvob/vob/fillet/light3d.py:1.4
--- libvob/vob/fillet/light3d.py:1.3 Fri Jun 27 05:11:47 2003
+++ libvob/vob/fillet/light3d.py Fri Jun 27 06:08:43 2003
@@ -51,20 +51,25 @@
uniform sampler2D tex0,
out float4 col : COLOR) {
float2 tc = wpos.xy / 1024.0;
- float d = tex2D(tex0, tc).w;
- float d1 = tex2D(tex0, tc + (0,1/1024.0)).w;
- float d2 = tex2D(tex0, tc + (0,-1/1024.0)).w;
- float d3 = tex2D(tex0, tc + (1/1024.0,0)).w;
- float d4 = tex2D(tex0, tc + (-1/1024.0,0)).w;
+ tc.y = tc.y + 1 - 768 / 1024.0;
+ float d = tex2D(tex0, tc).x;
+ float d1 = tex2D(tex0, tc + float2(0,2/1024.0)).x;
+ float d2 = tex2D(tex0, tc + float2(0,-2/1024.0)).x;
+ float d3 = tex2D(tex0, tc + float2(2/1024.0,0)).x;
+ float d4 = tex2D(tex0, tc + float2(-2/1024.0,0)).x;
float4 color;
- color.xyz = 100*(abs(d1-d) + abs(d2-d) + abs(d3-d) + abs(d4-d));
+ float diff = (abs(d1-d) + abs(d2-d) + abs(d3-d) + abs(d4-d));
color.y = (d > .5 ? 1 : 0);
color.xz = 0;
color.x = tex2D(tex0, tc).x;
color.y = (d == 1 ? 1 : 0);
// color.z = wpos.x / 1024;
- color.w = 1;
+ color.xyz = 0;
+
+ // color.xyz = diff > .01 ? 0 : 1;
+ color.w = diff > .01 ? 1 : 0;
+ // color.w = 1;
col = color;
}
- [Gzz-commits] libvob/vob demo/multifil/fillet3d.py fillet/lig...,
Janne V. Kujala <=