[Gzz-commits] fenfire ./build.xml org/fenfire/view/PageSpanLa...

[Tuomas J. Lukka]

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

Modified files:
        .              : build.xml 
        org/fenfire/view: PageSpanLayout.java 
        org/fenfire/view/buoy: pagespanNodes.py 

Log message:
        Use fixedPaperQuad

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/build.xml.diff?tr1=1.25&tr2=1.26&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/PageSpanLayout.java.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/buoy/pagespanNodes.py.diff?tr1=1.6&tr2=1.7&r1=text&r2=text

Patches:
Index: fenfire/build.xml
diff -u fenfire/build.xml:1.25 fenfire/build.xml:1.26
--- fenfire/build.xml:1.25      Mon Mar 31 17:15:55 2003
+++ fenfire/build.xml   Wed Apr  2 03:47:09 2003
@@ -23,7 +23,7 @@
 
     <target name="compilejava">
         <mkdir dir="${build}"/>
-       <javac srcdir="${src}" destdir="${build}">
+       <javac srcdir="${src}" destdir="${build}" excludes="org/nongnu/**">
            <classpath refid="theClassPath"/>
        </javac>
     </target>
Index: fenfire/org/fenfire/view/PageSpanLayout.java
diff -u fenfire/org/fenfire/view/PageSpanLayout.java:1.2 
fenfire/org/fenfire/view/PageSpanLayout.java:1.3
--- fenfire/org/fenfire/view/PageSpanLayout.java:1.2    Mon Mar 31 14:44:25 2003
+++ fenfire/org/fenfire/view/PageSpanLayout.java        Wed Apr  2 03:47:09 2003
@@ -18,7 +18,10 @@
     private void pa(String s) { System.out.println(s); }
 
     public static final float scale = 72 * 6;
-    public static float dicefactor = .5f;
+
+    public static float diceLength = 20f;
+    public static int diceDepth = 20;
+    public static int  flags = 2;
 
     public interface PageSpanPaperMaker {
        PageSpanPaper getPaper(GLSpanner.SpanPage p, PageSpan sp);
@@ -165,11 +168,14 @@
            curx += scale * xywh[4*p + 2];
 
            psps[p].request(importance, scale * pixelscale);
-           vs.map.put(GLRen.createPaperQuad(psps[p].getPaper(useBg, useText), 
+           vs.map.put(GLRen.createFixedPaperQuad(psps[p].getPaper(useBg, 
useText), 
                        xywh[4*p + 0], 
                        xywh[4*p + 1], 
                        xywh[4*p + 0]+xywh[4*p + 2], 
-                       xywh[4*p + 1]+xywh[4*p + 3], 1, dicefactor, 0), tr, 0);
+                       xywh[4*p + 1]+xywh[4*p + 3], flags,
+                       diceLength,
+                       diceDepth
+                       ), tr);
        }
     }
 
Index: fenfire/org/fenfire/view/buoy/pagespanNodes.py
diff -u fenfire/org/fenfire/view/buoy/pagespanNodes.py:1.6 
fenfire/org/fenfire/view/buoy/pagespanNodes.py:1.7
--- fenfire/org/fenfire/view/buoy/pagespanNodes.py:1.6  Thu Mar 27 05:58:15 2003
+++ fenfire/org/fenfire/view/buoy/pagespanNodes.py      Wed Apr  2 03:47:09 2003
@@ -47,7 +47,7 @@
 
 
 
-def placeFramed(vs, data, paperCS, viewport, cull=-1):
+def placeFramed(vs, data, paperCS, viewport, cull=-1, linemode = 0):
     class FrameR(java.lang.Runnable):
        def run(rself):
            vs.map.put(data.irregu.frame, paperCS, viewport)
@@ -59,13 +59,27 @@
            data.layout.place(vs, paperCS, .05, 100, cull)
     
     # vob.gl.Stencil.drawStenciled(vs, ContentR(), None, FrameR(), LayoutR(), 
1)
+
+    if linemode:
+       vs.put(vob.gl.GLCache.getCallList("""
+           PushAttrib POLYGON_BIT
+           PolygonMode FRONT_AND_BACK LINE
+       """))
+
     LayoutR().run()
 
+    if linemode:
+       vs.put(vob.gl.GLCache.getCallList("""
+           PopAttrib
+       """))
+
 
 
 class ScrollblockData:
     def __init__(self, scrollBlock):
        self.layout = fenfire.view.PageSpanLayout(scrollBlock.getCurrent())
+       self.layout.flags = 2
+       self.layout.diceLength = 40
        self.irregu = vob.putil.effects.IrreguFrame(0, 0, 
                        self.layout.w, self.layout.h, 50, 200)
 
