[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gzz-commits] gzz ./Makefile ./TODO gzz/view/CellContentView....
|
From: |
Tuomas J. Lukka |
|
Subject: |
[Gzz-commits] gzz ./Makefile ./TODO gzz/view/CellContentView.... |
|
Date: |
Mon, 14 Oct 2002 04:17:13 -0400 |
CVSROOT: /cvsroot/gzz
Module name: gzz
Changes by: Tuomas J. Lukka <address@hidden> 02/10/14 04:17:12
Modified files:
. : Makefile TODO
gzz/view : CellContentView.java CellHBox.java
CellView.java CellVobFactory.java
MarkDecorator.java RowColView.java
VobVanishingClient.java
Log message:
Start changes towards proper coordsys handling
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/Makefile.diff?tr1=1.194&tr2=1.195&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/TODO.diff?tr1=1.286&tr2=1.287&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/CellContentView.java.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/CellHBox.java.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/CellView.java.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/CellVobFactory.java.diff?tr1=1.21&tr2=1.22&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/MarkDecorator.java.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/RowColView.java.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/VobVanishingClient.java.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
Patches:
Index: gzz/Makefile
diff -c gzz/Makefile:1.194 gzz/Makefile:1.195
*** gzz/Makefile:1.194 Sun Oct 13 09:14:16 2002
--- gzz/Makefile Mon Oct 14 04:17:12 2002
***************
*** 390,398 ****
Z=-t
endif
! test: # Use: make test TEST=test/gzz/vob/vobmatcher.test, to run a single
test.
$(GLLIB) $(JYTHON) test/testutil.py $(DBG) $(TEST)
! test-gl:
$(GLLIB) $(JYTHON) test/testutil.py -Dgzzclient=gl $(DBG) jni $(TEST)
run:
$(JYTHON) Gzz.py $(DBG) -Dgzzclient=awt $(Z)
--- 390,398 ----
Z=-t
endif
! test:: # Use: make test TEST=test/gzz/vob/vobmatcher.test, to run a single
test.
$(GLLIB) $(JYTHON) test/testutil.py $(DBG) $(TEST)
! test-gl::
$(GLLIB) $(JYTHON) test/testutil.py -Dgzzclient=gl $(DBG) jni $(TEST)
run:
$(JYTHON) Gzz.py $(DBG) -Dgzzclient=awt $(Z)
***************
*** 449,455 ****
runpplocal:
$(GLLIB) $(JYTHON) gzz/modules/pp/localpp.py $(DBG)
! gl: compilegl rmi testgl
compilegl: compile
make -C gfx all
--- 449,455 ----
runpplocal:
$(GLLIB) $(JYTHON) gzz/modules/pp/localpp.py $(DBG)
! gl: compilegl rmi test-gl
compilegl: compile
make -C gfx all
Index: gzz/TODO
diff -c gzz/TODO:1.286 gzz/TODO:1.287
*** gzz/TODO:1.286 Sun Oct 13 08:46:18 2002
--- gzz/TODO Mon Oct 14 04:17:12 2002
***************
*** 32,37 ****
--- 32,39 ----
[GI03] - one-pass edge impl
[GI03] - think more about shape
[GI03] - pieces
+ [GI03] - soft shadows of irregus- ?!?!?! Need algorithm...
+ - only very approximate needed
tuukkah:
- move Modules/ to basalt (what about Java/ and C++/) (Tjl: remove them)
- genimages lazily: pass existing images. Must check that the
***************
*** 100,106 ****
- fix directory geometry
- HOME button
- background texture - ?
- - soft shadows - ?!?!?! Need algorithm...
- speedups
- saving
- merge !!!
--- 102,107 ----
***************
*** 171,177 ****
- Gzz.py client
- reload button (key to reload jython code! All views (e.g.
pagespanview,
xubuoy))
- -fix coordsys() - semantics has changed in VobCoorder
+ if performance problems, redesign coordsys to allow
concatenation, reading only parameters and template
compilation of renderables.
--- 172,177 ----
Index: gzz/gzz/view/CellContentView.java
diff -c gzz/gzz/view/CellContentView.java:1.4
gzz/gzz/view/CellContentView.java:1.5
*** gzz/gzz/view/CellContentView.java:1.4 Sun Sep 29 10:53:45 2002
--- gzz/gzz/view/CellContentView.java Mon Oct 14 04:17:12 2002
***************
*** 33,40 ****
* with different kinds of boxes.
*/
public interface CellContentView {
! String rcsid = "$Id: CellContentView.java,v 1.4 2002/09/29 14:53:45 benja Exp
$";
/** Place the contents of one cell into the given coord system.
*/
void place(Cell c, VobScene sc, int coordsys, float w, float h,
ViewContext context, float scale);
--- 33,42 ----
* with different kinds of boxes.
*/
public interface CellContentView {
! String rcsid = "$Id: CellContentView.java,v 1.5 2002/10/14 08:17:12 tjl Exp
$";
/** Place the contents of one cell into the given coord system.
+ * The coordsys given shall be a mapping from the rectangle
+ * (0,w)x(0,h) onto the screen.
*/
void place(Cell c, VobScene sc, int coordsys, float w, float h,
ViewContext context, float scale);
Index: gzz/gzz/view/CellHBox.java
diff -c gzz/gzz/view/CellHBox.java:1.5 gzz/gzz/view/CellHBox.java:1.6
*** gzz/gzz/view/CellHBox.java:1.5 Sun Sep 29 10:53:45 2002
--- gzz/gzz/view/CellHBox.java Mon Oct 14 04:17:12 2002
***************
*** 61,67 ****
public void place(VobScene vs, int coordsys, float scale) {
float w = getWidth(scale), h = getHeight(scale)+getDepth(scale);
! view.place(cell, vs, coordsys, w, h, context, scale);
}
public void setPrev(HBox b) {}
--- 61,67 ----
public void place(VobScene vs, int coordsys, float scale) {
float w = getWidth(scale), h = getHeight(scale)+getDepth(scale);
! view.place(cell, vs, coordsys, w, h, context);
}
public void setPrev(HBox b) {}
Index: gzz/gzz/view/CellView.java
diff -c gzz/gzz/view/CellView.java:1.4 gzz/gzz/view/CellView.java:1.5
*** gzz/gzz/view/CellView.java:1.4 Sun Sep 29 10:53:45 2002
--- gzz/gzz/view/CellView.java Mon Oct 14 04:17:12 2002
***************
*** 29,40 ****
*/
public interface CellView {
! /** place a single cell
*/
void place(Cell c, VobScene vs,
int coordsys, float w, float h, // for now
! ViewContext context,
! float scale);
/** Get the default size of a cell at a given scale.
* Writes the result into a <code>Dimension</code> object.
--- 29,44 ----
*/
public interface CellView {
! /** Place a single cell.
! * @param coordsys The coordinate system into which to
! * place the cell. The coordinate system
! * is to be a mapping from the
! * rectangle (0,w)x(0,h) onto screen
! * coordinates.
*/
void place(Cell c, VobScene vs,
int coordsys, float w, float h, // for now
! ViewContext context);
/** Get the default size of a cell at a given scale.
* Writes the result into a <code>Dimension</code> object.
Index: gzz/gzz/view/CellVobFactory.java
diff -c gzz/gzz/view/CellVobFactory.java:1.21
gzz/gzz/view/CellVobFactory.java:1.22
*** gzz/gzz/view/CellVobFactory.java:1.21 Fri Oct 11 09:35:02 2002
--- gzz/gzz/view/CellVobFactory.java Mon Oct 14 04:17:12 2002
***************
*** 46,52 ****
*/
public class CellVobFactory implements CellView {
! public static final String rcsid = "$Id: CellVobFactory.java,v 1.21
2002/10/11 13:35:02 tjl Exp $";
public static boolean dbg = false;
private static void p(String s) { if(dbg) pa(s); }
private static void pa(String s) { System.err.println(s); }
--- 46,52 ----
*/
public class CellVobFactory implements CellView {
! public static final String rcsid = "$Id: CellVobFactory.java,v 1.22
2002/10/14 08:17:12 tjl Exp $";
public static boolean dbg = false;
private static void p(String s) { if(dbg) pa(s); }
private static void pa(String s) { System.err.println(s); }
***************
*** 136,142 ****
*/
public void place(final Cell c, final VobScene v, final int cs,
final float w, final float h,
! final ViewContext context, final float scale) {
setCenter(context.getAccursed());
if(d_clone == null)
throw new NullPointerException("clone dim not set in
CellVobFactory");
--- 136,142 ----
*/
public void place(final Cell c, final VobScene v, final int cs,
final float w, final float h,
! final ViewContext context) {
setCenter(context.getAccursed());
if(d_clone == null)
throw new NullPointerException("clone dim not set in
CellVobFactory");
***************
*** 175,181 ****
final int cs_box = v.coordsys(cs, BOX_KEY, 0, 0, 0, w, h);
if(!(GraphicsAPI.getInstance() instanceof gzz.client.gl.GLAPI)) {
! ccv.place(c, v, content_cs, w-10, h-10, context, scale);
v.map.put(bg, cs_box);
} else {
v.map.put(bg, cs_box);
--- 175,181 ----
final int cs_box = v.coordsys(cs, BOX_KEY, 0, 0, 0, w, h);
if(!(GraphicsAPI.getInstance() instanceof gzz.client.gl.GLAPI)) {
! ccv.place(c, v, content_cs, w-10, h-10, context, 1);
v.map.put(bg, cs_box);
} else {
v.map.put(bg, cs_box);
***************
*** 187,193 ****
null,
null,
new Runnable() { public void run() {
! ccv.place(c, v, content_cs, w-10, h-10, context, scale);
}},
false
);
--- 187,193 ----
null,
null,
new Runnable() { public void run() {
! ccv.place(c, v, content_cs, w-10, h-10, context, 1);
}},
false
);
Index: gzz/gzz/view/MarkDecorator.java
diff -c gzz/gzz/view/MarkDecorator.java:1.5 gzz/gzz/view/MarkDecorator.java:1.6
*** gzz/gzz/view/MarkDecorator.java:1.5 Tue Oct 8 03:34:54 2002
--- gzz/gzz/view/MarkDecorator.java Mon Oct 14 04:17:12 2002
***************
*** 61,67 ****
int cs = sc.coordsys(cs_list, c, 0, 0, i*box.height, 2, 2);
! cv.place(c, sc, cs, box.width, box.height, win, 1);
}
w = style.getWidth(str, 1);
--- 61,67 ----
int cs = sc.coordsys(cs_list, c, 0, 0, i*box.height, 2, 2);
! cv.place(c, sc, cs, box.width, box.height, win);
}
w = style.getWidth(str, 1);
Index: gzz/gzz/view/RowColView.java
diff -c gzz/gzz/view/RowColView.java:1.5 gzz/gzz/view/RowColView.java:1.6
*** gzz/gzz/view/RowColView.java:1.5 Sat Oct 5 09:59:47 2002
--- gzz/gzz/view/RowColView.java Mon Oct 14 04:17:12 2002
***************
*** 95,101 ****
if(grid[i][j] != null)
fact.place(grid[i][j], sc, cs[i][j],
cellSize.width, cellSize.height,
! context, 1);
Vob conn[] = new Vob[] {
new SimpleConnection(1, 0, -1, 0),
--- 95,101 ----
if(grid[i][j] != null)
fact.place(grid[i][j], sc, cs[i][j],
cellSize.width, cellSize.height,
! context);
Vob conn[] = new Vob[] {
new SimpleConnection(1, 0, -1, 0),
Index: gzz/gzz/view/VobVanishingClient.java
diff -c gzz/gzz/view/VobVanishingClient.java:1.15
gzz/gzz/view/VobVanishingClient.java:1.16
*** gzz/gzz/view/VobVanishingClient.java:1.15 Fri Oct 11 09:35:02 2002
--- gzz/gzz/view/VobVanishingClient.java Mon Oct 14 04:17:12 2002
***************
*** 167,174 ****
public void place(Cell c, Object o, float fract, int x0, int y0, int x1,
int y1,
int depth, float rot) {
Vob v = (Vob)o;
! int cs = into.coordsys(intoCS, c, depth, x0, y0, (x1-x0), (y1-y0));
! cvf.place(c, into, cs, (x1-x0), (y1-y0), context, fract);
}
public void connect(Cell cell1, Cell cell2, int dx, int dy) {
--- 167,174 ----
public void place(Cell c, Object o, float fract, int x0, int y0, int x1,
int y1,
int depth, float rot) {
Vob v = (Vob)o;
! int cs = into.coordsys(intoCS, c, depth, x0, y0, fract, fract);
! cvf.place(c, into, cs, (x1-x0)/fract, (y1-y0)/fract, context);
}
public void connect(Cell cell1, Cell cell2, int dx, int dy) {
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gzz-commits] gzz ./Makefile ./TODO gzz/view/CellContentView....,
Tuomas J. Lukka <=