[Gzz-commits] gzz gfx/librenderables/renderables.py gzz/view/...

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Tuomas J. Lukka <address@hidden>        03/02/13 10:28:10

Modified files:
        gfx/librenderables: renderables.py 
        gzz/view/buoy  : pagespanNodes.py 

Log message:
        Irregu animation

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/librenderables/renderables.py.diff?tr1=1.175&tr2=1.176&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/buoy/pagespanNodes.py.diff?tr1=1.34&tr2=1.35&r1=text&r2=text

Patches:
Index: gzz/gfx/librenderables/renderables.py
diff -u gzz/gfx/librenderables/renderables.py:1.175 
gzz/gfx/librenderables/renderables.py:1.176
--- gzz/gfx/librenderables/renderables.py:1.175 Wed Feb 12 05:13:02 2003
+++ gzz/gfx/librenderables/renderables.py       Thu Feb 13 10:28:09 2003
@@ -1350,6 +1350,10 @@
         int dicex = (int)fabs(2 * border * (1 / bx - 2) * nonl) + 1;
         int dicey = (int)fabs(2 * border * (1 / by - 2) * nonl) + 1;
 
+       if(diceb > 20) diceb = 20;
+       if(dicex > 60) dicex = 60;
+       if(dicey > 60) dicey = 60;
+
         // Dicing number for each of the primitives 
         int dice[] = { dicey, dicey, dicex, dicex, diceb, diceb, diceb, diceb 
};
 
Index: gzz/gzz/view/buoy/pagespanNodes.py
diff -u gzz/gzz/view/buoy/pagespanNodes.py:1.34 
gzz/gzz/view/buoy/pagespanNodes.py:1.35
--- gzz/gzz/view/buoy/pagespanNodes.py:1.34     Thu Feb 13 09:39:30 2003
+++ gzz/gzz/view/buoy/pagespanNodes.py  Thu Feb 13 10:28:09 2003
@@ -13,7 +13,7 @@
 # 
 # "LAYOUT" - the coordinate system in which the pagespan layout
 #            is rendered into.
-# "VIEWPORT" - the edges of the viewport
+# "VIEWPORT" - the edges of the viewport, w.r.t. LAYOUT
 
 import jarray
 import java
@@ -26,6 +26,20 @@
 pscv = gzz.view.PageSpanCellView()
 pscv.useBg = 1
 
+def placeFramed(vs, data, paperCS, viewport, cull=-1):
+    class FrameR(java.lang.Runnable):
+       def run(rself):
+           vs.map.put(data.irregu.frame, paperCS, viewport)
+    class ContentR(java.lang.Runnable):
+       def run(rself):
+           vs.map.put(data.irregu.content, paperCS, viewport)
+    class LayoutR(java.lang.Runnable):
+       def run(rself):
+           data.layout.place(vs, paperCS, .6, 200, cull)
+    
+    gzz.gfx.gl.Stencil.drawStenciled(vs, ContentR(), None, FrameR(), 
LayoutR(), 1)
+
+
 class ScrollblockData:
     def __init__(self, scrollBlock):
        self.layout = pscv.getLayout(scrollBlock)
@@ -52,7 +66,6 @@
        self.scrollBlockLinker = scrollBlockLinker
     def createMainNode(self, linkId, anchorSpan, listener):
        return PageSpanMainNode(self, anchorSpan, listener)
-
 size = jarray.zeros(2, 'f')
 
 class WholePageSpanNodeType(AbstractPageSpanNodeType):
@@ -103,20 +116,10 @@
        paperCS = vs.orthoCS(into, "paper", 0, -extents[0] * scale,
                                -extents[1] * scale, scale, scale)
 
-       paperLoc = vs.coords.ortho(0, 0, extents[0], extents[1], extents[2], 
extents[3])
-       vs.matcher.add(paperCS, paperLoc, "VIEWPORT")
+       viewport = vs.coords.ortho(0, 0, extents[0], extents[1], extents[2], 
extents[3])
+       vs.matcher.add(into, viewport, "VIEWPORT")
 
-       class FrameR(java.lang.Runnable):
-           def run(rself):
-               vs.map.put(data.irregu.frame, paperCS, paperLoc)
-       class ContentR(java.lang.Runnable):
-           def run(rself):
-               vs.map.put(data.irregu.content, paperCS, paperLoc)
-       class LayoutR(java.lang.Runnable):
-           def run(rself):
-               data.layout.place(vs, paperCS, .6, 200, into)
-       
-       gzz.gfx.gl.Stencil.drawStenciled(vs, ContentR(), None, FrameR(), 
LayoutR(), 1)
+       placeFramed(vs, data, paperCS, viewport, into)
        # LayoutR().run()
 
 
@@ -141,7 +144,7 @@
        xywh = self.data.layout.getExtents(anchorSpan, None)
 
        self.fisheye = gzz.view.FisheyeState(
-           1.1, .04, 5, 2, 1000
+           1.1, .1, 5, 2, 1000
        )
 
        self.fisheye.setCenter(xywh[0] + .5 * xywh[2],
@@ -171,7 +174,13 @@
        self.shift = self.fisheye.getCoordsys(vs, self.scale, "TR")
        vs.matcher.add(into, self.shift, "LAYOUT")
 
-       self.data.layout.place(vs, self.shift, .7, 300)
+       w,h = self.data.layout.w, self.data.layout.h
+       shi = .2
+       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)
+       
 
        if self.nodetype.scrollBlockLinker.enfiladeOverlap != None:
            matches = (self.nodetype.scrollBlockLinker