[Gzz-commits] libvob org/nongnu/libvob/gl/SpecialPapers.java ...

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/libvob
Module name:    libvob
Changes by:     Tuomas J. Lukka <address@hidden>        03/05/12 10:56:30

Modified files:
        org/nongnu/libvob/gl: SpecialPapers.java 
        test/vob/gl    : specialpaper.test 

Log message:
        Graph paper for dbg

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/org/nongnu/libvob/gl/SpecialPapers.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/test/vob/gl/specialpaper.test.diff?tr1=1.1&tr2=1.2&r1=text&r2=text

Patches:
Index: libvob/org/nongnu/libvob/gl/SpecialPapers.java
diff -u libvob/org/nongnu/libvob/gl/SpecialPapers.java:1.1 
libvob/org/nongnu/libvob/gl/SpecialPapers.java:1.2
--- libvob/org/nongnu/libvob/gl/SpecialPapers.java:1.1  Thu May  8 09:21:35 2003
+++ libvob/org/nongnu/libvob/gl/SpecialPapers.java      Mon May 12 10:56:30 2003
@@ -14,13 +14,53 @@
        p.setNPasses(1);
        Paper.Pass p0 = p.getPass(0);
        p0.setSetupcode(
-               "PushAttrib COLOR_BUFFER_BIT\n"+
+               "PushAttrib COLOR_BUFFER_BIT ENABLE_BIT\n"+
                "Disable BLEND\n"+
+               "Disable TEXTURE_2D\n"+
                "Color "+ColorUtil.colorGLString(color)+"\n"
                );
        p0.setTeardowncode(
                "PopAttrib\n"
        );
+       return p;
+    }
+
+    static private GL.Texture graphtex;
+    /** A colored graph paper.
+     */
+    static public Paper cgraphPaper(float unitSize) {
+       if(graphtex == null) {
+           graphtex = GL.createTexture();
+           graphtex.shade_all_levels(256,256,0,3,
+                   "R3_G3_B2", "RGB", 
+                   "coordinates", new String[] {
+                       "type", "0",
+                       "ticks", "4", 
+                       "thickness", "2"
+                   });
+       }
+       Paper p = new Paper();
+       p.setNPasses(1);
+       Paper.Pass p0 = p.getPass(0);
+       p0.setSetupcode(
+           "PushAttrib COLOR_BUFFER_BIT TEXTURE_BIT ENABLE_BIT\n"+
+           "Disable BLEND\n"+
+           "Color 1 1 1\n"+
+           "Enable TEXTURE_2D\n"+
+           "BindTexture TEXTURE_2D "+graphtex.getTexId()+"\n"+
+           "TexParameter TEXTURE_2D TEXTURE_WRAP_S CLAMP\n"+
+           "TexParameter TEXTURE_2D TEXTURE_WRAP_T CLAMP\n"
+       );
+       p0.setTeardowncode(
+               "PopAttrib\n"
+       );
+       p0.setNTexGens(1);
+       p0.putNormalTexGen(0, new float[] {
+           1.0f/unitSize, 0, 0, 0,
+           0, 1.0f/unitSize, 0, 0,
+           0, 0, 1, 0,
+           0, 0, 0, 1
+       });
        return p;
     }
 }
Index: libvob/test/vob/gl/specialpaper.test
diff -u libvob/test/vob/gl/specialpaper.test:1.1 
libvob/test/vob/gl/specialpaper.test:1.2
--- libvob/test/vob/gl/specialpaper.test:1.1    Thu May  8 09:21:35 2003
+++ libvob/test/vob/gl/specialpaper.test        Mon May 12 10:56:30 2003
@@ -25,3 +25,19 @@
     checkAvgColor(95, 95, 4, 4, (0,0,0))
     checkAvgColor(140, 140, 20, 20, (0,0,255))
     checkAvgColor(240, 140, 20, 20, (255,0,0))
+
+def testGraph():
+    vs = getvs()
+    vs.put(vob.vobs.SolidBackdropVob(Color.black))
+
+    paper = vob.gl.SpecialPapers.cgraphPaper(100)
+    pq = vob.gl.GLRen.createFixedPaperQuad(paper, -100, -100, 200, 200, 0, 10, 
10, 10)
+
+    vs.put(pq, vs.coords.ortho(0, 0, 100, 100, 1, 1))
+    render(vs)
+
+    checkAvgColor(50, 50, 4, 4, (0,0,0))
+    checkAvgColor(50, 250, 4, 4, (255,0,0))
+    checkAvgColor(250, 50, 4, 4, (0,255,0))
+    checkAvgColor(250, 250, 4, 4, (255,255,255))
+