[ff-cvs] fenfire/org/fenfire/spanimages/gl PlainPaperMak...

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Branch:         
Changes by:     Tuomas J. Lukka <address@hidden>        03/08/25 03:46:52

Modified files:
        org/fenfire/spanimages/gl: PlainPaperMaker.java PoolManager.java 

Log message:
        Sharpen textures due to aniso, take into account disabled TEX2D

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/spanimages/gl/PlainPaperMaker.java.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/spanimages/gl/PoolManager.java.diff?tr1=1.8&tr2=1.9&r1=text&r2=text

Patches:
Index: fenfire/org/fenfire/spanimages/gl/PlainPaperMaker.java
diff -u fenfire/org/fenfire/spanimages/gl/PlainPaperMaker.java:1.9 
fenfire/org/fenfire/spanimages/gl/PlainPaperMaker.java:1.10
--- fenfire/org/fenfire/spanimages/gl/PlainPaperMaker.java:1.9  Tue Aug  5 
05:54:18 2003
+++ fenfire/org/fenfire/spanimages/gl/PlainPaperMaker.java      Mon Aug 25 
03:46:52 2003
@@ -52,7 +52,9 @@
      * to use org.fenfire.spanimages.gl.papermakers for these.
      */
     public PlainPaperMaker() {
-       this(1, "PushAttrib TEXTURE_BIT\nTexEnv TEXTURE_ENV TEXTURE_ENV_MODE 
REPLACE\n", "PopAttrib\n", null);
+       this(1, "PushAttrib TEXTURE_BIT ENABLE_BIT\nTexEnv TEXTURE_ENV 
TEXTURE_ENV_MODE REPLACE\n" +
+               "Enable TEXTURE_2D"
+               , "PopAttrib\n", null);
     }
 
     /** Create a new PlainPaperMaker.
@@ -120,7 +122,7 @@
        for(int i=0; i<n ; i++) {
            buf.append("\nActiveTexture TEXTURE");
            buf.append(i + offs);
-           buf.append("\nBindTexture TEXTURE_2D ");
+           buf.append("\nEnable TEXTURE_2D\nBindTexture TEXTURE_2D ");
            buf.append(img.loader.getTexture().getTexId());
            buf.append("\n");
 
Index: fenfire/org/fenfire/spanimages/gl/PoolManager.java
diff -u fenfire/org/fenfire/spanimages/gl/PoolManager.java:1.8 
fenfire/org/fenfire/spanimages/gl/PoolManager.java:1.9
--- fenfire/org/fenfire/spanimages/gl/PoolManager.java:1.8      Wed Aug 13 
12:56:28 2003
+++ fenfire/org/fenfire/spanimages/gl/PoolManager.java  Mon Aug 25 03:46:52 2003
@@ -93,7 +93,15 @@
            float w, float h,
            float sx0, float sy0,
            float sx1, float sy1) {
+
+       // Calculate the area ratio of texgen
        float mult = Math.abs(texgen[0] * texgen[5] - texgen[1] * texgen[4]);
+       // However, this is not enough, as most of the textures
+       // are fairly anisotropic. 
+       // We'll assume the texture is as wide as it is tall and calculate
+       // a correcting factor.
+       // The larger this factor is, the more LOD will be loaded.
+       float anisoCorrection = 4;
 
        MySIV siv = new MySIV();
        siv.w = w;
@@ -104,13 +112,11 @@
 
        activeSet.add(i);
 
-       if(dbg) 
-           p("Makevob: "+mult+" "+w+" "+h);
        siv.quad = GLRen.createFixedPaperQuad(
                    p, 0, 0, w, h, 0,
                    DICELENGTH, DICELENGTH2, DICEDEPTH,
-                   i.accum, mult);
-       if(dbg) p("Made quad: "+i.accum+" "+mult+" || "+w+" "+h);
+                   i.accum, mult * anisoCorrection);
+       if(dbg) p("Made quad: "+i.accum+" "+mult+" "+anisoCorrection+" || "+w+" 
"+h);
        return siv;
     }