[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gzz-commits] gzz/gfx demo/fisheye.py demo/xupdf.py librender...
|
From: |
Janne V. Kujala |
|
Subject: |
[Gzz-commits] gzz/gfx demo/fisheye.py demo/xupdf.py librender... |
|
Date: |
Wed, 18 Sep 2002 08:26:24 -0400 |
CVSROOT: /cvsroot/gzz
Module name: gzz
Changes by: Janne V. Kujala <address@hidden> 02/09/18 08:26:24
Modified files:
gfx/demo : fisheye.py xupdf.py
gfx/librenderables: renderables.py
Log message:
Make different bulge functions selectable with an extra parameter
(current choices: 0-2)
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/demo/fisheye.py.diff?tr1=1.18&tr2=1.19&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/demo/xupdf.py.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/librenderables/renderables.py.diff?tr1=1.48&tr2=1.49&r1=text&r2=text
Patches:
Index: gzz/gfx/demo/fisheye.py
diff -c gzz/gfx/demo/fisheye.py:1.18 gzz/gfx/demo/fisheye.py:1.19
*** gzz/gfx/demo/fisheye.py:1.18 Fri Sep 13 07:48:31 2002
--- gzz/gfx/demo/fisheye.py Wed Sep 18 08:26:24 2002
***************
*** 77,83 ****
if showpdf:
addpdftex(pap)
! pfq = GZZGL.createFisheyePaperQuad(pap, -1, -1, 1, 1, gridsize, gridsize)
return pfq
--- 77,83 ----
if showpdf:
addpdftex(pap)
! pfq = GZZGL.createFisheyePaperQuad(pap, -1, -1, 1, 1, gridsize, gridsize,
btype)
return pfq
***************
*** 90,95 ****
--- 90,96 ----
px, py = 625, 400
ps = 1
gridsize=16
+ btype=0
rng = java.util.Random()
***************
*** 116,122 ****
def key(self, k):
global bx, by, bs, ba, bl, bm, px, py, ps, page
! global gridsize
if k == "Up": py += 50
elif k == "Down": py -= 50
elif k == "Left": px += 50
--- 117,123 ----
def key(self, k):
global bx, by, bs, ba, bl, bm, px, py, ps, page
! global gridsize, btype
if k == "Up": py += 50
elif k == "Down": py -= 50
elif k == "Left": px += 50
***************
*** 141,146 ****
--- 142,149 ----
elif k == "M": bm -= .5; print "bm ", bm
elif k == "g": gridsize *= 2; print "gridsize", gridsize;
self.initpaper()
elif k == "G": gridsize /= 2; print "gridsize", gridsize;
self.initpaper()
+ elif k == "t": btype += 1; print "bulge type", btype; self.initpaper()
+ elif k == "T": btype -= 1; print "bulge type", btype; self.initpaper()
elif k == "v":
self.seed = rng.nextInt(2000000000)
self.initpaper()
Index: gzz/gfx/demo/xupdf.py
diff -c gzz/gfx/demo/xupdf.py:1.9 gzz/gfx/demo/xupdf.py:1.10
*** gzz/gfx/demo/xupdf.py:1.9 Wed Sep 18 08:02:17 2002
--- gzz/gfx/demo/xupdf.py Wed Sep 18 08:26:24 2002
***************
*** 139,145 ****
cs1 = vs.coords.affineCoordsys(0, key+"_"+str(i), 10,
curx, ycoord, h/ph, 0, 0, h/ph)
pq = GZZGL.createFisheyePaperQuad(
! papers[i][0], 0, 0, papers[i][1], papers[i][2], 21, 21)
vs.map.put(pq, cs1, cs2)
curx += 1.02 * h/ph * papers[i][1]
--- 139,145 ----
cs1 = vs.coords.affineCoordsys(0, key+"_"+str(i), 10,
curx, ycoord, h/ph, 0, 0, h/ph)
pq = GZZGL.createFisheyePaperQuad(
! papers[i][0], 0, 0, papers[i][1], papers[i][2], 21, 21, 1)
vs.map.put(pq, cs1, cs2)
curx += 1.02 * h/ph * papers[i][1]
Index: gzz/gfx/librenderables/renderables.py
diff -c gzz/gfx/librenderables/renderables.py:1.48
gzz/gfx/librenderables/renderables.py:1.49
*** gzz/gfx/librenderables/renderables.py:1.48 Wed Sep 18 07:50:21 2002
--- gzz/gfx/librenderables/renderables.py Wed Sep 18 08:26:24 2002
***************
*** 421,429 ****
{
"Type" : "2",
"Name": "FisheyePaperQuad",
! "Data": "Paper::Paper* paper; float x0, y0, x1, y1; int gridx, gridy;",
"Params" : """
! Paper paper, float x0, float y0, float x1, float y1, int gridx, int
gridy
""",
"ParamCode" : """
this->paper = paper;
--- 421,429 ----
{
"Type" : "2",
"Name": "FisheyePaperQuad",
! "Data": "Paper::Paper* paper; float x0, y0, x1, y1; int gridx, gridy,
bfunc;",
"Params" : """
! Paper paper, float x0, float y0, float x1, float y1, int gridx, int
gridy, int bulgetype
""",
"ParamCode" : """
this->paper = paper;
***************
*** 433,462 ****
this->y1 = y1;
this->gridx = gridx;
this->gridy = gridy;
""",
"ExtraClass" : """
inline ZPt bulge(ZPt& v) const {
! //For given z, the magnification range is [ 1 - z/8, 1 + z ]
! const float a = 1, b = 0, c = 1;
! //For given z, the magnification range is [ 1, 1 + z ]
! //const float a = 0.5, b = 0.5, c = 2
!
! //For given z, the magnification range is [ 1, 1 + z ]
! //const float a = 0.0, b = 1.0, c = 2;
! // Modulate distance from origin
! float r2 = (v.x * v.x + v.y * v.y) * (c * c);
! float m = 1;
! m += a * v.z / (1 + r2);
! if (b > 0 && r2 > 0) {
! float r = sqrt(r2);
! m += v.z * atan(r) / r;
}
return ZPt(m * v.x, m * v.y, v.z);
}
ZPt bulge_inv(ZPt& p) const {
// XXX
}
""",
"RenderCode" : """
--- 433,479 ----
this->y1 = y1;
this->gridx = gridx;
this->gridy = gridy;
+ this->bfunc = bulgetype;
""",
"ExtraClass" : """
inline ZPt bulge(ZPt& v) const {
! float r2 = v.x * v.x + v.y * v.y;
! float m = 1;
! switch (bfunc) {
! default:
! break;
! case 0:
! //For given z, the magnification range is [ 1 - z/8, 1 +
z ]
! m = 1 + v.z / (1 + r2);
! break;
! case 1:
! //For given z, the magnification range is [ 1, 1 + z ]
! m = 1 + 0.5 * v.z / (1 + r2);
! if (r2 > 0) {
! float r = sqrt(r2);
! m += 0.5 * v.z * atan(r) / r;
! }
! break;
!
! case 2:
! //For given z, the magnification range is [ 1, 1 + z ]
! if (r2 > 0) {
! float r = sqrt(r2);
! m += v.z * atan(r) / r;
! }
! break;
!
}
+
+ // Modulate distance from origin
return ZPt(m * v.x, m * v.y, v.z);
+
}
ZPt bulge_inv(ZPt& p) const {
// XXX
+ return p;
}
""",
"RenderCode" : """
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gzz-commits] gzz/gfx demo/fisheye.py demo/xupdf.py librender...,
Janne V. Kujala <=