[Gzz-commits] libvob include/vob/jni/Types.hxx org/nongnu/lib...

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/libvob
Module name:    libvob
Changes by:     Tuomas J. Lukka <address@hidden>        03/03/26 09:00:42

Modified files:
        include/vob/jni: Types.hxx 
        org/nongnu/libvob/gl: GLRen.java 
        src/jni        : Paper.cxx jnivobs.hxx 
        src/paper      : Paper.cxx 

Log message:
        Paperquad ported - tests not yet

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/include/vob/jni/Types.hxx.diff?tr1=1.17&tr2=1.18&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/org/nongnu/libvob/gl/GLRen.java.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/src/jni/Paper.cxx.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/src/jni/jnivobs.hxx.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/src/paper/Paper.cxx.diff?tr1=1.1&tr2=1.2&r1=text&r2=text

Patches:
Index: libvob/include/vob/jni/Types.hxx
diff -u libvob/include/vob/jni/Types.hxx:1.17 
libvob/include/vob/jni/Types.hxx:1.18
--- libvob/include/vob/jni/Types.hxx:1.17       Mon Mar 17 07:48:19 2003
+++ libvob/include/vob/jni/Types.hxx    Wed Mar 26 09:00:42 2003
@@ -26,6 +26,8 @@
 
 #include <jni.h>
 
+#include <GLMosaicText.hxx>
+
 #include <vob/Vob.hxx>
 #include <vob/Types.hxx>
 #include <vob/util/ObjectStorer.hxx>
@@ -33,8 +35,8 @@
 #include <vob/Debug.hxx>
 
 #include <vob/jni/Strings.hxx>
+#include <vob/paper/Paper.hxx>
 
-#include <GLMosaicText.hxx>
 
 
 namespace Vob {
@@ -61,6 +63,11 @@
     extern ObjectStorer<Os::RenderingSurface> windows;
     extern ObjectStorer<ByteVector> bytevectors;
 
+
+    typedef ::Vob::Paper::Paper P; // g++3.2 doesn't like ::... inside
+                                  // template param
+    extern ObjectStorer<P> papers;
+
     // XXX Copied from include/vob/vobs/Text.hxx
     typedef GLMosaicText::Renderer<
                GLMosaicText::DenseGlyphs<unsigned short>, 
@@ -175,6 +182,11 @@
     START_VOB_JNI_CONVERSION_IDDED(DefaultTextRenderer *, 
                "GL.Font")
        out = textrenderers[in]->rend;
+    END_VOB_JNI_CONVERSION
+
+    START_VOB_JNI_CONVERSION_IDDED(::Vob::Paper::Paper *, 
+               "Paper")
+       out = papers[in];
     END_VOB_JNI_CONVERSION
 
 }
Index: libvob/org/nongnu/libvob/gl/GLRen.java
diff -u libvob/org/nongnu/libvob/gl/GLRen.java:1.7 
libvob/org/nongnu/libvob/gl/GLRen.java:1.8
--- libvob/org/nongnu/libvob/gl/GLRen.java:1.7  Wed Mar 26 08:36:35 2003
+++ libvob/org/nongnu/libvob/gl/GLRen.java      Wed Mar 26 09:00:42 2003
@@ -113,6 +113,17 @@
  return _; }
 
 static private native int implcreateText1(int p0, String p1, float p2, int p3) 
; 
+static public class PaperQuad extends GL.Renderable2JavaObject  { private 
PaperQuad(int i) { super(i); }
+Paper p0;
+}
+static public PaperQuad createPaperQuad(Paper p0, float p1, float p2, float 
p3, float p4, float p5, float p6, int p7) { 
+PaperQuad _ = new PaperQuad(
+implcreatePaperQuad(p0.getId(), p1, p2, p3, p4, p5, p6, p7));
+_.p0 = p0;
+
+ return _; }
+
+static private native int implcreatePaperQuad(int p0, float p1, float p2, 
float p3, float p4, float p5, float p6, int p7) ; 
 
 
 }
Index: libvob/src/jni/Paper.cxx
diff -u libvob/src/jni/Paper.cxx:1.1 libvob/src/jni/Paper.cxx:1.2
--- libvob/src/jni/Paper.cxx:1.1        Wed Mar 26 08:15:03 2003
+++ libvob/src/jni/Paper.cxx    Wed Mar 26 09:00:42 2003
@@ -39,6 +39,9 @@
 using namespace Vob;
 using namespace CallGL;
 
+namespace Vob {
+namespace JNI {
+
 using std::cout;
 
 #define GLERR { int er = glGetError(); if(er != GL_NO_ERROR) \
@@ -171,3 +174,5 @@
       
 }
 
+}
+}
Index: libvob/src/jni/jnivobs.hxx
diff -u libvob/src/jni/jnivobs.hxx:1.1 libvob/src/jni/jnivobs.hxx:1.2
--- libvob/src/jni/jnivobs.hxx:1.1      Sun Mar 16 12:58:49 2003
+++ libvob/src/jni/jnivobs.hxx  Wed Mar 26 09:00:42 2003
@@ -8,9 +8,12 @@
 
 // These are the include files that contain
 // the actual vobs and transforms
+//
 #include <vob/vobs/Trivial.hxx>
 #include <vob/vobs/Pixel.hxx>
 #include <vob/vobs/Text.hxx>
+#include <vob/vobs/Paper.hxx>
+
 #include <vob/LinearPrimitives.hxx>
 #include <vob/FunctionalPrimitives.hxx>
 #include <vob/DisablablePrimitives.hxx>
Index: libvob/src/paper/Paper.cxx
diff -u libvob/src/paper/Paper.cxx:1.1 libvob/src/paper/Paper.cxx:1.2
--- libvob/src/paper/Paper.cxx:1.1      Wed Mar 26 08:15:03 2003
+++ libvob/src/paper/Paper.cxx  Wed Mar 26 09:00:42 2003
@@ -27,6 +27,7 @@
  */
 
 #include "vob/paper/Paper.hxx"
+#include "vob/vobs/Paper.hxx"
 
 
 /** The matrix that maps v[TEX0] into o[TEXi] is stored 
@@ -35,7 +36,14 @@
 #define tex_addr_base 60
 
 namespace Vob {
+namespace Vobs {
+    DBGVAR(dbg_paperquad, "Paperquad");
+}
+}
+
+namespace Vob {
 namespace Paper {
+
 
     TexGen::TexGen(const float *tex_mat) {
        this->tex_mat[0] = tex_mat[0];