[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gzz-commits] gzz gzz/client/AbstractShower.java gzz/client/F...
|
From: |
Tuomas J. Lukka |
|
Subject: |
[Gzz-commits] gzz gzz/client/AbstractShower.java gzz/client/F... |
|
Date: |
Thu, 29 Aug 2002 05:41:16 -0400 |
CVSROOT: /cvsroot/gzz
Module name: gzz
Changes by: Tuomas J. Lukka <address@hidden> 02/08/29 05:41:16
Modified files:
gzz/client : AbstractShower.java Fallback.java
GraphicsAPI.java Screen.java
gzz/client/awt : AWTAPI.java AWTScreen.java FrameScreen.java
gzz/client/gl : GLAPI.java GLScreen.java
gzz/modules/pp : PlaneView.java Win.java
gzz/vob : VobScene.java
test/gzz/vob : TestLBChain.java TestVobScene.java
Log message:
Clean up graphicsAPI.
Move createVobScene to Window, where it can even have a default
argument for the dimension, removing lots
of redundant code. Also javadoc a little. Some spillover to other
parts; background colors
should be resolved soon.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/client/AbstractShower.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/client/Fallback.java.diff?tr1=1.30&tr2=1.31&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/client/GraphicsAPI.java.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/client/Screen.java.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/client/awt/AWTAPI.java.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/client/awt/AWTScreen.java.diff?tr1=1.17&tr2=1.18&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/client/awt/FrameScreen.java.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/client/gl/GLAPI.java.diff?tr1=1.16&tr2=1.17&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/client/gl/GLScreen.java.diff?tr1=1.24&tr2=1.25&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/pp/PlaneView.java.diff?tr1=1.43&tr2=1.44&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/pp/Win.java.diff?tr1=1.46&tr2=1.47&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/vob/VobScene.java.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/test/gzz/vob/TestLBChain.java.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/test/gzz/vob/TestVobScene.java.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
Patches:
Index: gzz/gzz/client/AbstractShower.java
diff -c gzz/gzz/client/AbstractShower.java:1.1
gzz/gzz/client/AbstractShower.java:1.2
*** gzz/gzz/client/AbstractShower.java:1.1 Tue May 14 13:56:25 2002
--- gzz/gzz/client/AbstractShower.java Thu Aug 29 05:41:16 2002
***************
*** 36,40 ****
--- 36,42 ----
public void setScreen(Screen s) {
this.screen = s;
}
+ public void chg() {
+ }
}
Index: gzz/gzz/client/Fallback.java
diff -c gzz/gzz/client/Fallback.java:1.30 gzz/gzz/client/Fallback.java:1.31
*** gzz/gzz/client/Fallback.java:1.30 Wed Aug 21 02:18:35 2002
--- gzz/gzz/client/Fallback.java Thu Aug 29 05:41:16 2002
***************
*** 72,78 ****
* It implements a subset of the 0.6.0 bindings.
*/
public class Fallback {
! public static final String rcsid = "$Id: Fallback.java,v 1.30 2002/08/21
06:18:35 tjl Exp $";
public static boolean dbg = false;
private static void pa(String s) { System.err.println(s); }
--- 72,78 ----
* It implements a subset of the 0.6.0 bindings.
*/
public class Fallback {
! public static final String rcsid = "$Id: Fallback.java,v 1.31 2002/08/29
09:41:16 tjl Exp $";
public static boolean dbg = false;
private static void pa(String s) { System.err.println(s); }
***************
*** 166,174 ****
}
public VobScene generate() {
! Dimension d = this.screen.window.getSize();
! if(dbg) pa("Window size used in VobScene: "+d);
! VobScene sc = this.screen.window.getGraphicsAPI().createVobScene(d);
for(Iterator i=decorators.iterator(); i.hasNext();) {
FallbackSceneDecorator dec =
--- 166,172 ----
}
public VobScene generate() {
! VobScene sc = this.screen.window.createVobScene();
for(Iterator i=decorators.iterator(); i.hasNext();) {
FallbackSceneDecorator dec =
***************
*** 187,196 ****
return viewList[viewIndex];
}
- public void chg() {
- this.screen.window.chg();
- }
-
Win(ColorScheme colors) {
for(int i=0; i<dimsIndices.length; i++)
dimsIndices[i] = i % dimList.length;
--- 185,190 ----
***************
*** 200,206 ****
bg = colors.getBg();
AbstractUpdateManager.addWindow(new Screen(
! gfxapi.createWindow(bg),
binder,
this
));
--- 194,200 ----
bg = colors.getBg();
AbstractUpdateManager.addWindow(new Screen(
! gfxapi.createWindow(),
binder,
this
));
Index: gzz/gzz/client/GraphicsAPI.java
diff -c gzz/gzz/client/GraphicsAPI.java:1.15
gzz/gzz/client/GraphicsAPI.java:1.16
*** gzz/gzz/client/GraphicsAPI.java:1.15 Fri Aug 16 10:40:34 2002
--- gzz/gzz/client/GraphicsAPI.java Thu Aug 29 05:41:16 2002
***************
*** 33,55 ****
/** An interface that both the OpenGL and java.awt.Graphics subsystems
* provide.
*/
public abstract class GraphicsAPI {
! /** Start the update manager thread and run r from that thread.
! * Used because e.g. OpenGL and GLX are easier to manage if everything
! * is done in one thread.
! */
! public abstract void startUpdateManager(Runnable r);
! public abstract Window createWindow(java.awt.Color bg) ;
!
! /** Obtain a text style object for an abstract font at a given
! * size. The parameters are as
! * in address@hidden java.awt.Font#Font()}
! *
*/
- public abstract TextStyle getTextStyle(String family, int style, int
size);
-
private static GraphicsAPI gfxapi;
static {
String cl = System.getProperty("gzzclient");
if(cl == null || cl.equals("awt"))
--- 33,48 ----
/** An interface that both the OpenGL and java.awt.Graphics subsystems
* provide.
+ * This is currently a singleton class but that may change in the future.
+ * <p>
+ * The System property <code>gzzclient</code> sets the API type: either "awt"
or "gl"
+ * should be used.
*/
public abstract class GraphicsAPI {
! /** The singleton instance.
*/
private static GraphicsAPI gfxapi;
+
static {
String cl = System.getProperty("gzzclient");
if(cl == null || cl.equals("awt"))
***************
*** 60,88 ****
throw new Error("Invalid client type '"+cl+"': should be awt or
gl");
}
! /** Create a new vobscene of the appropriate type.
! * @diagram screen
*/
! public abstract VobScene createVobScene(Dimension size) ;
/** An interface for windows visible on the screen.
- * @diagram screen MP %t.c = (200,200);
*/
static public abstract class Window {
! abstract public void registerBinder(Binder s);
! abstract public void chg();
abstract public Dimension getSize();
abstract public void setLocation(int x, int y, int w, int h) ;
/** Render the still image of the vobscreen.
- * @diagram screen
*/
abstract public void renderStill(VobScene vs, float lod);
/** Render the interpolated form between the two vobscenes.
- * @diagram screen
*/
abstract public void renderAnim(VobScene from, VobScene to, float
fract, float lod, boolean showFinal);
/** Add a timeout: Binder.timeout() is called after
* given number of milliseconds.
*/
--- 53,116 ----
throw new Error("Invalid client type '"+cl+"': should be awt or
gl");
}
! /** Get the singleton instance.
! */
! static public GraphicsAPI getInstance() { return gfxapi; }
!
! /** Start the update manager thread and run r from that thread.
! * Used because e.g. OpenGL and GLX are easier to manage if everything
! * is done in one thread.
! * <b>Windows must not be created by any other thread.</b>
! */
! public abstract void startUpdateManager(Runnable r);
!
! /** Create a new window.
! */
! public abstract Window createWindow() ;
!
! /** Obtain a text style object for an abstract font at a given
! * size. The parameters are as
! * in address@hidden java.awt.Font#Font()}
! *
*/
! public abstract TextStyle getTextStyle(String family, int style, int
size);
/** An interface for windows visible on the screen.
*/
static public abstract class Window {
!
! /** Get the current size of the window.
! */
abstract public Dimension getSize();
+
+ /** Try to set the location and size of the window.
+ * Not guaranteed to succeed.
+ */
abstract public void setLocation(int x, int y, int w, int h) ;
/** Render the still image of the vobscreen.
*/
abstract public void renderStill(VobScene vs, float lod);
+
/** Render the interpolated form between the two vobscenes.
*/
abstract public void renderAnim(VobScene from, VobScene to, float
fract, float lod, boolean showFinal);
+ /** Create a new vobscene of the appropriate type, with current window
+ * size as size.
+ */
+ public VobScene createVobScene() {
+ return createVobScene(getSize());
+ }
+ /** Create a new vobscene of the appropriate type for this window.
+ */
+ public abstract VobScene createVobScene(Dimension size) ;
+
+
+ /** Set the event handler for the window.
+ */
+ abstract public void registerBinder(Binder s);
+
/** Add a timeout: Binder.timeout() is called after
* given number of milliseconds.
*/
***************
*** 90,103 ****
throw new UnsupportedOperationException("Not in this gfxapi");
}
-
public Window(GraphicsAPI api) { this.gfxapi = api; }
! GraphicsAPI gfxapi;
public GraphicsAPI getGraphicsAPI() { return gfxapi; }
}
- static public GraphicsAPI getInstance() { return gfxapi; }
}
--- 118,131 ----
throw new UnsupportedOperationException("Not in this gfxapi");
}
public Window(GraphicsAPI api) { this.gfxapi = api; }
+ private final GraphicsAPI gfxapi;
! /** Get the GraphicsAPI this window is associated with.
! */
public GraphicsAPI getGraphicsAPI() { return gfxapi; }
}
}
Index: gzz/gzz/client/Screen.java
diff -c gzz/gzz/client/Screen.java:1.11 gzz/gzz/client/Screen.java:1.12
*** gzz/gzz/client/Screen.java:1.11 Fri Aug 2 10:40:18 2002
--- gzz/gzz/client/Screen.java Thu Aug 29 05:41:16 2002
***************
*** 40,46 ****
*/
public class Screen implements AbstractUpdateManager.Window {
! public static final String rcsid = "$Id: Screen.java,v 1.11 2002/08/02
14:40:18 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); }
--- 40,46 ----
*/
public class Screen implements AbstractUpdateManager.Window {
! public static final String rcsid = "$Id: Screen.java,v 1.12 2002/08/29
09:41:16 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); }
***************
*** 75,81 ****
binder.setScreen(this);
shower.setScreen(this);
! prev = window.getGraphicsAPI().createVobScene(new Dimension(0, 0));
window.registerBinder(binder);
--- 75,81 ----
binder.setScreen(this);
shower.setScreen(this);
! prev = window.createVobScene();
window.registerBinder(binder);
Index: gzz/gzz/client/awt/AWTAPI.java
diff -c gzz/gzz/client/awt/AWTAPI.java:1.9 gzz/gzz/client/awt/AWTAPI.java:1.10
*** gzz/gzz/client/awt/AWTAPI.java:1.9 Fri Aug 16 10:40:35 2002
--- gzz/gzz/client/awt/AWTAPI.java Thu Aug 29 05:41:16 2002
***************
*** 39,58 ****
public void startUpdateManager(Runnable r) {
JUpdateManager.startJUpdateManager(r);
}
! public Window createWindow(Color bg) {
! return new FrameScreen(this, bg);
}
public TextStyle getTextStyle(String family, int style, int size) {
return new RawTextStyle(new ScalableFont(family, style, size), null);
- }
-
- public VobScene createVobScene(Dimension size) {
- return new VobScene(
- new DefaultVobMap(),
- new OrthoCoorder(size.width, size.height),
- this,
- size
- );
}
}
--- 39,49 ----
public void startUpdateManager(Runnable r) {
JUpdateManager.startJUpdateManager(r);
}
! public Window createWindow() {
! return new FrameScreen(this);
}
public TextStyle getTextStyle(String family, int style, int size) {
return new RawTextStyle(new ScalableFont(family, style, size), null);
}
}
Index: gzz/gzz/client/awt/AWTScreen.java
diff -c gzz/gzz/client/awt/AWTScreen.java:1.17
gzz/gzz/client/awt/AWTScreen.java:1.18
*** gzz/gzz/client/awt/AWTScreen.java:1.17 Fri Aug 16 10:40:35 2002
--- gzz/gzz/client/awt/AWTScreen.java Thu Aug 29 05:41:16 2002
***************
*** 34,46 ****
public abstract class AWTScreen
extends GraphicsAPI.Window
implements MouseListener, MouseMotionListener, Obs,
JUpdateManager.EventProcessor {
! public static final String rcsid = "$Id: AWTScreen.java,v 1.17 2002/08/16
14:40:35 benja Exp $";
public static boolean dbg = false;
private static void p(String s) { if(dbg) pa(s); }
private static void pa(String s) { System.out.println(s); }
! public Color fg = Color.black, bg = new Color(0xe4f6ff);
ScreenCanvas canvas = new ScreenCanvas() ;
--- 34,46 ----
public abstract class AWTScreen
extends GraphicsAPI.Window
implements MouseListener, MouseMotionListener, Obs,
JUpdateManager.EventProcessor {
! public static final String rcsid = "$Id: AWTScreen.java,v 1.18 2002/08/29
09:41:16 tjl Exp $";
public static boolean dbg = false;
private static void p(String s) { if(dbg) pa(s); }
private static void pa(String s) { System.out.println(s); }
! public Color fg = Color.black;
ScreenCanvas canvas = new ScreenCanvas() ;
***************
*** 49,54 ****
--- 49,64 ----
// XXX Should use VolatileImage in new JDKs?
Image cache;
+ public VobScene createVobScene(Dimension size) {
+ return new VobScene(
+ new DefaultVobMap(),
+ new OrthoCoorder(size.width, size.height),
+ this.getGraphicsAPI(),
+ this,
+ size
+ );
+ }
+
public void registerBinder(Binder s) {
binder = s;
}
***************
*** 67,75 ****
public Dimension getSize() { return canvas.getSize(); }
! public AWTScreen(GraphicsAPI api, Color bg) {
super(api);
- this.bg = bg;
canvas.addMouseListener(this);
canvas.addMouseMotionListener(this);
canvas.setVisible(true);
--- 77,84 ----
public Dimension getSize() { return canvas.getSize(); }
! public AWTScreen(GraphicsAPI api) {
super(api);
canvas.addMouseListener(this);
canvas.addMouseMotionListener(this);
canvas.setVisible(true);
***************
*** 122,128 ****
if(cache == null) return;
Graphics gr = cache.getGraphics();
! gr.setColor(bg);
gr.fillRect(0, 0, d.width, d.height);
gr.setColor(Color.black);
--- 131,137 ----
if(cache == null) return;
Graphics gr = cache.getGraphics();
! gr.setColor(Color.white); // XXX
gr.fillRect(0, 0, d.width, d.height);
gr.setColor(Color.black);
***************
*** 157,163 ****
((OrthoCoorder)sc.coords).renderVobs((DefaultVobMap)sc.map,
(OrthoCoorder)osc.coords,
fract,
! gr, bg, fg
);
}
gr.dispose();
--- 166,172 ----
((OrthoCoorder)sc.coords).renderVobs((DefaultVobMap)sc.map,
(OrthoCoorder)osc.coords,
fract,
! gr, Color.white, fg
);
}
gr.dispose();
Index: gzz/gzz/client/awt/FrameScreen.java
diff -c gzz/gzz/client/awt/FrameScreen.java:1.9
gzz/gzz/client/awt/FrameScreen.java:1.10
*** gzz/gzz/client/awt/FrameScreen.java:1.9 Fri Aug 16 10:40:35 2002
--- gzz/gzz/client/awt/FrameScreen.java Thu Aug 29 05:41:16 2002
***************
*** 29,43 ****
*/
public class FrameScreen extends AWTScreen {
! public static final String rcsid = "$Id: FrameScreen.java,v 1.9 2002/08/16
14:40:35 benja Exp $";
protected Frame zzFrame;
public static boolean dbg = false;
private static void p(String s) { if(dbg) pa(s); }
private static void pa(String s) { System.out.println(s); }
! public FrameScreen(GraphicsAPI api, Color bg) {
! super(api, bg);
zzFrame = new Frame("Gzz");
zzFrame.addComponentListener(new ComponentAdapter() {
public void componentMoved(ComponentEvent e) {
--- 29,43 ----
*/
public class FrameScreen extends AWTScreen {
! public static final String rcsid = "$Id: FrameScreen.java,v 1.10 2002/08/29
09:41:16 tjl Exp $";
protected Frame zzFrame;
public static boolean dbg = false;
private static void p(String s) { if(dbg) pa(s); }
private static void pa(String s) { System.out.println(s); }
! public FrameScreen(GraphicsAPI api) {
! super(api);
zzFrame = new Frame("Gzz");
zzFrame.addComponentListener(new ComponentAdapter() {
public void componentMoved(ComponentEvent e) {
Index: gzz/gzz/client/gl/GLAPI.java
diff -c gzz/gzz/client/gl/GLAPI.java:1.16 gzz/gzz/client/gl/GLAPI.java:1.17
*** gzz/gzz/client/gl/GLAPI.java:1.16 Thu Aug 22 04:28:52 2002
--- gzz/gzz/client/gl/GLAPI.java Thu Aug 29 05:41:16 2002
***************
*** 42,83 ****
}
});
}
! public Window createWindow(java.awt.Color bg) {
! return (lastScreen = new GLScreen(this, bg));
}
public TextStyle getTextStyle(String family, int style, int size) {
return gzz.vob.GLTextStyle.create(family, style, size);
- }
-
- GLScreen lastScreen;
-
- public VobScene createVobScene(Dimension size) {
- VobScene vs = new VobScene(
- new GLVobMap(lastScreen),
- new GLVobCoorder(),
- this,
- size
- );
- vs.put(getBGClear(), "NOCKEY", 10, 0, 0, 1, 1);
- return vs;
- }
-
- Vob clear ;
-
- public Vob getBGClear() {
- if(clear == null)
- clear = GZZGL.createCallList(
- "ClearColor 0.5 0.3 0.6 1.0\n"+
- "Clear COLOR_BUFFER_BIT DEPTH_BUFFER_BIT\n"+
- "Enable TEXTURE_2D\n"+
- "Enable ALPHA_TEST\n"+
- "AlphaFunc GREATER 0\n"+
- "Enable BLEND\n"+
- "BlendFunc SRC_ALPHA ONE_MINUS_SRC_ALPHA\n"+
- "Color 1 1 1 1\n"+
- ""
- );
- return clear;
}
}
--- 42,52 ----
}
});
}
! public Window createWindow() {
! return new GLScreen(this);
}
public TextStyle getTextStyle(String family, int style, int size) {
return gzz.vob.GLTextStyle.create(family, style, size);
}
}
Index: gzz/gzz/client/gl/GLScreen.java
diff -c gzz/gzz/client/gl/GLScreen.java:1.24
gzz/gzz/client/gl/GLScreen.java:1.25
*** gzz/gzz/client/gl/GLScreen.java:1.24 Thu Aug 22 04:29:15 2002
--- gzz/gzz/client/gl/GLScreen.java Thu Aug 29 05:41:16 2002
***************
*** 33,39 ****
import java.util.HashMap;
public class GLScreen extends GraphicsAPI.Window {
! public static final String rcsid = "$Id: GLScreen.java,v 1.24 2002/08/22
08:29:15 tjl Exp $";
public static boolean dbg = false;
private static void pa(String s) { System.err.println(s); }
--- 33,39 ----
import java.util.HashMap;
public class GLScreen extends GraphicsAPI.Window {
! public static final String rcsid = "$Id: GLScreen.java,v 1.25 2002/08/29
09:41:16 tjl Exp $";
public static boolean dbg = false;
private static void pa(String s) { System.err.println(s); }
***************
*** 142,147 ****
--- 142,179 ----
}
}
+ // XXX To be removed later
+ Vob clear ;
+ public Vob getBGClear() {
+ if(clear == null)
+ clear = GZZGL.createCallList(
+ "ClearColor 0.5 0.3 0.6 1.0\n"+
+ "Clear COLOR_BUFFER_BIT DEPTH_BUFFER_BIT\n"+
+ "Enable TEXTURE_2D\n"+
+ "Enable ALPHA_TEST\n"+
+ "AlphaFunc GREATER 0\n"+
+ "Enable BLEND\n"+
+ "BlendFunc SRC_ALPHA ONE_MINUS_SRC_ALPHA\n"+
+ "Color 1 1 1 1\n"+
+ ""
+ );
+ return clear;
+ }
+
+
+ public VobScene createVobScene(Dimension size) {
+ VobScene vs = new VobScene(
+ new GLVobMap(this),
+ new GLVobCoorder(),
+ this.getGraphicsAPI(),
+ this,
+ size
+ );
+ vs.put(getBGClear(), "NOCKEY", 10, 0, 0, 1, 1);
+ return vs;
+ }
+
+
Binder binder;
public void registerBinder(Binder s) {
binder = s;
***************
*** 153,159 ****
GLEventHandler h = new GLEventHandler();
! public GLScreen(GraphicsAPI api, java.awt.Color bg) {
super(api);
if(dbg) pa("Create glscreen");
window = GZZGL.createWindow(0, 0, 1200, 900, h);
--- 185,191 ----
GLEventHandler h = new GLEventHandler();
! public GLScreen(GraphicsAPI api) {
super(api);
if(dbg) pa("Create glscreen");
window = GZZGL.createWindow(0, 0, 1200, 900, h);
Index: gzz/gzz/modules/pp/PlaneView.java
diff -c gzz/gzz/modules/pp/PlaneView.java:1.43
gzz/gzz/modules/pp/PlaneView.java:1.44
*** gzz/gzz/modules/pp/PlaneView.java:1.43 Mon Aug 26 04:21:40 2002
--- gzz/gzz/modules/pp/PlaneView.java Thu Aug 29 05:41:16 2002
***************
*** 39,45 ****
*/
public class PlaneView {
! public static final String rcsid = "$Id: PlaneView.java,v 1.43 2002/08/26
08:21:40 tjl Exp $";
public static boolean dbg = true;
private static void p(String s) { if(dbg) pa(s); }
private static void pa(String s) { System.err.println(s); }
--- 39,45 ----
*/
public class PlaneView {
! public static final String rcsid = "$Id: PlaneView.java,v 1.44 2002/08/29
09:41:16 tjl Exp $";
public static boolean dbg = true;
private static void p(String s) { if(dbg) pa(s); }
private static void pa(String s) { System.err.println(s); }
***************
*** 72,78 ****
p("GetPaperscene: "+cursor);
! VobScene vs = parent.gfxapi.createVobScene(new Dimension(42, 42));
Cell plane = cursor.h(Win.d_contains);
Cell note = plane.s(Win.d_contains);
--- 72,78 ----
p("GetPaperscene: "+cursor);
! VobScene vs = parent.window.createVobScene(new Dimension(42, 42));
Cell plane = cursor.h(Win.d_contains);
Cell note = plane.s(Win.d_contains);
Index: gzz/gzz/modules/pp/Win.java
diff -c gzz/gzz/modules/pp/Win.java:1.46 gzz/gzz/modules/pp/Win.java:1.47
*** gzz/gzz/modules/pp/Win.java:1.46 Mon Aug 19 10:45:48 2002
--- gzz/gzz/modules/pp/Win.java Thu Aug 29 05:41:16 2002
***************
*** 36,46 ****
*/
public class Win extends AbstractBinder implements Shower {
! public static final String rcsid = "$Id: Win.java,v 1.46 2002/08/19 14:45:48
tjl Exp $";
public static final boolean dbg = true;
protected static void p(String s) { if(dbg) pa(s); }
protected static void pa(String s) { System.err.println(s); }
/** Browsing mode: just moving around.
*/
--- 36,47 ----
*/
public class Win extends AbstractBinder implements Shower {
! public static final String rcsid = "$Id: Win.java,v 1.47 2002/08/29 09:41:16
tjl Exp $";
public static final boolean dbg = true;
protected static void p(String s) { if(dbg) pa(s); }
protected static void pa(String s) { System.err.println(s); }
+ public void chg() { }
/** Browsing mode: just moving around.
*/
***************
*** 152,160 ****
public VobScene generate() {
if(updatePending) updateSpace();
// See UnifiedShower.generate for margins
! Dimension d = this.screen.window.getSize();
! GraphicsAPI gfxapi = this.screen.window.getGraphicsAPI();
! VobScene sc = gfxapi.createVobScene(d);
if(view != null)
view.render(sc, 0, new ZZViewContext(cursor));
--- 153,159 ----
public VobScene generate() {
if(updatePending) updateSpace();
// See UnifiedShower.generate for margins
! VobScene sc = this.screen.window.createVobScene();
if(view != null)
view.render(sc, 0, new ZZViewContext(cursor));
***************
*** 164,178 ****
return sc;
}
- public void chg() {
- this.screen.window.chg();
- }
public Win(Cell cursor, PPActions ppactions, Runnable updateSpaceRun)
throws RemoteException {
this.updateSpaceRun = updateSpaceRun;
AbstractUpdateManager.addWindow(new Screen(
! GraphicsAPI.getInstance().createWindow(new
Color(0xe4f6ff)),
this,
this
));
--- 163,174 ----
return sc;
}
public Win(Cell cursor, PPActions ppactions, Runnable updateSpaceRun)
throws RemoteException {
this.updateSpaceRun = updateSpaceRun;
AbstractUpdateManager.addWindow(new Screen(
! GraphicsAPI.getInstance().createWindow(),
this,
this
));
Index: gzz/gzz/vob/VobScene.java
diff -c gzz/gzz/vob/VobScene.java:1.9 gzz/gzz/vob/VobScene.java:1.10
*** gzz/gzz/vob/VobScene.java:1.9 Thu Aug 15 12:37:11 2002
--- gzz/gzz/vob/VobScene.java Thu Aug 29 05:41:16 2002
***************
*** 43,56 ****
public final VobCoorder coords;
public final gzz.client.GraphicsAPI gfxapi;
public final Dimension size;
! public VobScene(VobMap m, VobCoorder c, gzz.client.GraphicsAPI gfxapi,
Dimension size) {
this.map = m;
this.coords = c;
this.gfxapi = gfxapi;
this.size = size;
}
/** Determines size of the area designated for the <code>Vob</code>s.
--- 43,60 ----
public final VobCoorder coords;
public final gzz.client.GraphicsAPI gfxapi;
+ public final gzz.client.GraphicsAPI.Window window;
public final Dimension size;
! public VobScene(VobMap m, VobCoorder c,
! gzz.client.GraphicsAPI gfxapi,
! gzz.client.GraphicsAPI.Window window,
Dimension size) {
this.map = m;
this.coords = c;
this.gfxapi = gfxapi;
+ this.window = window;
this.size = size;
}
/** Determines size of the area designated for the <code>Vob</code>s.
Index: gzz/test/gzz/vob/TestLBChain.java
diff -c gzz/test/gzz/vob/TestLBChain.java:1.9
gzz/test/gzz/vob/TestLBChain.java:1.10
*** gzz/test/gzz/vob/TestLBChain.java:1.9 Fri Aug 16 06:22:40 2002
--- gzz/test/gzz/vob/TestLBChain.java Thu Aug 29 05:41:16 2002
***************
*** 29,35 ****
*/
public class TestLBChain extends TestCase {
! String rcsid = "$Id: TestLBChain.java,v 1.9 2002/08/16 10:22:40 benja Exp $";
public TestLBChain(String s) { super(s); }
--- 29,35 ----
*/
public class TestLBChain extends TestCase {
! String rcsid = "$Id: TestLBChain.java,v 1.10 2002/08/29 09:41:16 tjl Exp $";
public TestLBChain(String s) { super(s); }
***************
*** 59,65 ****
LinebreakableChain lb3 = new LinebreakableChain();
DefaultLinebreaker lbr = new DefaultLinebreaker();
! VobScene sc = new gzz.client.awt.AWTAPI().createVobScene(new
Dimension(1000,1000));
Rectangle c = new Rectangle();
--- 59,69 ----
LinebreakableChain lb3 = new LinebreakableChain();
DefaultLinebreaker lbr = new DefaultLinebreaker();
! VobScene sc = new VobScene(new DefaultVobMap(),
! new OrthoCoorder(1000,1000),
! null,
! null,
! new Dimension(1000,1000));
Rectangle c = new Rectangle();
Index: gzz/test/gzz/vob/TestVobScene.java
diff -c gzz/test/gzz/vob/TestVobScene.java:1.9
gzz/test/gzz/vob/TestVobScene.java:1.10
*** gzz/test/gzz/vob/TestVobScene.java:1.9 Thu Aug 15 12:37:11 2002
--- gzz/test/gzz/vob/TestVobScene.java Thu Aug 29 05:41:16 2002
***************
*** 29,35 ****
*/
abstract public class TestVobScene extends TestCase {
! String rcsid = "$Id: TestVobScene.java,v 1.9 2002/08/15 16:37:11 benja Exp $";
static boolean dbg = false;
public TestVobScene(String s) { super(s); }
--- 29,35 ----
*/
abstract public class TestVobScene extends TestCase {
! String rcsid = "$Id: TestVobScene.java,v 1.10 2002/08/29 09:41:16 tjl Exp $";
static boolean dbg = false;
public TestVobScene(String s) { super(s); }
***************
*** 41,47 ****
abstract GraphicsAPI getGraphicsAPI() ;
public VobScene createVobScene() {
! return getGraphicsAPI().createVobScene(new Dimension(500,500));
}
--- 41,47 ----
abstract GraphicsAPI getGraphicsAPI() ;
public VobScene createVobScene() {
! return getGraphicsAPI().createWindow().createVobScene(new
Dimension(500,500));
}
- [Gzz-commits] gzz gzz/client/AbstractShower.java gzz/client/F...,
Tuomas J. Lukka <=