[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gzz-commits] gzz ./TODO gfx/util/papersampler.py gzz/gfx/gl/...
From: |
Tuomas J. Lukka |
Subject: |
[Gzz-commits] gzz ./TODO gfx/util/papersampler.py gzz/gfx/gl/... |
Date: |
Mon, 03 Mar 2003 13:48:04 -0500 |
CVSROOT: /cvsroot/gzz
Module name: gzz
Changes by: Tuomas J. Lukka <address@hidden> 03/03/03 13:48:03
Modified files:
. : TODO
gfx/util : papersampler.py
gzz/gfx/gl : pagespanpaper.py
Log message:
determ
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/TODO.diff?tr1=1.608&tr2=1.609&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/util/papersampler.py.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/gfx/gl/pagespanpaper.py.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
Patches:
Index: gzz/TODO
diff -u gzz/TODO:1.608 gzz/TODO:1.609
--- gzz/TODO:1.608 Mon Mar 3 13:30:04 2003
+++ gzz/TODO Mon Mar 3 13:48:02 2003
@@ -17,7 +17,6 @@
paper paper exper:
tjl:
- - Make papersampler deterministic.
- Find good set of parameters (number of texts, zooms, blend factor,
etc.)
(blend factor is "blend" in the script and CONST0.a in
pagespanpaper.py)
- Perhaps 18 texts, each read twice by the subject with randomly
assigned
Index: gzz/gfx/util/papersampler.py
diff -u gzz/gfx/util/papersampler.py:1.13 gzz/gfx/util/papersampler.py:1.14
--- gzz/gfx/util/papersampler.py:1.13 Mon Mar 3 13:39:22 2003
+++ gzz/gfx/util/papersampler.py Mon Mar 3 13:48:03 2003
@@ -60,6 +60,8 @@
textureSeeds = [i for i in range(523, 523+current.length())]
+rng = random.Random(42)
+
class PSPMaker(gzz.view.PageSpanCellView.PageSpanPaperMaker):
def getPaper(self, spanpage, pagespan):
return gzz.gfx.gl.PageSpanPaper(spanpage,
@@ -109,10 +111,10 @@
def createTextPapers():
for subj in range(0,2):
zooms = zoomLevels + zoomLevels + zoomLevels
- random.shuffle(zooms)
+ rng.shuffle(zooms)
global textureSeeds
- random.shuffle(textureSeeds)
+ rng.shuffle(textureSeeds)
pageSpanCellView = gzz.view.PageSpanCellView()
pageSpanCellView.pageSpanPaperMaker = PSPMaker()
Index: gzz/gzz/gfx/gl/pagespanpaper.py
diff -u gzz/gzz/gfx/gl/pagespanpaper.py:1.9 gzz/gzz/gfx/gl/pagespanpaper.py:1.10
--- gzz/gzz/gfx/gl/pagespanpaper.py:1.9 Mon Mar 3 10:35:12 2003
+++ gzz/gzz/gfx/gl/pagespanpaper.py Mon Mar 3 13:48:03 2003
@@ -77,7 +77,7 @@
Enable REGISTER_COMBINERS_NV
CONST0 = 0 0 0 .5
- # Get average component multiplied by 12
+ # Get luminance multiplied by 12
SPARE0 = ((1-TEX1) . (1))*4
# Multiply by another 3
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gzz-commits] gzz ./TODO gfx/util/papersampler.py gzz/gfx/gl/...,
Tuomas J. Lukka <=