[Gzz-commits] libvob/org/nongnu/libvob demo/fpfont.py util/PS...

[Tuomas J. Lukka]

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

Modified files:
        org/nongnu/libvob/demo: fpfont.py 
        org/nongnu/libvob/util: PS2Reader.java 

Log message:
        Working ps2 reader

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/org/nongnu/libvob/demo/fpfont.py.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/org/nongnu/libvob/util/PS2Reader.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text

Patches:
Index: libvob/org/nongnu/libvob/demo/fpfont.py
diff -u libvob/org/nongnu/libvob/demo/fpfont.py:1.13 
libvob/org/nongnu/libvob/demo/fpfont.py:1.14
--- libvob/org/nongnu/libvob/demo/fpfont.py:1.13        Wed Apr  9 07:51:59 2003
+++ libvob/org/nongnu/libvob/demo/fpfont.py     Wed Apr  9 09:03:27 2003
@@ -105,18 +105,58 @@
 
 # R6 = texels per pixel
 
-TEX R0, f[TEX0].xyzw, TEX0, 2D;
-MAD R0, R0.w, 256, R0.x;
+
+#TEX R0, R10, TEX0, 2D;
+#MUL R0, R0, 16;
+# MAD R11, 
+# MAD R0, R0.w, 256, R0.x;
 # MAD R0, R0.x, 256, R0.w;
 
+# Sample in an X pattern.
+
+DEFINE rad=.2;
+
+MAD R11, rad, R8, R10;
+MAD R11, rad, R9, R10;
+TEX R12, R11, TEX0, 2D;
+MAD R1.x, R12.w, 256, R12.x;
+
+MAD R11, -rad, R8, R10;
+MAD R11, -rad, R9, R10;
+TEX R12, R11, TEX0, 2D;
+MAD R1.y, R12.w, 256, R12.x;
+
+MAD R11, rad, R8, R10;
+MAD R11, -rad, R9, R10;
+TEX R12, R11, TEX0, 2D;
+MAD R1.z, R12.w, 256, R12.x;
+
+MAD R11, -rad, R8, R10;
+MAD R11, rad, R9, R10;
+TEX R12, R11, TEX0, 2D;
+MAD R1.w, R12.w, 256, R12.x;
+
+# Scale up by 256 and down by 16
+MUL R1, R1, 16;
+
+# Now, R1 contains the 4 texel lengths
+# of the edges from the 4 points.
+
 # Scale
-MUL R0, R0, .0625;
-MUL R1, R0, 256;
 
 # Calculate half the width - i.e. the radius
 MUL R6, R6, .5;
 
+# Further scale down by half for the X sampling pattern
+MUL R6, R6, .5;
+
 SLT R0, R1, R6;
+
+# Then, what to do with this?
+DP4 R0, R0, 1;
+MUL R0, R0, .25;
+
+# SLE R0, R1, 0;
 
 # MUL R6, R6, .5;
 # 
Index: libvob/org/nongnu/libvob/util/PS2Reader.java
diff -u libvob/org/nongnu/libvob/util/PS2Reader.java:1.1 
libvob/org/nongnu/libvob/util/PS2Reader.java:1.2
--- libvob/org/nongnu/libvob/util/PS2Reader.java:1.1    Wed Apr  9 08:31:05 2003
+++ libvob/org/nongnu/libvob/util/PS2Reader.java        Wed Apr  9 09:03:27 2003
@@ -11,17 +11,15 @@
        void chg(int x, int y, int z, boolean b1, boolean b2, boolean b3);
     };
 
-    private FileInputStream in;
-    private FileOutputStream out;
+    private RandomAccessFile in;
     private Listener chg;
 
     static final byte[] imps2 = new byte[] {
        (byte)0xf3, (byte)0xc8, (byte)0xf3, (byte)0x64, (byte)0xf3, (byte)0x50
     };
     public PS2Reader(String file) throws IOException {
-       out = new FileOutputStream(file);
-       in = new FileInputStream(out.getFD());
-       out.write(imps2);
+       in = new RandomAccessFile(file, "rw");
+       in.write(imps2);
     }
 
     public int x;
@@ -54,7 +52,21 @@
        b2 = (buf[0] & 2) != 0;
        b3 = (buf[0] & 4) != 0;
 
-       chg.chg(x, y, z, b1, b2, b3);
+       if(chg != null)
+           chg.chg(x, y, z, b1, b2, b3);
+    }
+
+    public void print() {
+       System.out.println(""+x+"\t"+y+"\t"+z+"\t"+b1+
+                       "\t"+b2+"\t"+b3);
+    }
+
+    static public void main(String[] argv) throws Exception {
+       PS2Reader r = new PS2Reader(argv[0]);
+       while(true) {
+           r.read();
+           r.print();
+       }
     }
 
 }