[Gzz-commits] libvob ./TODO include/vob/FunctionalPrimitives....

gzz-commits
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gzz-commits] libvob ./TODO include/vob/FunctionalPrimitives....

From:	Asko Soukka
Subject:	[Gzz-commits] libvob ./TODO include/vob/FunctionalPrimitives....
Date:	Thu, 13 Mar 2003 12:41:39 -0500
CVSROOT:        /cvsroot/libvob
Module name:    libvob
Changes by:     Asko Soukka <address@hidden>    03/03/13 12:41:39

Modified files:
        .              : TODO 
        include/vob    : FunctionalPrimitives.hxx 
        org/nongnu/libvob: package.html 
        src/jni        : Gen.cxx 
        test/tools     : gfx.py 
        test/vob/gl    : basicrender.test glvobcoorder.test 
Added files:
        include/vob    : DisablablePrimitives.hxx 

Log message:
        tried to add Culling, but it gets still skipped

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/TODO.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/include/vob/DisablablePrimitives.hxx?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/include/vob/FunctionalPrimitives.hxx.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/org/nongnu/libvob/package.html.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/src/jni/Gen.cxx.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/test/tools/gfx.py.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/test/vob/gl/basicrender.test.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/test/vob/gl/glvobcoorder.test.diff?tr1=1.4&tr2=1.5&r1=text&r2=text

Patches:
Index: libvob/TODO
diff -u libvob/TODO:1.11 libvob/TODO:1.12
--- libvob/TODO:1.11    Thu Mar 13 00:12:08 2003
+++ libvob/TODO Thu Mar 13 12:41:36 2003
@@ -9,8 +9,8 @@
     vegai:
        - .cvsignores
        - make sure libvob works right with kaffe
-    humppake:
-       - fix testCulling
+   humppake:
+        - fix Culling
 
 0.1alpha2: Vital fixes for packages depending on this
     tjl:
Index: libvob/include/vob/FunctionalPrimitives.hxx
diff -u libvob/include/vob/FunctionalPrimitives.hxx:1.1 
libvob/include/vob/FunctionalPrimitives.hxx:1.2
--- libvob/include/vob/FunctionalPrimitives.hxx:1.1     Wed Mar 12 11:17:52 2003
+++ libvob/include/vob/FunctionalPrimitives.hxx Thu Mar 13 12:41:38 2003
@@ -74,11 +74,7 @@
        }
     };
     VOB_PRIMITIVETRANS_DEFINED(ConcatInverse, "concatInverse");
-
-
 }
 }
-
-
 
 #endif
Index: libvob/org/nongnu/libvob/package.html
diff -u libvob/org/nongnu/libvob/package.html:1.1 
libvob/org/nongnu/libvob/package.html:1.2
--- libvob/org/nongnu/libvob/package.html:1.1   Sun Feb 23 10:01:42 2003
+++ libvob/org/nongnu/libvob/package.html       Thu Mar 13 12:41:39 2003
@@ -7,7 +7,7 @@
 </head>
 <body bgcolor="white">
 
-<h1>org.gzigzag.vob</h1>
+<h1>org.nongnu.libvob</h1>
 
 <p>
 The high-level graphics library for animation and connections. 
Index: libvob/src/jni/Gen.cxx
diff -u libvob/src/jni/Gen.cxx:1.12 libvob/src/jni/Gen.cxx:1.13
--- libvob/src/jni/Gen.cxx:1.12 Wed Mar 12 11:17:20 2003
+++ libvob/src/jni/Gen.cxx      Thu Mar 13 12:41:39 2003
@@ -43,6 +43,7 @@
 #include <vob/vobs/Pixel.hxx>
 #include <vob/LinearPrimitives.hxx>
 #include <vob/FunctionalPrimitives.hxx>
