[Gzz-commits] libvob include/vob/vobs/Fillet.hxx vob/fillet/l...

[Janne V. Kujala]

CVSROOT:        /cvsroot/libvob
Module name:    libvob
Branch:         
Changes by:     Janne V. Kujala <address@hidden>        03/07/03 11:06:45

Modified files:
        include/vob/vobs: Fillet.hxx 
        vob/fillet     : light3d.py 

Log message:
        better texture

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/include/vob/vobs/Fillet.hxx.diff?tr1=1.40&tr2=1.41&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/vob/fillet/light3d.py.diff?tr1=1.27&tr2=1.28&r1=text&r2=text

Patches:
Index: libvob/include/vob/vobs/Fillet.hxx
diff -u libvob/include/vob/vobs/Fillet.hxx:1.40 
libvob/include/vob/vobs/Fillet.hxx:1.41
--- libvob/include/vob/vobs/Fillet.hxx:1.40     Thu Jul  3 09:18:59 2003
+++ libvob/include/vob/vobs/Fillet.hxx  Thu Jul  3 11:06:45 2003
@@ -590,10 +590,11 @@
        int i;
        vector<Vec> v;
 
-       for (i = 0; i < ndice - 1; i++)
-           v.push_back(f1.point(i / (ndice - 1.0)));
        for (i = 0; i < ndice; i++)
-           v.push_back(f0.point(i / (ndice - 1.0)));
+           v.push_back(f1.point((float)i / ndice));
+
+       for (i = 0; i <= ndice; i++)
+           v.push_back(f0.point((float)i / ndice));
 
        vector<Vec> n(v.size());
 
@@ -630,8 +631,8 @@
 
        for (i = 0; i < v.size() - 1; i++) {
            glBegin(GL_QUAD_STRIP);
-           float s0 = (float)i / (v.size() - 1);
-           float s1 = (float)(i + 1) / (v.size() - 1);
+           float s0 = 2 * (float)i / (v.size() - 1);
+           float s1 = 2 * (float)(i + 1) / (v.size() - 1);
 
            for (j = 0; j <= ndice; j++) {
                float a = 2 * M_PI * j / ndice;
Index: libvob/vob/fillet/light3d.py
diff -u libvob/vob/fillet/light3d.py:1.27 libvob/vob/fillet/light3d.py:1.28
--- libvob/vob/fillet/light3d.py:1.27   Thu Jul  3 09:18:59 2003
+++ libvob/vob/fillet/light3d.py        Thu Jul  3 11:06:45 2003
@@ -5,11 +5,61 @@
 from vob.putil.demokeys import *
 
 from vob.paper.texcache import getCachedTexture
-noise = getCachedTexture(
+tex = getCachedTexture(
     [1024, 512, 0, 4, "RGBA", "RGBA", "noise", 
-       [ "freq", "100", "bias", ".5", "scale", ".8" ]]
+     [ "freq", "100", "bias", ".5", "scale", ".8" ]]
     )
 
+tex = GL.createTexture()
+GL.call("""
+BindTexture TEXTURE_2D %s
+TexImage2D TEXTURE_2D 0 ALPHA 16 16 0 ALPHA \
+1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 \
+1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 \
+1 1 1 1 0 0 0 0 0 0 0 0 1 1 1 1 \
+1 1 1 0 0 0 0 0 0 0 0 0 0 1 1 1 \
+1 1 0 0 0 0 0 0 0 0 0 0 0 0 1 1 \
+1 1 0 0 0 0 0 0 0 0 0 0 0 0 1 1 \
+1 1 0 0 0 0 0 0 0 0 0 0 0 0 1 1 \
+1 1 0 0 0 0 0 0 0 0 0 0 0 0 1 1 \
+1 1 0 0 0 0 0 0 0 0 0 0 0 0 1 1 \
+1 1 0 0 0 0 0 0 0 0 0 0 0 0 1 1 \
+1 1 0 0 0 0 0 0 0 0 0 0 0 0 1 1 \
+1 1 0 0 0 0 0 0 0 0 0 0 0 0 1 1 \
+1 1 1 0 0 0 0 0 0 0 0 0 0 1 1 1 \
+1 1 1 1 0 0 0 0 0 0 0 0 1 1 1 1 \
+1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 \
+1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 \
+
+TexImage2D TEXTURE_2D 1 ALPHA 8 8 0 ALPHA \
+1 1 1 1 1 1 1 1 \
+1 1 1 1 1 1 1 1 \
+1 1 1 0 0 0 1 1 \
+1 1 0 0 0 0 0 1 \
+1 1 0 0 0 0 0 1 \
+1 1 0 0 0 0 0 1 \
+1 1 1 0 0 0 1 1 \
+1 1 1 1 1 1 1 1
+
+TexImage2D TEXTURE_2D 2 ALPHA 4 4 0 ALPHA \
+1 1 1 1 \
+1 1 1 1 \
+1 1 0 1 \
+1 1 1 1
+
+TexImage2D TEXTURE_2D 3 ALPHA 2 2 0 ALPHA \
+1 1 \
+1 1
+
+TexParameter TEXTURE_2D TEXTURE_BASE_LEVEL 0
+TexParameter TEXTURE_2D TEXTURE_MAX_LEVEL 3
+TexParameter TEXTURE_2D TEXTURE_WRAP_S REPEAT
+TexParameter TEXTURE_2D TEXTURE_WRAP_T REPEAT
+TexParameter TEXTURE_2D TEXTURE_MIN_FILTER LINEAR_MIPMAP_LINEAR
+TexParameter TEXTURE_2D TEXTURE_LOD_BIAS -1.25
+BindTexture TEXTURE_2D 0
+""" % tex.getTexId())
+
 vp = [
 GL.createProgram(cg.compile("""
 void main(
@@ -50,7 +100,7 @@
     // col.rgb = col.rgb * (1 - t) + float3(1,.5,.2) * t;
     col.a = 1;
 
-    otex0 = tex0;
+    otex0 = tex0 * float4(20, 20, 0, 1);
 }
 
 """, "arbvp1")),
@@ -258,12 +308,12 @@
             if self.texture:
                 vs.put(getDListNocoords("""
                 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
+                #TexParameter TEXTURE_2D TEXTURE_MIN_FILTER 
LINEAR_MIPMAP_LINEAR
+                #TexParameter TEXTURE_2D TEXTURE_MAG_FILTER LINEAR
+                #TexParameter TEXTURE_2D TEXTURE_MAX_ANISOTROPY_EXT 20
                 TexEnv TEXTURE_ENV TEXTURE_ENV_MODE MODULATE
                 Enable TEXTURE_2D
-                """ % noise.getTexId()))
+                """ % tex.getTexId()))
 
             if self.perspective:
                 vs.put(getDListNocoords("""