[Gzz-commits] fenfire/org/fenfire/spanimages/gl DefaultSpanIm...

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Branch:         
Changes by:     Tuomas J. Lukka <address@hidden>        03/06/23 09:10:27

Modified files:
        org/fenfire/spanimages/gl: DefaultSpanImageFactory.java 
                                   PlainPaperMaker.java 
Added files:
        org/fenfire/spanimages/gl: spanimages.test 

Log message:
        Failing test

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/spanimages/gl/spanimages.test?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/spanimages/gl/DefaultSpanImageFactory.java.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/spanimages/gl/PlainPaperMaker.java.diff?tr1=1.2&tr2=1.3&r1=text&r2=text

Patches:
Index: fenfire/org/fenfire/spanimages/gl/DefaultSpanImageFactory.java
diff -u fenfire/org/fenfire/spanimages/gl/DefaultSpanImageFactory.java:1.2 
fenfire/org/fenfire/spanimages/gl/DefaultSpanImageFactory.java:1.3
--- fenfire/org/fenfire/spanimages/gl/DefaultSpanImageFactory.java:1.2  Mon Jun 
23 08:30:42 2003
+++ fenfire/org/fenfire/spanimages/gl/DefaultSpanImageFactory.java      Mon Jun 
23 09:10:27 2003
@@ -37,9 +37,13 @@
 
 public class DefaultSpanImageFactory extends SpanImageFactory {
 
-    public PoolManager poolManager;
-    public PaperMaker paperMaker;
+    public PoolManager poolManager = new PoolManager();
+    public PaperMaker paperMaker = new PlainPaperMaker();
     public ScrollBlockImager scrollBlockImager;
+
+    public DefaultSpanImageFactory(ScrollBlockImager imager) {
+       this.scrollBlockImager = imager;
+    }
 
     /** Get the whole contiguous 2D image that this span is a part of.
      * To be removed once alph/imagespan_getwholepage--tjl or something
Index: fenfire/org/fenfire/spanimages/gl/PlainPaperMaker.java
diff -u fenfire/org/fenfire/spanimages/gl/PlainPaperMaker.java:1.2 
fenfire/org/fenfire/spanimages/gl/PlainPaperMaker.java:1.3
--- fenfire/org/fenfire/spanimages/gl/PlainPaperMaker.java:1.2  Mon Jun 23 
08:30:42 2003
+++ fenfire/org/fenfire/spanimages/gl/PlainPaperMaker.java      Mon Jun 23 
09:10:27 2003
@@ -34,7 +34,7 @@
  * This PaperMaker loads the texture into n of the first texunits
  * and executes the given callgl code.
  */
-public class PlainPaperMaker {
+public class PlainPaperMaker implements PaperMaker {
 
     int n;