[Fencommits] libvob: Small twids.

[Matti J. Katila]

Mon Apr  3 19:37:50 EEST 2006  Matti J. Katila <majukati at cc.jyu.fi>
  * Small twids.

diff -rN -u libvob-old/org/nongnu/libvob/gl/Ren.java libvob-new/org/nongnu/libvob/gl/Ren.java
--- libvob-old/org/nongnu/libvob/gl/Ren.java	2006-04-03 20:05:10.817129864 +0300
+++ libvob-new/org/nongnu/libvob/gl/Ren.java	2006-04-03 19:39:39.000000000 +0300
@@ -50,8 +50,13 @@
     }
     public interface EasyPaperQuad {
     }
+    
+    final static public int PAPERQUAD_CS2_TO_SCREEN = 1;
+    final static public int PAPERQUAD_USE_VERTEX_PROGRAM = 2;
+    final static public int PAPERQUAD_NONL_MAXLEN = 4;
     public interface PaperQuad extends Vob {
     }
+
     public interface FixedPaperQuad {
     }
     public interface DiceTester {
@@ -95,7 +100,7 @@
 	    lwjglRenderables = new LWJGLRen();
     }
     
-    public static PaperQuad createPaperQuad(Paper paper, 
+    public static PaperQuad createPaperQuad(PaperMill.Paper paper, 
 	    float x0, float y0, float x1, float y1, float dicefactor) {
 
 	if (lwjglRenderables != null)
diff -rN -u libvob-old/org/nongnu/libvob/impl/lwjgl/SimpleTest.java libvob-new/org/nongnu/libvob/impl/lwjgl/SimpleTest.java
--- libvob-old/org/nongnu/libvob/impl/lwjgl/SimpleTest.java	2006-04-03 20:05:10.818129713 +0300
+++ libvob-new/org/nongnu/libvob/impl/lwjgl/SimpleTest.java	2006-04-03 19:39:39.000000000 +0300
@@ -65,10 +65,10 @@
 		    vs.put(new RectVob(Color.RED, 1), cs=vs.scaleCS(cs, "foo", 2,1.5f));
 		    vs.put(new TextVob(GraphicsAPI.getInstance().getTextStyle("sans", 0, 12), "foobar"), cs=vs.scaleCS(cs, "t", 10,10));
 		    
-//		    PaperMill.Paper paper = PaperMill.getInstance().getPaper(42);
-//		    Ren.PaperQuad pq = Ren.createPaperQuad(paper, 0, 0, 1, 1, 1);
-//		    int cs1 = vs.orthoCS(0, "1", 0, 0, 0, 200, 200);
-//		    vs.map.put(pq, cs1, 0);
+		    PaperMill.Paper paper = PaperMill.getInstance().getPaper(0);
+		    Ren.PaperQuad pq = Ren.createPaperQuad(paper, 0, 0, 1, 1, 1);
+		    int cs1 = vs.orthoCS(0, "1", 0, 0, 0, 200, 200);
+		    vs.map.put(pq, cs1, 0);
 
 		    return vs;
 		}