[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gzz-commits] gzz/gzz vob/impl/OrthoCoorder.java client/awt/A...
From: |
Benja Fallenstein |
Subject: |
[Gzz-commits] gzz/gzz vob/impl/OrthoCoorder.java client/awt/A... |
Date: |
Sat, 08 Mar 2003 19:06:39 -0500 |
CVSROOT: /cvsroot/gzz
Module name: gzz
Changes by: Benja Fallenstein <address@hidden> 03/03/08 19:06:39
Modified files:
gzz/vob/impl : OrthoCoorder.java
gzz/client/awt : AWTScreen.java
Log message:
YARGH. Instead of just rendering, AWT interpolated vobscenes to self...
This worked, except if coordsys were keymapped to other coordsys
which weren't in this scene (e.g. 1 keymapped to 13 but there were only
9 coordsys in the scene).
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/vob/impl/OrthoCoorder.java.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/client/awt/AWTScreen.java.diff?tr1=1.30&tr2=1.31&r1=text&r2=text
Patches:
Index: gzz/gzz/client/awt/AWTScreen.java
diff -u gzz/gzz/client/awt/AWTScreen.java:1.30
gzz/gzz/client/awt/AWTScreen.java:1.31
--- gzz/gzz/client/awt/AWTScreen.java:1.30 Fri Feb 21 15:02:37 2003
+++ gzz/gzz/client/awt/AWTScreen.java Sat Mar 8 19:06:39 2003
@@ -42,7 +42,7 @@
public abstract class AWTScreen
extends GraphicsAPI.AbstractWindow
implements MouseListener, MouseMotionListener, Obs,
JUpdateManager.EventProcessor {
- public static final String rcsid = "$Id: AWTScreen.java,v 1.30 2003/02/21
20:02:37 tjl Exp $";
+ public static final String rcsid = "$Id: AWTScreen.java,v 1.31 2003/03/09
00:06:39 benja Exp $";
public static boolean dbg = false;
private static void pa(String s) { System.out.println(s); }
@@ -185,20 +185,27 @@
fract = 1-fract;
towardsOther = false;
}
- if(osc == null) osc = sc;
if(dbg) pa("Going to render: "+sc+" "+osc+" "+fract);
if(dbg) sc.dump();
- if(dbg) osc.dump();
+ if(dbg && osc!=null) osc.dump();
- if(sc != listprev || osc != listnext) {
+ if(osc != null && (sc != listprev || osc != listnext)) {
listprev = sc;
listnext = osc;
interplist = sc.matcher.interpList(osc.matcher,
towardsOther);
}
+ OrthoCoorder oc;
+ if(osc != null)
+ oc = (OrthoCoorder)osc.coords;
+ else {
+ oc = null;
+ interplist = null;
+ }
+
((OrthoCoorder)sc.coords).renderVobs((DefaultVobMap)sc.map,
- (OrthoCoorder)osc.coords,
+ oc,
interplist,
fract,
gr, fg
Index: gzz/gzz/vob/impl/OrthoCoorder.java
diff -u gzz/gzz/vob/impl/OrthoCoorder.java:1.5
gzz/gzz/vob/impl/OrthoCoorder.java:1.6
--- gzz/gzz/vob/impl/OrthoCoorder.java:1.5 Fri Feb 21 15:02:46 2003
+++ gzz/gzz/vob/impl/OrthoCoorder.java Sat Mar 8 19:06:39 2003
@@ -34,7 +34,7 @@
*/
public class OrthoCoorder extends VobCoorder {
-public static final String rcsid = "$Id: OrthoCoorder.java,v 1.5 2003/02/21
20:02:46 tjl Exp $";
+public static final String rcsid = "$Id: OrthoCoorder.java,v 1.6 2003/03/09
00:06:39 benja 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); }
@@ -83,12 +83,7 @@
void setInfo(int cs, float xoffs, float yoffs,
float xscale, float yscale,
OrthoRenderInfo info) {
- wh[0] = 0; wh[1] = 0; wh[2] = 1; wh[3] = 1;
- sys.transformRect(cs, wh);
- info.setCoords(sys.depth[cs],
- xscale * sys.x[cs] + xoffs, yscale * sys.y[cs] + yoffs,
- xscale * sys.w[cs], yscale * sys.h[cs],
- 0, 0, xscale * wh[2], yscale * wh[3]);
+ setInterpInfo(cs, this, cs, 0, xoffs, yoffs, xscale, yscale, info);
}
public boolean contains(int cs, float px, float py, float[]
internalcoords) {
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gzz-commits] gzz/gzz vob/impl/OrthoCoorder.java client/awt/A...,
Benja Fallenstein <=