[Gzz-commits] fenfire/org/fenfire demo/detail/pagespanbgfilte...

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Branch:         
Changes by:     Tuomas J. Lukka <address@hidden>        03/06/25 07:02:27

Modified files:
        org/fenfire/demo/detail: pagespanbgfilter.py 
        org/fenfire/spanimages/gl: PlainPaperMaker.java 

Log message:
        Ahh - need to clone

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/demo/detail/pagespanbgfilter.py.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/spanimages/gl/PlainPaperMaker.java.diff?tr1=1.7&tr2=1.8&r1=text&r2=text

Patches:
Index: fenfire/org/fenfire/demo/detail/pagespanbgfilter.py
diff -u fenfire/org/fenfire/demo/detail/pagespanbgfilter.py:1.6 
fenfire/org/fenfire/demo/detail/pagespanbgfilter.py:1.7
--- fenfire/org/fenfire/demo/detail/pagespanbgfilter.py:1.6     Wed Jun 25 
06:45:44 2003
+++ fenfire/org/fenfire/demo/detail/pagespanbgfilter.py Wed Jun 25 07:02:27 2003
@@ -26,7 +26,7 @@
 import vob
 import java, org
 from org import fenfire as ff
-from org.nongnu.libvob.gl import GL, GLRen, GLCache
+from org.nongnu.libvob.gl import GL, GLRen, GLCache, PaperMill
 from org.nongnu import alph
 from org.nongnu import storm
 
@@ -41,7 +41,7 @@
 
 class Scene:
     def __init__(self):
-       w = vob.putil.demowindow.w
+       self.w = w = vob.putil.demowindow.w
        self.types = [
            papermakers.white(w),
            papermakers.fancyBlend(w),
@@ -58,6 +58,13 @@
            SlideLog("scale", 1, "scale", "-", "+"),
        )
     def scene(self, vs):
+
+       print "TEST:"
+       
+       paper = PaperMill.getInstance().getOptimizedPaper(
+           42, self.w)
+       print "NUMS: ",paper.getNPasses(), paper.getPass(0).getNTexGens()
+
        vs.map.put(vob.vobs.SolidBackdropVob(java.awt.Color.yellow))
 
        self.spanImageFactory.paperMaker = self.types[self.type]
Index: fenfire/org/fenfire/spanimages/gl/PlainPaperMaker.java
diff -u fenfire/org/fenfire/spanimages/gl/PlainPaperMaker.java:1.7 
fenfire/org/fenfire/spanimages/gl/PlainPaperMaker.java:1.8
--- fenfire/org/fenfire/spanimages/gl/PlainPaperMaker.java:1.7  Wed Jun 25 
06:43:59 2003
+++ fenfire/org/fenfire/spanimages/gl/PlainPaperMaker.java      Wed Jun 25 
07:02:27 2003
@@ -96,13 +96,15 @@
        int offs = 0;
        StringBuffer buf = new StringBuffer();
        if(papermill != null) {
-           p = papermill.getOptimizedPaper(
-                       img.scrollBlock.hashCode(), w);
+           p = (Paper) papermill.getOptimizedPaper(
+                       img.scrollBlock.hashCode(), w).clone();
            if(p.getNPasses() != 1)
-               throw new Error("Invalid paper gotten back");
+               throw new Error("Invalid paper gotten back: npasses "+
+                               p.getNPasses()+" "+p);
            pass = p.getPass(0);
            if(pass.getNTexGens() != 1)
-               throw new Error("Invalid paper gotten back");
+               throw new Error("Invalid paper gotten back: ntexgens "+
+                               pass.getNTexGens()+" "+p);
            offs = 1;
            buf.append(pass.getSetupcode());
        } else {