[Gzz-commits] libvob src/texture/Texture_pipetexture.cxx test...

[Janne V. Kujala]

CVSROOT:        /cvsroot/libvob
Module name:    libvob
Changes by:     Janne V. Kujala <address@hidden>        03/03/27 03:24:35

Modified files:
        src/texture    : Texture_pipetexture.cxx 
        test/vob/gl    : paper.test 

Log message:
        fix libtexture texture dir

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/src/texture/Texture_pipetexture.cxx.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/test/vob/gl/paper.test.diff?tr1=1.3&tr2=1.4&r1=text&r2=text

Patches:
Index: libvob/src/texture/Texture_pipetexture.cxx
diff -u libvob/src/texture/Texture_pipetexture.cxx:1.3 
libvob/src/texture/Texture_pipetexture.cxx:1.4
--- libvob/src/texture/Texture_pipetexture.cxx:1.3      Sun Mar 23 15:15:58 2003
+++ libvob/src/texture/Texture_pipetexture.cxx  Thu Mar 27 03:24:35 2003
@@ -49,7 +49,7 @@
   virtual void render(TextureParam *params, 
                      int width, int height, int depth, int components, float 
*data) {
       string s;
-      s += "gfx/libtexture/";
+      s += "src/texture/";
       s += name;
       s += ".bin ";
 
Index: libvob/test/vob/gl/paper.test
diff -u libvob/test/vob/gl/paper.test:1.3 libvob/test/vob/gl/paper.test:1.4
--- libvob/test/vob/gl/paper.test:1.3   Wed Mar 26 15:28:52 2003
+++ libvob/test/vob/gl/paper.test       Thu Mar 27 03:24:35 2003
@@ -23,12 +23,38 @@
 
 needGL()
 
+from org.nongnu import libvob as vob
 from org.nongnu.libvob.vobs import *
 from java.awt import Color
 import java
 from org.nongnu.libvob.gl import GL, GLRen, GLCache, PaperMill
 
 from test.tools.gfx import *
+
+#def testPaperBasisTexture():
+#    tex = vob.paper.textures.init(3, "RGB")["RGB2"]
+# 
+#    for t in tex:
+#        vs = getvs()
+#        vs.map.put(SolidBackdropVob(Color.black))
+#      vs.put(vob.gl.GLCache.getCallList("""
+#              Color 1 1 1
+#              PushAttrib ENABLE_BIT
+#              BindTexture TEXTURE_2D %s
+#              Enable TEXTURE_2D
+#              Begin QUAD_STRIP3
+#              TexCoord 0 0
+#              Vertex 0 0
+#              TexCoord 1 0
+#              Vertex 200 0
+#              TexCoord 0 1
+#              Vertex 0 200
+#              TexCoord 1 1
+#              Vertex 200 200
+#              End
+#              PopAttrib
+#      """ % t.getTexId()))
+#        render(vs)
 
 def testPaperAnythingJava():
     """Test that libpaper, when called through