+#include <vob/DisablablePrimitives.hxx>
 
 int main() {
     std::ifstream templ("src/jni/GLRen.template.java");
@@ -78,6 +79,7 @@
     jni << "#include <vob/vobs/Pixel.hxx>\n";
     jni << "#include <vob/LinearPrimitives.hxx>\n";
     jni << "#include <vob/FunctionalPrimitives.hxx>\n";
+    jni << "#include <vob/DisablablePrimitives.hxx>\n";
     jni << "#include \"org_nongnu_libvob_gl_GLRen.h\"\n";
     jni << "using namespace Vob::JNI;\n";
     jni << "using namespace Vob::Primitives;\n";
Index: libvob/test/tools/gfx.py
diff -u libvob/test/tools/gfx.py:1.4 libvob/test/tools/gfx.py:1.5
--- libvob/test/tools/gfx.py:1.4        Tue Mar 11 08:57:54 2003
+++ libvob/test/tools/gfx.py    Thu Mar 13 12:41:39 2003
@@ -32,7 +32,7 @@
 _realwin = vob.GraphicsAPI.getInstance().createWindow()
 _realwin.setLocation(0, 0, 600, 600)
 
-if vob.GraphicsAPI.getInstance().getTypeString() == "gl":
+if not vob.GraphicsAPI.getInstance().getTypeString() == "gl":
     GL = vob.gl.GL
     GLRen = vob.gl.GLRen
     GLCache = vob.gl.GLCache
Index: libvob/test/vob/gl/basicrender.test
diff -u libvob/test/vob/gl/basicrender.test:1.2 
libvob/test/vob/gl/basicrender.test:1.3
--- libvob/test/vob/gl/basicrender.test:1.2     Tue Mar 11 09:01:27 2003
+++ libvob/test/vob/gl/basicrender.test Thu Mar 13 12:41:39 2003
@@ -29,7 +29,7 @@
 
 def testBgTriangle():
     vs = getvs()
-    vs.map.put(vob.vobs.SolidBgVob(Color.red))
+    vs.map.put(vob.vobs.SolidBackdropVob(Color.red))
     vs.map.put(vob.gl.GLCache.getCallList("""
        Color 0 1 0
        Disable TEXTURE_2D
Index: libvob/test/vob/gl/glvobcoorder.test
diff -u libvob/test/vob/gl/glvobcoorder.test:1.4 
libvob/test/vob/gl/glvobcoorder.test:1.5
--- libvob/test/vob/gl/glvobcoorder.test:1.4    Wed Mar 12 11:17:20 2003
+++ libvob/test/vob/gl/glvobcoorder.test        Thu Mar 13 12:41:39 2003
@@ -166,37 +166,29 @@
 
 def testCulling():
     """Test culling.
-    FAILURE: Fonts...
-
-    fail: *
     """
 
     def putThings():
        vs.map.clear()
-       vs.map.put(gzz.vob.vobs.SolidBgVob(Color.red))
-       vs.map.put(renderable, cs_cull, 0)
+       vs.map.put(vob.vobs.SolidBackdropVob(Color.red))
+       vs.map.put(renderable, cs_cull)
        render(vs)
 
-#test cull-clip interface
-    font = GL.createFont("gfx/fonts/a010013l.pfb", 16)
-    renderable = GLRen.createHorizText2(font, "FOO", 1, 1, 1, 1)
-    
-    cs = c.affine(0, 0, 10, 10, 100, 0, 0, 100)
-    cs_clip = c.affine(0, 0, 0, 0, 200, 0, 0, 200)
-    cs_cull = c.cull(cs, cs_clip)
-
-    putThings()
-
-    checkNotAvgColor(10, 10, 100, 100, (255, 0, 0), delta=50)
-
-    pap = ThePaperMill().getPaper(0, passmask=[1,1,1,1])
-    renderable = GLRen.createPaperQuad(pap, 0, 0, 1, 1, 1)
-    
-    putThings()
-    checkNotAvgColor(10, 10, 100, 100, (255, 0, 0), delta=50)
+    renderable = vob.gl.GLRen.createCallListBoxCoorded(
+       "PushAttrib CURRENT_BIT ENABLE_BIT\n"+
+        "Disable TEXTURE_2D\n"+
+       "Color 0 0 0 1\n" +
+       "Begin QUAD_STRIP\n"+
+       "Vertex 1 1\nVertex 1 0\n"+
+       "Vertex 0 1\nVertex 0 0\n"+
+       "End\n"+
+        "PopAttrib\n"
+       )
 
 #test box forwarding
+    cs = c.affine(0, 0, 10, 10, 100, 0, 0, 100)
     cs_box = c.orthoBox(cs, 0, 0, 0, 1, 1, 10, 10)
+    cs_clip = c.affine(0, 0, 0, 0, 200, 0, 0, 200)
     cs_cull = c.cull(cs_box, cs_clip)
     boxwh = zeros(2, 'f')
     c.getSqSize(cs_cull, boxwh)
@@ -204,57 +196,73 @@
     failIf(boxwh[0] != 10.0, "%s != 10.0" % (boxwh[0]))
     failIf(boxwh[1] != 10.0, "%s != 10.0" % (boxwh[1]))
 
-#test findBoundingBox bugfix
-    cs_box = c.orthoBox(0, 0, 0, 0, 200, 100, 1, 2)
-    cs_clip = c.orthoBox(0, 0,100, 0, 100, 100, 1, 1)
-    cs_cull = c.cull(cs_box, cs_clip)
-    putThings()
-    checkNotAvgColor(0, 0, 200, 200, (255, 0, 0), delta=50)
-       
-#test same area
-    cs_clip = c.affine(0, 0, 10, 10, 100, 0, 0, 100)
+#test translation forward
+#    cs4 = c.affine(0, 0, 0, 0, 100, 0, 0, 100)
+#    cs4clip = c.affine(0, 0, 50, 50, 10, 0, 0, 10)
+
+#    cs4cull = c.cull(cs4, cs4clip)
+#    checkTrans(vs, cs4cull, [0, 0, 0, 1, 1, 1, 2, 2, 2], [0, 0, 0, 100, 100, 
1, 200, 200, 2])
+
+#Why is that? Culling hasn't ever affected translation.
+#    c.setAffineParams(cs4clip, 0, 1500, 1500, 10, 0, 0, 10)
+#    checkNoTrans(vs, cs4cull)
+
+#test side touch (should not be drawn)
+    cs = c.affine(0, 0, 10, 10, 100, 0, 0, 100)
+    cs_clip = c.affine(0, 0, 111, 60, 10, 0, 0, 10)
     cs_cull = c.cull(cs, cs_clip)
 
     putThings()
-    checkNotAvgColor(10, 10, 100, 100, (255, 0, 0), delta=50)
+    checkAvgColor(10, 10, 100, 100, (255, 0, 0), delta=50)
 
-#test normal intersection
-    cs_clip = c.affine(0, 0, 60, 60, 100, 0, 0, 100)
+#test corner-touch (should not be drawn)
+    cs = c.affine(0, 0, 10, 10, 100, 0, 0, 100)
+    cs_clip = c.affine(0, 0, 110, 110, 10, 0, 0, 10)
     cs_cull = c.cull(cs, cs_clip)
 
     putThings()
-    checkNotAvgColor(10, 10, 100, 100, (255, 0, 0), delta=50)
+    checkAvgColor(10, 10, 100, 100, (255, 0, 0), delta=50)
 
-#test clip inside
-    cs_clip = c.affine(0, 0, 60, 60, 10, 0, 0, 10)
+#test clip outside (should not be drawn)
+    cs = c.affine(0, 0, 10, 10, 100, 0, 0, 100)
+    cs_clip = c.affine(0, 0, 120, 60, 10, 0, 0, 10)
     cs_cull = c.cull(cs, cs_clip)
 
     putThings()
-    checkNotAvgColor(10, 10, 100, 100, (255, 0, 0), delta=50)
+    checkAvgColor(10, 10, 100, 100, (255, 0, 0), delta=50)
 
-#test side touch (should not be drawn)
+#test distorted outside (should not be drawn)
+#normally without distortion this should be drawn
+#    cs = c.affine(0, 0, 10, 10, 100, 0, 0, 100)
+#    cs_d = c.distort(cs, 0, 0, 1, 1, 1, 0.1) 
+#    cs_clip = c.affine(0, 0, 10, 100, 100, 0, 0, 100)
+#    cs_cull = c.cull(cs_d, cs_clip)
+#    putThings()
+#    checkAvgColor(10, 10, 80, 80, (255, 0, 0), delta=50)
+
+#test same area (should be drawn)
     cs = c.affine(0, 0, 10, 10, 100, 0, 0, 100)
-    cs_clip = c.affine(0, 0, 110, 60, 10, 0, 0, 10)
+    cs_clip = c.affine(0, 0, 10, 10, 100, 0, 0, 100)
     cs_cull = c.cull(cs, cs_clip)
 
     putThings()
-    checkAvgColor(10, 10, 100, 100, (255, 0, 0), delta=50)
+    checkNotAvgColor(10, 10, 100, 100, (255, 0, 0), delta=50)
 
-#test corner-touch (should not be drawn)
+#test normal intersection (should be drawn)
     cs = c.affine(0, 0, 10, 10, 100, 0, 0, 100)
-    cs_clip = c.affine(0, 0, 110, 110, 10, 0, 0, 10)
+    cs_clip = c.affine(0, 0, 60, 60, 100, 0, 0, 100)
     cs_cull = c.cull(cs, cs_clip)
 
     putThings()
-    checkAvgColor(10, 10, 100, 100, (255, 0, 0), delta=50)
+    checkNotAvgColor(10, 10, 100, 100, (255, 0, 0), delta=50)
 
-#test clip outside (should not be drawn)
+#test clip inside (should be drawn)
     cs = c.affine(0, 0, 10, 10, 100, 0, 0, 100)
-    cs_clip = c.affine(0, 0, 120, 60, 10, 0, 0, 10)
+    cs_clip = c.affine(0, 0, 60, 60, 10, 0, 0, 10)
     cs_cull = c.cull(cs, cs_clip)
 
     putThings()
-    checkAvgColor(10, 10, 100, 100, (255, 0, 0), delta=50)
+    checkNotAvgColor(10, 10, 100, 100, (255, 0, 0), delta=50)
 
 #test distorted inside (should be drawn)
     cs = c.affine(0, 0, 10, 10, 100, 0, 0, 100)
@@ -265,26 +273,14 @@
     putThings()
     checkNotAvgColor(10, 10, 100, 100, (255, 0, 0), delta=50)
 
-#test distorted outside (should not be drawn)
-    cs = c.affine(0, 0, 10, 10, 100, 0, 0, 100)
-    cs_d = c.distort(cs, 0, 0, 1, 1, 1, 0.1) 
-    #normally without distortion this should be drawn
-    cs_clip = c.affine(0, 0, 10, 100, 100, 0, 0, 100)
-    cs_cull = c.cull(cs_d, cs_clip)
+#test findBoundingBox bugfix (should be drawn)
+    cs_box = c.orthoBox(0, 0, 0, 0, 200, 100, 1, 2)
+    cs_clip = c.orthoBox(0, 0, 100, 0, 100, 100, 1, 1)
+    cs_cull = c.cull(cs_box, cs_clip)
 
     putThings()
-    checkAvgColor(10, 10, 80, 80, (255, 0, 0), delta=50)
-
-    cs4 = c.affine(0, 0, 0, 0, 100, 0, 0, 100)
-    cs4clip = c.affine(0, 0, 50, 50, 10, 0, 0, 10)
-
-    cs4cull = c.cull(cs4, cs4clip)
-    checkTrans(vs, cs4cull, [0, 0, 0, 1, 1, 1, 2, 2, 2], [0, 0, 0, 100, 100, 
1, 200, 200, 2])
-
-    c.setAffineParams(cs4clip, 0, 1500, 1500, 10, 0, 0, 10)
-    checkNoTrans(vs, cs4cull)
-
-
+    checkNotAvgColor(0, 0, 200, 200, (255, 0, 0), delta=50)
+       
 def testInterpolateType():
     """Test that cses of different types get interpolated
     """
[Prev in Thread]
Current Thread
[Next in Thread]
[Gzz-commits] libvob ./TODO include/vob/FunctionalPrimitives...., Asko Soukka <=
Prev by Date: [Gzz-commits] fenfire/org/fenfire/loom ColorScheme.java Loom....
Next by Date: [Gzz-commits] fenfire/org/fenfire/loom WheelView.test
Previous by thread: [Gzz-commits] fenfire/org/fenfire/loom ColorScheme.java Loom....
Next by thread: [Gzz-commits] gzz/gzz/client AbstractUpdateManager.java awt/J...
Index(es):
- Date
- Thread