[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gzz-commits] gzz ./TODO gfx/libcoords/Coords.cxx gzz/view/bu...
From: |
Tuomas J. Lukka |
Subject: |
[Gzz-commits] gzz ./TODO gfx/libcoords/Coords.cxx gzz/view/bu... |
Date: |
Wed, 05 Feb 2003 07:27:38 -0500 |
CVSROOT: /cvsroot/gzz
Module name: gzz
Changes by: Tuomas J. Lukka <address@hidden> 03/02/05 07:27:36
Modified files:
. : TODO
gfx/libcoords : Coords.cxx
gzz/view/buoy : buoymanager.py pagespanNodes.py
test/gzz/gfx/gl: glvobcoorder.test
Log message:
Fixes
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/TODO.diff?tr1=1.559&tr2=1.560&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/libcoords/Coords.cxx.diff?tr1=1.65&tr2=1.66&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/buoy/buoymanager.py.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/buoy/pagespanNodes.py.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/test/gzz/gfx/gl/glvobcoorder.test.diff?tr1=1.31&tr2=1.32&r1=text&r2=text
Patches:
Index: gzz/TODO
diff -u gzz/TODO:1.559 gzz/TODO:1.560
--- gzz/TODO:1.559 Wed Feb 5 07:10:05 2003
+++ gzz/TODO Wed Feb 5 07:27:35 2003
@@ -21,7 +21,7 @@
- figure out how scrollblock nodes shall be linked back
with right
coordsys
- - use the spancoordsys definition?
+ - renderBuoy returns anchor CS
- implement and test scrollblock nodes and zzstructure nodes.
- combine with mudyc's PP nodes.
jvk:
Index: gzz/gfx/libcoords/Coords.cxx
diff -u gzz/gfx/libcoords/Coords.cxx:1.65 gzz/gfx/libcoords/Coords.cxx:1.66
--- gzz/gfx/libcoords/Coords.cxx:1.65 Wed Feb 5 03:14:45 2003
+++ gzz/gfx/libcoords/Coords.cxx Wed Feb 5 07:27:35 2003
@@ -632,9 +632,9 @@
}
bool canPerformGL() { return true; }
bool performGL() {
- glTranslatef(ox, oy, 0);
- glRotatef(a, 0, 0, 1);
glTranslatef(-ox, -oy, 0);
+ glRotatef(a, 0, 0, 1);
+ glTranslatef(ox, oy, 0);
return true;
}
typedef RotateXYCenteredCoords InverseType;
Index: gzz/gzz/view/buoy/buoymanager.py
diff -u gzz/gzz/view/buoy/buoymanager.py:1.4
gzz/gzz/view/buoy/buoymanager.py:1.5
--- gzz/gzz/view/buoy/buoymanager.py:1.4 Wed Feb 5 04:44:32 2003
+++ gzz/gzz/view/buoy/buoymanager.py Wed Feb 5 07:27:36 2003
@@ -27,7 +27,7 @@
self.mainNode = initBuoyviewnodetype.createMainNode(
initLinkId, initAnchor, self)
def nadir(self, cs):
- n = self.vs.coords.nadir(cs, self.nadirCS)
+ n = self.vs.coords.nadirUnitSq(cs, self.nadirCS)
self.vs.matcher.add(cs, n, "NADIR")
return n
def scene(self, vs):
@@ -60,8 +60,8 @@
x+r, 300,
0.1)
self.vs.matcher.add(buoy, linkId)
- buoy = self.nadir(buoy)
into = self.vs.orthoBoxCS(buoy, "V", 0, 0, 0, .5, .5, 1, 1)
+ into = self.nadir(into)
otherNode.renderBuoy(self.vs, into, linkId, otherAnchor)
def key(self, key):
Index: gzz/gzz/view/buoy/pagespanNodes.py
diff -u gzz/gzz/view/buoy/pagespanNodes.py:1.9
gzz/gzz/view/buoy/pagespanNodes.py:1.10
--- gzz/gzz/view/buoy/pagespanNodes.py:1.9 Wed Feb 5 04:44:32 2003
+++ gzz/gzz/view/buoy/pagespanNodes.py Wed Feb 5 07:27:36 2003
@@ -20,7 +20,7 @@
# find edges of span
# should place only that region surrounded by irregu
sb = anchorSpan.getScrollBlock();
- pscv.placeCentered(makeEnf(sb.getCurrent()), vs, into, anchorSpan,
+ pscv.place(makeEnf(sb.getCurrent()), vs, into,
.5, 200);
def createMainNode(self, linkId, anchorSpan, listener):
return PageSpanMainNode(self, anchorSpan, listener)
Index: gzz/test/gzz/gfx/gl/glvobcoorder.test
diff -u gzz/test/gzz/gfx/gl/glvobcoorder.test:1.31
gzz/test/gzz/gfx/gl/glvobcoorder.test:1.32
--- gzz/test/gzz/gfx/gl/glvobcoorder.test:1.31 Sun Jan 12 06:41:47 2003
+++ gzz/test/gzz/gfx/gl/glvobcoorder.test Wed Feb 5 07:27:36 2003
@@ -155,6 +155,7 @@
def testNadir():
+ # Check that a simple nadir cs does the right thing
cs_nadir = c1.translate(0, 50, 100)
cs_center = c1.translate(0, 50, 20)
cs_rot = c1.nadirOrigin(cs_center, cs_nadir)
@@ -164,11 +165,24 @@
[50, 20, 0, 50, 30, 0],
.1)
+ # Even after translate params.
c1.setTranslateParams(cs_center, 20, 100)
checkTrans(vs1, cs_rot,
[0, 0, 0, 0, 10, 0],
[20, 100, 0, 30, 100, 0],
+ .1)
+
+ # Check that an orthoBox CS is rotated around the
+ # center of the box by nadirUnitSq
+ # center = 600, 600
+ cs_orthobox = c1.orthoBox(0, 0, 500, 500, .2, .2, 1000, 1000)
+ cs_nadir = c1.translate(0, 0, 1000)
+ cs_rot = c1.nadirUnitSq(cs_orthobox, cs_nadir)
+
+ checkTrans(vs1, cs_rot,
+ [500, 500, 0],
+ [600, 600, 0],
.1)
import gfx.libpaper.papermill
- [Gzz-commits] gzz ./TODO gfx/libcoords/Coords.cxx gzz/view/bu...,
Tuomas J. Lukka <=