@@ -164,7 +178,7 @@
 
 class PageSpanMainNode(vob.buoy.BuoyViewMainNode):
     fisheye = vob.view.FisheyeState(
-        1.1, .1, 5, 2, 1000
+        1.1, .1, 5, .1, 500
        )
     fisheye.curmag = 1.75
     fisheye.cursize = 200
@@ -183,6 +197,15 @@
        self.fisheye.setCenter(xywh[0] + .5 * xywh[2],
                                xywh[1] + .5 * xywh[3])
 
+       dk = vob.putil.demokeys
+
+       self.keystroke = dk.KeyPresses(self,
+           dk.Toggle("linemode", 0, "(debug) Draw only edges of polygons", 
"l"),
+           )
+#if key == "Ctrl-H":
+#    import org
+#    org.fenfire.util.PageSpanPaper.withHalo = not 
org.fenfire.util.PageSpanPaper.withHalo 
+
     def _linkEndCS(self, enf, key):
        """Make a coordinate system for the link end and return it.
        """
@@ -197,7 +220,7 @@
     def renderMain(self, vs, into):
        self.vs = vs
        vs.coords.getSqSize(into, size)
-       print "SQ:", size[0], size[1]
+       # print "SQ:", size[0], size[1]
        
        self.scale = size[1] / self.data.layout.h 
        self.ctr = vs.translateCS(into, "ORIGIN", .5 * size[0],
@@ -212,13 +235,17 @@
        viewport = vs.coords.ortho(0,  0, -shi*w, -shi*h, (1+2*shi)*w, 
(1+2*shi)*h)
        vs.matcher.add(into, viewport, "VIEWPORT")
 
-       placeFramed(vs, self.data, self.shift, viewport)
+       placeFramed(vs, self.data, self.shift, viewport, linemode = 
self.linemode)
        
+       print "Links ",self.nodetype.scrollBlockLinker.enfiladeOverlap, \
+                   self.nodetype.scrollBlockLinker.xuIndex 
 
        if self.nodetype.scrollBlockLinker.enfiladeOverlap != None:
            matches = (self.nodetype.scrollBlockLinker
                                .enfiladeOverlap.getMatches(self.enf))
+           print "EnfOver"
            for m in matches:
+               print "eomatch: ",m
                enf = m.space.getCellTexter().getEnfilade(m, None)
                linkId = vob.util.Pair(m, self.scrollBlock)
                thisEndCS = self._linkEndCS(enf, linkId)
@@ -231,7 +258,9 @@
            for dir, index, thisEndName, otherEndName in [
                        (1, xuIndex.getForwardIndex(), "from", "to"),
                        (-1, xuIndex.getBackwardIndex(), "to", "from")]:
+               print "xu ",dir
                for xulink in index.getMatches(self.enf):
+                   print xulink
                    myenf = getattr(xulink, thisEndName)
                    thisEndCS = self._linkEndCS(myenf, xulink)
                    endenf = getattr(xulink, otherEndName)
@@ -260,28 +289,26 @@
            self.doReq()
            return 1
        if mouseEvent.getID() == mouseEvent.MOUSE_CLICKED:
-           print "MOUSE PSPMAIN ",mouseEvent
+           # print "MOUSE PSPMAIN ",mouseEvent
            size[0] = mouseEvent.getX()
            size[1] = mouseEvent.getY()
            size[2] = 0
            tmp = jarray.zeros(3, 'f')
            oldVS.coords.inverseTransformPoints3(self.ctr, size, tmp)
-           print "Ev - ctr: ",mouseEvent, tmp[0], tmp[1], tmp[2]
+           # print "Ev - ctr: ",mouseEvent, tmp[0], tmp[1], tmp[2]
            oldVS.coords.inverseTransformPoints3(self.scale, size, tmp)
-           print "Ev - scale: ",mouseEvent, tmp[0], tmp[1], tmp[2]
+           # print "Ev - scale: ",mouseEvent, tmp[0], tmp[1], tmp[2]
 
            oldVS.coords.inverseTransformPoints3(self.shift, size, size)
-           print "Ev: ",size[0], size[1], size[2]
+           # print "Ev: ",size[0], size[1], size[2]
            # print "Self.xy was",self.x,self.y
            oldVS.coords.transformPoints3(self.shift, size, tmp)
-           print "Retransformed:", tmp[0], tmp[1], tmp[2]
+           # print "Retransformed:", tmp[0], tmp[1], tmp[2]
            x = size[0]
            y = size[1]
             self.moveTo(x, y)
-            print 'move to attribs: ',x,':',y
+            # print 'move to attribs: ',x,':',y
            # self.setShift(oldVS)
            return 0
        return 0
-    def keystroke(self, key):
-       pass