[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gzz-commits] gzz ./TODO gfx/demo/fillets.py gfx/libcoords/Co...
From: |
Tuomas J. Lukka |
Subject: |
[Gzz-commits] gzz ./TODO gfx/demo/fillets.py gfx/libcoords/Co... |
Date: |
Tue, 01 Oct 2002 02:22:54 -0400 |
CVSROOT: /cvsroot/gzz
Module name: gzz
Changes by: Tuomas J. Lukka <address@hidden> 02/10/01 02:22:54
Modified files:
. : TODO
gfx/demo : fillets.py
gfx/libcoords : Coords.cxx
Log message:
Fix fillets, prioritize
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/TODO.diff?tr1=1.203&tr2=1.204&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/demo/fillets.py.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/libcoords/Coords.cxx.diff?tr1=1.18&tr2=1.19&r1=text&r2=text
Patches:
Index: gzz/TODO
diff -c gzz/TODO:1.203 gzz/TODO:1.204
*** gzz/TODO:1.203 Mon Sep 30 18:20:28 2002
--- gzz/TODO Tue Oct 1 02:22:54 2002
***************
*** 34,45 ****
[waiting for *invcoords]
+ ZZ vanishingview cell size for pagespans and linebroken
paragraphs, as well as libpaper backgrounds
- vegai:
- + make papermill (libpaper)
- into real python modules so
- that we don't have to do silly "execfile" tricks in
- papertest.py and others.
- Also avoids name clashes
tuukkah:
- when a gl window is closed, call Binder.windowClosed()
- unit tests for libcoords:
--- 34,39 ----
***************
*** 54,60 ****
(+ optimization). Seems to be when PaperQuad calls setUp_VP, and
in localesomething, maybe stringstream stuff?
jvk, tjl:
! + think about using render-to-texture to speed up papers.
We now control the repeating units; rendering one such
unit to a relatively high-resolution texture would enable
us to use only one pass; rendering it would be quick
--- 48,55 ----
(+ optimization). Seems to be when PaperQuad calls setUp_VP, and
in localesomething, maybe stringstream stuff?
jvk, tjl:
! + If performance drags,
! think about using render-to-texture to speed up papers.
We now control the repeating units; rendering one such
unit to a relatively high-resolution texture would enable
us to use only one pass; rendering it would be quick
***************
*** 62,68 ****
number of passes as much. However, this brings
caching problems.
tjl:
- - fix fillet demo
- xupdf: distorted multi-page PDF view with xu links
- text
- entry / link making bindings
--- 57,62 ----
***************
*** 118,129 ****
+ make gldemo able to use fullscreen sync_to_vblank mode so that we
could
get the benefits of page flipping. How does this interact with e.g.
twinview? Need to turn it off?
0.8alpha4: Cleanup release after crucial demos; make it possible for anyone to
get *THE* demo up and running
humppake:
- fix utf8 string non-null end bug found by Benja
! + make paperquad check whether vertex programs are available
and use them if possible, otherwise use the above calls.
Vertex programs and packed vertices can be MUCH more efficient,
especially on GF3/4Ti. Of course, the check needs to be done
--- 112,130 ----
+ make gldemo able to use fullscreen sync_to_vblank mode so that we
could
get the benefits of page flipping. How does this interact with e.g.
twinview? Need to turn it off?
+ + fix fillet demo last two screens
0.8alpha4: Cleanup release after crucial demos; make it possible for anyone to
get *THE* demo up and running
+ vegai:
+ - make papermill (libpaper)
+ into real python modules so
+ that we don't have to do silly "execfile" tricks in
+ papertest.py and others.
+ Also avoids name clashes
humppake:
- fix utf8 string non-null end bug found by Benja
! - make paperquad check whether vertex programs are available
and use them if possible, otherwise use the above calls.
Vertex programs and packed vertices can be MUCH more efficient,
especially on GF3/4Ti. Of course, the check needs to be done
***************
*** 131,142 ****
createPaperQuad, since that's the most flexible approach.
[this is for making things work on G400, and if you
get the GeForce2, this moves to alpha4!]:
! + make a trivial texcomb_GL11.py (using OpenGL 1.1
functionality) in gfx/libpaper
which allows papers to work without register combiners.
[this is for making things work on G400, and if you
get the GeForce2, this moves to alpha4!]:
! + clean up Paper VP interface [jvk will explain]
[this is for making things work on G400, and if you
get the GeForce2, this moves to alpha4!]:
- implement TexGenEmboss::setUp_explicit
--- 132,143 ----
createPaperQuad, since that's the most flexible approach.
[this is for making things work on G400, and if you
get the GeForce2, this moves to alpha4!]:
! - make a trivial texcomb_GL11.py (using OpenGL 1.1
functionality) in gfx/libpaper
which allows papers to work without register combiners.
[this is for making things work on G400, and if you
get the GeForce2, this moves to alpha4!]:
! - clean up Paper VP interface [jvk will explain]
[this is for making things work on G400, and if you
get the GeForce2, this moves to alpha4!]:
- implement TexGenEmboss::setUp_explicit
Index: gzz/gfx/demo/fillets.py
diff -c gzz/gfx/demo/fillets.py:1.6 gzz/gfx/demo/fillets.py:1.7
*** gzz/gfx/demo/fillets.py:1.6 Mon Sep 30 18:20:28 2002
--- gzz/gfx/demo/fillets.py Tue Oct 1 02:22:54 2002
***************
*** 172,179 ****
sca = vs.matcher.add(vs.coords.scaleXYZ(rot, 1, 1, 0.01), "sca")
- self.putCells(vs, sca)
-
vs.map.put(getDList("""
Enable BLEND
PushAttrib ENABLE_BIT
--- 172,177 ----
***************
*** 181,187 ****
BlendFunc SRC_ALPHA ONE_MINUS_SRC_ALPHA
Color 1 1 1 0.7
PushMatrix
! Scale 1000 1000 1
Begin QUAD_STRIP
Vertex 0.5 1 1000
Vertex 0.5 -1 1000
--- 179,185 ----
BlendFunc SRC_ALPHA ONE_MINUS_SRC_ALPHA
Color 1 1 1 0.7
PushMatrix
! Scale 1000 1000 2
Begin QUAD_STRIP
Vertex 0.5 1 1000
Vertex 0.5 -1 1000
***************
*** 192,197 ****
--- 190,197 ----
PopAttrib
"""), sca)
+ self.putCells(vs, sca)
+
putnoc(vs, getDList("""
PopAttrib
"""))
***************
*** 210,229 ****
Color 1 1 1
"""))
if self.conn:
if self.color:
putnoc(vs, getDList("""
Color 1 0.6 0.6
"""))
vs.map.put(connSmooths[self.ind], cc[0][1], cc[0][0])
-
- if self.color:
putnoc(vs, getDList("""
! Color 1 1 1
"""))
! vs.map.put(cellTexRects[self.ind], cc[1][0])
! vs.map.put(cellTexRects[self.ind], cc[1][1])
class AlphaCells:
--- 210,237 ----
Color 1 1 1
"""))
+ if self.color:
+ putnoc(vs, getDList("""
+ Color 1 1 1
+ """))
+ vs.map.put(cellTexRects[self.ind], cc[1][0])
+ vs.map.put(cellTexRects[self.ind], cc[1][1])
+
if self.conn:
if self.color:
putnoc(vs, getDList("""
Color 1 0.6 0.6
"""))
+ putnoc(vs, getDList("""
+ PushAttrib DEPTH_BUFFER_BIT
+ DepthFunc ALWAYS
+ """))
vs.map.put(connSmooths[self.ind], cc[0][1], cc[0][0])
putnoc(vs, getDList("""
! PopAttrib
"""))
!
class AlphaCells:
Index: gzz/gfx/libcoords/Coords.cxx
diff -c gzz/gfx/libcoords/Coords.cxx:1.18 gzz/gfx/libcoords/Coords.cxx:1.19
*** gzz/gfx/libcoords/Coords.cxx:1.18 Mon Sep 30 18:20:28 2002
--- gzz/gfx/libcoords/Coords.cxx Tue Oct 1 02:22:54 2002
***************
*** 156,162 ****
ZVec para = v - same*vec;
float paral = para.length();
para = (1/paral)*para;
! ZVec ortho = para.crossp(v).normalized();
to = ZPt( same * vec + paral * (c * para - s * ortho) );
}
virtual ZPt transform(const ZPt &p) const {
--- 156,162 ----
ZVec para = v - same*vec;
float paral = para.length();
para = (1/paral)*para;
! ZVec ortho = para.crossp(vec).normalized();
to = ZPt( same * vec + paral * (c * para - s * ortho) );
}
virtual ZPt transform(const ZPt &p) const {
- [Gzz-commits] gzz ./TODO gfx/demo/fillets.py gfx/libcoords/Co...,
Tuomas J. Lukka <=