[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gzz-commits] gzz/gzz/view FisheyeState.java buoy/buoymanager...
From: |
Tuomas J. Lukka |
Subject: |
[Gzz-commits] gzz/gzz/view FisheyeState.java buoy/buoymanager... |
Date: |
Wed, 12 Feb 2003 08:08:20 -0500 |
CVSROOT: /cvsroot/gzz
Module name: gzz
Changes by: Tuomas J. Lukka <address@hidden> 03/02/12 08:08:20
Modified files:
gzz/view : FisheyeState.java
gzz/view/buoy : buoymanager.py pagespanNodes.py
Log message:
Fix fisheye a little more
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/FisheyeState.java.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/buoy/buoymanager.py.diff?tr1=1.26&tr2=1.27&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/buoy/pagespanNodes.py.diff?tr1=1.26&tr2=1.27&r1=text&r2=text
Patches:
Index: gzz/gzz/view/FisheyeState.java
diff -u gzz/gzz/view/FisheyeState.java:1.2 gzz/gzz/view/FisheyeState.java:1.3
--- gzz/gzz/view/FisheyeState.java:1.2 Wed Feb 12 07:47:06 2003
+++ gzz/gzz/view/FisheyeState.java Wed Feb 12 08:08:20 2003
@@ -10,7 +10,7 @@
* Uses clicks and drags by mouse button 3.
*/
public class FisheyeState {
-public static final String rcsid = "$Id: FisheyeState.java,v 1.2 2003/02/12
12:47:06 tjl Exp $";
+public static final String rcsid = "$Id: FisheyeState.java,v 1.3 2003/02/12
13:08:20 tjl Exp $";
public static boolean dbg = false;
private static void pa(String s) { System.err.println(s); }
@@ -70,7 +70,7 @@
curmin + " ");
((GLVobCoorder)vs.coords).setDistortParams(cs,
- - .5f * cursize * aspect, - .5f * cursize,
+ 0, 0,
cursize * aspect, cursize,
curmag, curmin);
vs.coords.setTranslateParams(cs2, -curx, -cury);
Index: gzz/gzz/view/buoy/buoymanager.py
diff -u gzz/gzz/view/buoy/buoymanager.py:1.26
gzz/gzz/view/buoy/buoymanager.py:1.27
--- gzz/gzz/view/buoy/buoymanager.py:1.26 Wed Feb 12 07:47:06 2003
+++ gzz/gzz/view/buoy/buoymanager.py Wed Feb 12 08:08:20 2003
@@ -100,7 +100,7 @@
sca = .5
into = self.vs.orthoBoxCS(buoy, "V"+str(linkId), -100, -w*sca/2,
-h*sca/20,
.5, .5, w, h)
- if 1:
+ if 0:
dbg1 = self.vs.unitSqCS(into, "U")
self.vs.put(coloredQuad((0,1,0)), dbg1)
into = self.nadir(into)
Index: gzz/gzz/view/buoy/pagespanNodes.py
diff -u gzz/gzz/view/buoy/pagespanNodes.py:1.26
gzz/gzz/view/buoy/pagespanNodes.py:1.27
--- gzz/gzz/view/buoy/pagespanNodes.py:1.26 Wed Feb 12 05:13:03 2003
+++ gzz/gzz/view/buoy/pagespanNodes.py Wed Feb 12 08:08:20 2003
@@ -48,13 +48,13 @@
if layout == None:
layout = pscv.getLayout(anchorSpan.getScrollBlock())
# For now, we'll just squish to fit
- layout.placeBoxed(vs, into, .2, 40)
+ layout.placeBoxed(vs, into, .3, 100)
return into
class AnchorPageSpanNodeType(AbstractPageSpanNodeType):
def renderBuoy(self, vs, into, linkId, anchorSpan, layout):
- if 1:
+ if 0:
dbg1 = vs.unitSqCS(into, "U")
vs.put(coloredQuad((1,0,0)), dbg1)
@@ -80,7 +80,7 @@
-extents[1] * scale, scale, scale)
irregu = gfx.libutil.effects.IrreguFrame(0, 0, layout.w, layout.h,
- .05, .25, type="square")
+ .5, .25, type="square")
# irregu = gfx.libutil.effects.IrreguFrame(-100, -100, 100*layout.w,
100*layout.h,
# .05, .25, type="square")
@@ -95,7 +95,7 @@
vs.map.put(irregu.content, paperCS, paperLoc)
class LayoutR(java.lang.Runnable):
def run(rself):
- layout.place(vs, paperCS, .6, 100, into)
+ layout.place(vs, paperCS, .6, 200, into)
gzz.gfx.gl.Stencil.drawStenciled(vs, ContentR(), None, FrameR(),
LayoutR(), 1)
@@ -152,7 +152,7 @@
# XXX This is not right: the distortion
# should be done here.
- self.layout.place(vs, self.shift, .7, 150)
+ self.layout.place(vs, self.shift, .7, 300)
if self.nodetype.scrollBlockLinker.enfiladeOverlap != None:
matches = (self.nodetype.scrollBlockLinker
@@ -198,7 +198,7 @@
# print "Ev: ",size[0], size[1], size[2]
# print "Self.xy was",self.x,self.y
oldVS.coords.transformPoints3(self.shift, size, tmp)
- # print "Retransformed:", tmp[0], tmp[1], tmp[2]
+ print "Retransformed:", tmp[0], tmp[1], tmp[2]
x = size[0]
y = size[1]
if x < 0: x = 0
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gzz-commits] gzz/gzz/view FisheyeState.java buoy/buoymanager...,
Tuomas J. Lukka <=