[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gzz-commits] gzz gfx/demo/buoyoing.py gzz/gfx/gl/pagespanpap...
From: |
Tuomas J. Lukka |
Subject: |
[Gzz-commits] gzz gfx/demo/buoyoing.py gzz/gfx/gl/pagespanpap... |
Date: |
Tue, 11 Feb 2003 02:42:26 -0500 |
CVSROOT: /cvsroot/gzz
Module name: gzz
Changes by: Tuomas J. Lukka <address@hidden> 03/02/11 02:42:26
Modified files:
gfx/demo : buoyoing.py
gzz/gfx/gl : pagespanpaper.py
gzz/view : PageSpanCellView.java
gzz/view/buoy : pagespanNodes.py
Log message:
Fillrate testing / fixing stuff
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/demo/buoyoing.py.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/gfx/gl/pagespanpaper.py.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/PageSpanCellView.java.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/buoy/pagespanNodes.py.diff?tr1=1.22&tr2=1.23&r1=text&r2=text
Patches:
Index: gzz/gfx/demo/buoyoing.py
diff -u gzz/gfx/demo/buoyoing.py:1.9 gzz/gfx/demo/buoyoing.py:1.10
--- gzz/gfx/demo/buoyoing.py:1.9 Mon Feb 10 13:30:13 2003
+++ gzz/gfx/demo/buoyoing.py Tue Feb 11 02:42:26 2003
@@ -65,15 +65,16 @@
)
pagespans = [scroll.getCurrent() for scroll in pagescrolls]
- xuindexer.add(gzz.index.XuLink(
- pagespanNodes.makeEnf(pagespans[0].subSpan(1,2).subArea(0,50,400,200)),
- pagespanNodes.makeEnf(pagespans[1].subSpan(2,3).subArea(20,500,350,200))
- ))
+ if 1:
+ xuindexer.add(gzz.index.XuLink(
+
pagespanNodes.makeEnf(pagespans[0].subSpan(1,2).subArea(0,50,400,200)),
+
pagespanNodes.makeEnf(pagespans[1].subSpan(2,3).subArea(20,500,350,200))
+ ))
- xuindexer.add(gzz.index.XuLink(
- pagespanNodes.makeEnf(pagespans[2].subSpan(1,2).subArea(0,300,350,300)),
-
pagespanNodes.makeEnf(pagespans[0].subSpan(2,3).subArea(300,400,300,100)),
- ))
+ xuindexer.add(gzz.index.XuLink(
+
pagespanNodes.makeEnf(pagespans[2].subSpan(1,2).subArea(0,300,350,300)),
+
pagespanNodes.makeEnf(pagespans[0].subSpan(2,3).subArea(300,400,300,100)),
+ ))
scrollblockLinker.xuIndex = xuindexer
scrollblockLinker.xulinkPageSpanNodeType =
pagespanNodes.AnchorPageSpanNodeType(scrollblockLinker)
Index: gzz/gzz/gfx/gl/pagespanpaper.py
diff -u gzz/gzz/gfx/gl/pagespanpaper.py:1.3 gzz/gzz/gfx/gl/pagespanpaper.py:1.4
--- gzz/gzz/gfx/gl/pagespanpaper.py:1.3 Fri Feb 7 03:17:45 2003
+++ gzz/gzz/gfx/gl/pagespanpaper.py Tue Feb 11 02:42:26 2003
@@ -7,7 +7,7 @@
Enable TEXTURE_2D
TexParameter TEXTURE_2D TEXTURE_MIN_FILTER LINEAR_MIPMAP_NEAREST
TexParameter TEXTURE_2D TEXTURE_MAG_FILTER LINEAR
- TexParameter TEXTURE_2D TEXTURE_MAX_ANISOTROPY_EXT 1
+ TexParameter TEXTURE_2D TEXTURE_MAX_ANISOTROPY_EXT 10
"""
PageSpanPaper.setupOnlyPass = """
Index: gzz/gzz/view/PageSpanCellView.java
diff -u gzz/gzz/view/PageSpanCellView.java:1.15
gzz/gzz/view/PageSpanCellView.java:1.16
--- gzz/gzz/view/PageSpanCellView.java:1.15 Mon Feb 10 13:30:14 2003
+++ gzz/gzz/view/PageSpanCellView.java Tue Feb 11 02:42:26 2003
@@ -141,11 +141,17 @@
return null;
}
+ public void place(VobScene vs, int into, float importance, float
pixelscale) {
+
+ place(vs, into, importance, pixelscale, -1);
+ }
/** Place this layout into the given coordinate system.
* Note that the layout is not affected by the
* box size of the coordinate system.
+ * @param cullCS The coordinate system against which
+ * all objects should be culled.
*/
- public void place(VobScene vs, int into, float importance, float
pixelscale) {
+ public void place(VobScene vs, int into, float importance, float
pixelscale, int cullCS) {
float curx = 0;
// Now we can draw the pages.
for(int p = 0; p < npages; p++) {
@@ -154,6 +160,8 @@
int around = vs.orthoBoxCS(into, pages[p], 0,
curx, 0, scale, scale,
xywh[4*p+2], xywh[4*p+3]);
+ if(cullCS >= 0)
+ around = vs.cullCS(around, "CULL", cullCS);
// and then translate to the whole page.
int tr = vs.translateCS(around, "T", -xywh[4*p+0],
-xywh[4*p+1]);
curx += scale * xywh[4*p + 2];
Index: gzz/gzz/view/buoy/pagespanNodes.py
diff -u gzz/gzz/view/buoy/pagespanNodes.py:1.22
gzz/gzz/view/buoy/pagespanNodes.py:1.23
--- gzz/gzz/view/buoy/pagespanNodes.py:1.22 Sat Feb 8 17:13:40 2003
+++ gzz/gzz/view/buoy/pagespanNodes.py Tue Feb 11 02:42:26 2003
@@ -15,6 +15,7 @@
from gzz.view.buoy import BuoyViewNodeType, BuoyViewMainNode
pscv = gzz.view.PageSpanCellView()
+pscv.useBg = 0
def makeEnf(span):
return gzz.media.impl.Enfilade1DImpl.theMaker.makeEnfilade(span)
@@ -48,13 +49,13 @@
class AnchorPageSpanNodeType(AbstractPageSpanNodeType):
def renderBuoy(self, vs, into, linkId, anchorSpan, layout):
+ if layout == None:
+ layout = pscv.getLayout(anchorSpan.getScrollBlock())
# XXX!!!!
# Irregu!
# find edges of span
# should place only that region surrounded by irregu
- sb = anchorSpan.getScrollBlock();
- pscv.place(makeEnf(sb.getCurrent()), vs, into,
- .5, 200);
+ layout.place(vs, into, .5, 200, into)
return into
size = jarray.zeros(3, 'f')