[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gzz-commits] gzz ./TODO gfx/jni/GzzGL-jni.cxx gzz/client/gl/...
|
From: |
Tuomas J. Lukka |
|
Subject: |
[Gzz-commits] gzz ./TODO gfx/jni/GzzGL-jni.cxx gzz/client/gl/... |
|
Date: |
Thu, 05 Dec 2002 05:57:35 -0500 |
CVSROOT: /cvsroot/gzz
Module name: gzz
Changes by: Tuomas J. Lukka <address@hidden> 02/12/05 05:57:34
Modified files:
. : TODO
gfx/jni : GzzGL-jni.cxx
gzz/client/gl : GLScreen.java
gzz/gfx/gl : GL.java GLCellConnector.java GLCellVob.java
GLVobCoorder.java GLVobMap.java
gzz/modules/pp/vob: BgVob.java CursorVob.java TextCursorVob.java
gzz/vob : Vob.java Vob3.java VobScene.java
gzz/vob/vobs : CalendarVob.java FilledRectVob.java
LineVob.java OvalBgVob.java RectBgVob.java
SimpleConnection.java SolidBgVob.java
TDecor.java TestSpotVob.java TextCursorVob.java
TextVob.java
Added files:
gzz/client/gl : GLRenderingSurface.java
Log message:
Refactor some more: split Window into RenderingSurface and Window.
Change every GL vob...
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/TODO.diff?tr1=1.439&tr2=1.440&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/jni/GzzGL-jni.cxx.diff?tr1=1.68&tr2=1.69&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/client/gl/GLRenderingSurface.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/client/gl/GLScreen.java.diff?tr1=1.40&tr2=1.41&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/gfx/gl/GL.java.diff?tr1=1.27&tr2=1.28&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/gfx/gl/GLCellConnector.java.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/gfx/gl/GLCellVob.java.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/gfx/gl/GLVobCoorder.java.diff?tr1=1.60&tr2=1.61&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/gfx/gl/GLVobMap.java.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/pp/vob/BgVob.java.diff?tr1=1.31&tr2=1.32&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/pp/vob/CursorVob.java.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/pp/vob/TextCursorVob.java.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/vob/Vob.java.diff?tr1=1.18&tr2=1.19&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/vob/Vob3.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/vob/VobScene.java.diff?tr1=1.20&tr2=1.21&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/vob/vobs/CalendarVob.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/vob/vobs/FilledRectVob.java.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/vob/vobs/LineVob.java.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/vob/vobs/OvalBgVob.java.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/vob/vobs/RectBgVob.java.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/vob/vobs/SimpleConnection.java.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/vob/vobs/SolidBgVob.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/vob/vobs/TDecor.java.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/vob/vobs/TestSpotVob.java.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/vob/vobs/TextCursorVob.java.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/vob/vobs/TextVob.java.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
Patches:
Index: gzz/TODO
diff -u gzz/TODO:1.439 gzz/TODO:1.440
--- gzz/TODO:1.439 Thu Dec 5 03:32:57 2002
+++ gzz/TODO Thu Dec 5 05:57:33 2002
@@ -62,6 +62,8 @@
- return ANKOS to Agora [ blocked by: waiting for trip to agora ]
- off-screen rendering
- needed for animations and render-to-texture
+ - animation: save images directly into target
+ format from C++. Should cut down generation time a lot.
- go through most important GL demos and redo the interfaces
- fillet demo
- fix last two screens
Index: gzz/gfx/jni/GzzGL-jni.cxx
diff -u gzz/gfx/jni/GzzGL-jni.cxx:1.68 gzz/gfx/jni/GzzGL-jni.cxx:1.69
--- gzz/gfx/jni/GzzGL-jni.cxx:1.68 Thu Dec 5 04:29:43 2002
+++ gzz/gfx/jni/GzzGL-jni.cxx Thu Dec 5 05:57:34 2002
@@ -351,6 +351,7 @@
JNIEXPORT void JNICALL Java_gzz_gfx_gl_GL_impl_1Window_1move
(JNIEnv *env, jclass, jint id, jint x, jint y) {
Os::Window *w = (Os::Window *)windows.get(id);
+ DBG(dbg) << "Move window "<<id<<" "<<x<<" "<<y<<" at "<<(int)w<<"\n";
w->move(x,y);
}
Index: gzz/gzz/client/gl/GLScreen.java
diff -u gzz/gzz/client/gl/GLScreen.java:1.40
gzz/gzz/client/gl/GLScreen.java:1.41
--- gzz/gzz/client/gl/GLScreen.java:1.40 Thu Dec 5 04:29:43 2002
+++ gzz/gzz/client/gl/GLScreen.java Thu Dec 5 05:57:34 2002
@@ -34,8 +34,8 @@
import java.util.HashMap;
-public class GLScreen extends GraphicsAPI.AbstractWindow {
-public static final String rcsid = "$Id: GLScreen.java,v 1.40 2002/12/05
09:29:43 tjl Exp $";
+public class GLScreen extends GLRenderingSurface implements GraphicsAPI.Window
{
+public static final String rcsid = "$Id: GLScreen.java,v 1.41 2002/12/05
10:57:34 tjl Exp $";
public static boolean dbg = false;
private static void pa(String s) { System.err.println(s); }
@@ -160,38 +160,6 @@
}
}
- // XXX To be removed later
- Vob clear ;
- public Vob getBGClear() {
- if(clear == null)
- clear = GLRen.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(),
- new DefaultVobMatcher(),
- this.getGraphicsAPI(),
- this,
- size
- );
- // the API particularly forbids this.
- // vs.put(getBGClear(), "NOCKEY", 10, 0, 0, 1, 1);
- return vs;
- }
Binder binder;
@@ -203,87 +171,27 @@
public GL.Window getWindow() { return window; }
- GLEventHandler h = new GLEventHandler();
+ GLEventHandler h;
- public GLScreen(GraphicsAPI api) {
- super(api);
- if(dbg) pa("Create glscreen");
- window = GL.createWindow(0, 0, 1200, 900, h);
- // window = GL.createWindow(0, 0, 200, 200, h);
- if(dbg) pa("Created window");
+ protected GL.RenderingSurface createGLObj(int x, int y, int w, int h) {
+ if(dbg) pa("Create glwindow "+x+" "+y+" "+w+" "+h);
+ this.h = new GLEventHandler();
+ window = GL.createWindow(x, y, w, h, this.h);
+ return window;
}
- public Dimension getSize() {
- Rectangle bounds = window.getBounds();
- return new Dimension(bounds.width, bounds.height);
+ public GLScreen(GraphicsAPI api) {
+ super(api, 0, 0, 200, 200);
+ if(dbg) pa("Created glscreen");
}
+
public void setLocation(int x, int y, int w, int h) {
if(dbg) pa("glscreen setloc "+x+" "+y+" "+w+" "+h);
window.move(x,y);
window.resize(w,h);
}
-
- public void renderStill(VobScene scene, float lod) {
- renderAnim(scene, null, 0, lod, true);
- }
-
- VobScene listprev, listnext;
- int[] interplist;
-
- public void renderAnim(VobScene prev, VobScene next, float fract, float
lod,
- boolean showFinal) {
- if(dbg) pa("glscreen renderanim "+fract+" "+lod);
- VobScene sc = prev;
- VobScene osc = next;
- if (fract > AbstractUpdateManager.jumpFract) {
- sc = next;
- osc = prev;
- fract = 1-fract;
- }
- if(osc == null) osc = sc;
- if(dbg) {
- pa("Going to render: "+sc+" "+osc+" "+fract);
- sc.dump();
- }
-
- if(sc != listprev || osc != listnext) {
- listprev = sc;
- listnext = osc;
- interplist = sc.matcher.interpList(osc.matcher);
- interplist[0] = interplist.length;
- }
-
- ((GLVobCoorder)sc.coords).renderInterp(window,
- (GLVobMap)sc.map, interplist,
- (GLVobCoorder)osc.coords, fract,
- true, showFinal);
-
- }
-
- public int[] readPixels(int x, int y, int w, int h) {
- GL.ByteVector v = GL.createByteVector(w*h*4);
- Dimension d = getSize();
- v.readFromBuffer(window, "FRONT",
- x, d.height-y-h, w, h,
- "BGRA", "UNSIGNED_BYTE");
- int[] res = v.getInts();
- // Exchange to get it right way up
- for(int row = 0; row < h/2; row++) {
- for(int col = 0; col < w; col++) {
- int tmp = res[row*w + col];
- res[row*w + col] = res[(h-1-row)*w + col];
- res[(h-1-row)*w + col] = tmp;
- }
- }
- return res;
- }
- public float timeRender(VobScene vs, int iters) {
- return ((GLVobCoorder)vs.coords).timeRender(window, (GLVobMap)vs.map,
- true, iters);
- }
-
static int curT = 42;
public void addTimeout(int ms, Object o) {
int id = curT++;
Index: gzz/gzz/gfx/gl/GL.java
diff -u gzz/gzz/gfx/gl/GL.java:1.27 gzz/gzz/gfx/gl/GL.java:1.28
--- gzz/gzz/gfx/gl/GL.java:1.27 Thu Dec 5 04:29:43 2002
+++ gzz/gzz/gfx/gl/GL.java Thu Dec 5 05:57:34 2002
@@ -170,7 +170,7 @@
*/
static public abstract class NonRenderableJavaObject extends JavaObject {
NonRenderableJavaObject(int id) { super(id); }
- public int addToListGL(GraphicsAPI.Window win, int[] list, int cur, int
cs1, int cs2) {
+ public int addToListGL(GraphicsAPI.RenderingSurface win, int[] list,
int cur, int cs1, int cs2) {
throw new Error("Not right to try to add me to a display list");
}
}
@@ -195,7 +195,7 @@
list[cur++] = (RENDERABLE0 | getId());
return cur;
}
- public int addToListGL(GraphicsAPI.Window win, int[] list, int cur, int
cs1, int cs2) {
+ public int addToListGL(GraphicsAPI.RenderingSurface win, int[] list,
int cur, int cs1, int cs2) {
return addToList(list, cur);
}
protected void deleteObj() {
@@ -226,7 +226,7 @@
list[cur++] = coordsys;
return cur;
}
- public int addToListGL(GraphicsAPI.Window win, int[] list, int cur, int
cs1, int cs2) {
+ public int addToListGL(GraphicsAPI.RenderingSurface win, int[] list,
int cur, int cs1, int cs2) {
return addToList(list, cur, cs1);
}
protected void deleteObj() {
@@ -253,7 +253,7 @@
* @param coordsys2 The number of the second system.
* @return The new current index after adding these.
*/
- public int addToListGL(GraphicsAPI.Window win, int[] list, int cur,
+ public int addToListGL(GraphicsAPI.RenderingSurface win, int[] list,
int cur,
int coordsys1, int coordsys2) {
list[cur++] = (RENDERABLE2 | getId());
list[cur++] = coordsys1;
@@ -286,7 +286,7 @@
* @param coordsys3 The number of the third system.
* @return The new current index after adding these.
*/
- public int addToListGL(GraphicsAPI.Window win, int[] list, int cur,
+ public int addToListGL(GraphicsAPI.RenderingSurface win, int[] list,
int cur,
int coordsys1, int coordsys2, int coordsys3) {
list[cur++] = (RENDERABLE3 | getId());
list[cur++] = coordsys1;
@@ -717,7 +717,7 @@
* e.g. "RGB", "RGBA"
* @param type The type to read to, e.g. "FLOAT" or "UNSIGNED_BYTE"
*/
- public void readFromBuffer(Window win,
+ public void readFromBuffer(RenderingSurface win,
String buffer,
int x, int y, int width, int height,
String format, String type) {
@@ -794,7 +794,7 @@
}
public static void render(
- Window win,
+ RenderingSurface win,
int ninds, int[] inds1, float[] pts1,
int[] interpinds,
int[] inds2, float[] pts2,
@@ -814,7 +814,7 @@
boolean showFinal);
public static float timeRender(
- Window win, int iters,
+ RenderingSurface win, int iters,
int ninds, int[] inds1, float[] pts1,
int[] codes,
boolean standardcoords) {
Index: gzz/gzz/gfx/gl/GLCellConnector.java
diff -u gzz/gzz/gfx/gl/GLCellConnector.java:1.8
gzz/gzz/gfx/gl/GLCellConnector.java:1.9
--- gzz/gzz/gfx/gl/GLCellConnector.java:1.8 Mon Sep 23 04:24:25 2002
+++ gzz/gzz/gfx/gl/GLCellConnector.java Thu Dec 5 05:57:34 2002
@@ -28,7 +28,7 @@
import gzz.client.GraphicsAPI;
public class GLCellConnector extends Vob {
-public static final String rcsid = "$Id: GLCellConnector.java,v 1.8 2002/09/23
08:24:25 tjl Exp $";
+public static final String rcsid = "$Id: GLCellConnector.java,v 1.9 2002/12/05
10:57:34 tjl Exp $";
public static void p(String s) { System.out.println(s); }
GLRen.SmoothConnector nur;
@@ -57,7 +57,7 @@
0.02f);
}
- public int addToListGL(GraphicsAPI.Window win,
+ public int addToListGL(GraphicsAPI.RenderingSurface win,
int[] list, int curs, int coordsys1,
int coordsys2) {
curs = nur.addToListGL(win, list, curs, coordsys1, coordsys2);
Index: gzz/gzz/gfx/gl/GLCellVob.java
diff -u gzz/gzz/gfx/gl/GLCellVob.java:1.9 gzz/gzz/gfx/gl/GLCellVob.java:1.10
--- gzz/gzz/gfx/gl/GLCellVob.java:1.9 Mon Sep 23 04:24:25 2002
+++ gzz/gzz/gfx/gl/GLCellVob.java Thu Dec 5 05:57:34 2002
@@ -28,7 +28,7 @@
import gzz.client.GraphicsAPI;
public class GLCellVob extends Vob {
-public static final String rcsid = "$Id: GLCellVob.java,v 1.9 2002/09/23
08:24:25 tjl Exp $";
+public static final String rcsid = "$Id: GLCellVob.java,v 1.10 2002/12/05
10:57:34 tjl Exp $";
public static void p(String s) { System.out.println(s); }
GLRen.HorizText text;
@@ -61,7 +61,7 @@
*/
}
- public int addToListGL(GraphicsAPI.Window win,
+ public int addToListGL(GraphicsAPI.RenderingSurface win,
int[] list, int curs, int coordsys1,
int coordsys2) {
// p("GLCellvob addtolist" + curs);
Index: gzz/gzz/gfx/gl/GLVobCoorder.java
diff -u gzz/gzz/gfx/gl/GLVobCoorder.java:1.60
gzz/gzz/gfx/gl/GLVobCoorder.java:1.61
--- gzz/gzz/gfx/gl/GLVobCoorder.java:1.60 Tue Nov 26 02:56:10 2002
+++ gzz/gzz/gfx/gl/GLVobCoorder.java Thu Dec 5 05:57:34 2002
@@ -31,7 +31,7 @@
import gzz.client.gl.*;
public class GLVobCoorder extends AffineVobCoorder {
-public static final String rcsid = "$Id: GLVobCoorder.java,v 1.60 2002/11/26
07:56:10 mudyc Exp $";
+public static final String rcsid = "$Id: GLVobCoorder.java,v 1.61 2002/12/05
10:57:34 tjl Exp $";
public static boolean dbg = false;
private static void pa(String s) { System.err.println(s); }
@@ -432,13 +432,13 @@
}
}
- public void renderInterp(GraphicsAPI.Window into, GLVobMap theVobs, int[]
csinds,
+ public void renderInterp(GraphicsAPI.RenderingSurface into, GLVobMap
theVobs, int[] csinds,
GLVobCoorder other, float fract,
boolean standardcoords, boolean showFinal) {
renderInterp(((GLScreen)into).getWindow(), theVobs, csinds, other,
fract,
standardcoords, showFinal);
}
- public void renderInterp(GL.Window into, GLVobMap theVobs, int[] csinds,
+ public void renderInterp(GL.RenderingSurface into, GLVobMap theVobs, int[]
csinds,
GLVobCoorder other, float fract,
boolean standardcoords, boolean showFinal) {
GL.render(into, ninds, this.inds, this.floats,
@@ -447,7 +447,7 @@
(other != null ? other.floats : null),
theVobs.list, fract, standardcoords, showFinal);
}
- public float timeRender(GL.Window into, GLVobMap theVobs,
+ public float timeRender(GL.RenderingSurface into, GLVobMap theVobs,
boolean standardcoords, int iters) {
return GL.timeRender(into, iters,
ninds, inds, floats,
Index: gzz/gzz/gfx/gl/GLVobMap.java
diff -u gzz/gzz/gfx/gl/GLVobMap.java:1.14 gzz/gzz/gfx/gl/GLVobMap.java:1.15
--- gzz/gzz/gfx/gl/GLVobMap.java:1.14 Sun Oct 20 05:33:17 2002
+++ gzz/gzz/gfx/gl/GLVobMap.java Thu Dec 5 05:57:34 2002
@@ -25,13 +25,13 @@
import java.awt.*;
public class GLVobMap implements VobMap {
-public static final String rcsid = "$Id: GLVobMap.java,v 1.14 2002/10/20
09:33:17 tjl Exp $";
+public static final String rcsid = "$Id: GLVobMap.java,v 1.15 2002/12/05
10:57:34 tjl Exp $";
public static boolean dbg = false;
private static void pa(String s) { System.err.println(s); }
- gzz.client.gl.GLScreen screen;
+ gzz.client.gl.GLRenderingSurface screen;
- public GLVobMap(gzz.client.gl.GLScreen screen) {
+ public GLVobMap(gzz.client.gl.GLRenderingSurface screen) {
this.screen = screen;
if(dbg) pa("New GLVobMap for "+screen+": "+this);
clear();
Index: gzz/gzz/modules/pp/vob/BgVob.java
diff -u gzz/gzz/modules/pp/vob/BgVob.java:1.31
gzz/gzz/modules/pp/vob/BgVob.java:1.32
--- gzz/gzz/modules/pp/vob/BgVob.java:1.31 Tue Nov 5 03:21:01 2002
+++ gzz/gzz/modules/pp/vob/BgVob.java Thu Dec 5 05:57:34 2002
@@ -37,7 +37,7 @@
* used to pan pretty easily.
*/
public class BgVob extends gzz.vob.Vob {
-public static final String rcsid = "$Id: BgVob.java,v 1.31 2002/11/05 08:21:01
tjl Exp $";
+public static final String rcsid = "$Id: BgVob.java,v 1.32 2002/12/05 10:57:34
tjl Exp $";
public static boolean dbg = false;
private static void pa(String s) { System.err.println(s); }
@@ -109,7 +109,7 @@
}
}
- public int addToListGL(GraphicsAPI.Window win,
+ public int addToListGL(GraphicsAPI.RenderingSurface win,
int[] list, int curs, int coordsys1,
int coordsys2) {
Index: gzz/gzz/modules/pp/vob/CursorVob.java
diff -u gzz/gzz/modules/pp/vob/CursorVob.java:1.8
gzz/gzz/modules/pp/vob/CursorVob.java:1.9
--- gzz/gzz/modules/pp/vob/CursorVob.java:1.8 Wed Nov 27 11:35:41 2002
+++ gzz/gzz/modules/pp/vob/CursorVob.java Thu Dec 5 05:57:34 2002
@@ -29,7 +29,7 @@
public class CursorVob extends gzz.vob.Vob {
-public static final String rcsid = "$Id: CursorVob.java,v 1.8 2002/11/27
16:35:41 humppake Exp $";
+public static final String rcsid = "$Id: CursorVob.java,v 1.9 2002/12/05
10:57:34 tjl Exp $";
static Point p1 = new Point();
@@ -61,7 +61,7 @@
static Vob crosshair;
- public int addToListGL(gzz.client.GraphicsAPI.Window win,
+ public int addToListGL(gzz.client.GraphicsAPI.RenderingSurface win,
int[] list, int curs, int coordsys1,
int coordsys2) {
if(crosshair == null)
Index: gzz/gzz/modules/pp/vob/TextCursorVob.java
diff -u gzz/gzz/modules/pp/vob/TextCursorVob.java:1.7
gzz/gzz/modules/pp/vob/TextCursorVob.java:1.8
--- gzz/gzz/modules/pp/vob/TextCursorVob.java:1.7 Wed Nov 27 11:35:41 2002
+++ gzz/gzz/modules/pp/vob/TextCursorVob.java Thu Dec 5 05:57:34 2002
@@ -29,7 +29,7 @@
/** A vertical line for now */
public class TextCursorVob extends gzz.vob.Vob {
-public static final String rcsid = "$Id: TextCursorVob.java,v 1.7 2002/11/27
16:35:41 humppake Exp $";
+public static final String rcsid = "$Id: TextCursorVob.java,v 1.8 2002/12/05
10:57:34 tjl Exp $";
static Point p1 = new Point();
static Point p2 = new Point();
@@ -48,7 +48,7 @@
// Emulate... ;)
static Vob crosshair;
- public int addToListGL(gzz.client.GraphicsAPI.Window win,
+ public int addToListGL(gzz.client.GraphicsAPI.RenderingSurface win,
int[] list, int curs, int coordsys1,
int coordsys2) {
Index: gzz/gzz/vob/Vob.java
diff -u gzz/gzz/vob/Vob.java:1.18 gzz/gzz/vob/Vob.java:1.19
--- gzz/gzz/vob/Vob.java:1.18 Mon Aug 26 11:36:26 2002
+++ gzz/gzz/vob/Vob.java Thu Dec 5 05:57:34 2002
@@ -41,7 +41,7 @@
*/
public abstract class Vob {
-public static final String rcsid = "$Id: Vob.java,v 1.18 2002/08/26 15:36:26
tjl Exp $";
+public static final String rcsid = "$Id: Vob.java,v 1.19 2002/12/05 10:57:34
tjl Exp $";
public static boolean dbg = false;
private static void pa(String s) { System.err.println(s); }
@@ -87,7 +87,7 @@
* the given coordinate systems.
* If only one coordinate system is needed, coordsys1 is used.
*/
- public int addToListGL(gzz.client.GraphicsAPI.Window win,
+ public int addToListGL(gzz.client.GraphicsAPI.RenderingSurface win,
int[] list, int curs, int coordsys1,
int coordsys2) {
if(dbg) {
Index: gzz/gzz/vob/Vob3.java
diff -u gzz/gzz/vob/Vob3.java:1.1 gzz/gzz/vob/Vob3.java:1.2
--- gzz/gzz/vob/Vob3.java:1.1 Wed Oct 2 07:43:44 2002
+++ gzz/gzz/vob/Vob3.java Thu Dec 5 05:57:34 2002
@@ -23,12 +23,12 @@
* coordinate systems (renderable3s).
*/
public interface Vob3 {
-public static final String rcsid = "$Id: Vob3.java,v 1.1 2002/10/02 11:43:44
humppake Exp $";
+public static final String rcsid = "$Id: Vob3.java,v 1.2 2002/12/05 10:57:34
tjl Exp $";
/** For OpenGL: Add the current vob to the given display list, using
* the given coordinate systems.
*/
- public int addToListGL(gzz.client.GraphicsAPI.Window win,
+ public int addToListGL(gzz.client.GraphicsAPI.RenderingSurface win,
int[] list, int curs, int coordsys1,
int coordsys2, int coordsys3);
}
Index: gzz/gzz/vob/VobScene.java
diff -u gzz/gzz/vob/VobScene.java:1.20 gzz/gzz/vob/VobScene.java:1.21
--- gzz/gzz/vob/VobScene.java:1.20 Tue Nov 26 03:32:26 2002
+++ gzz/gzz/vob/VobScene.java Thu Dec 5 05:57:34 2002
@@ -118,7 +118,7 @@
public final VobMatcher matcher;
public final gzz.client.GraphicsAPI gfxapi;
- public final gzz.client.GraphicsAPI.Window window;
+ public final gzz.client.GraphicsAPI.RenderingSurface window;
private final AffineVobCoorder af() {
if(coords instanceof AffineVobCoorder)
@@ -129,7 +129,7 @@
public final Dimension size;
public VobScene(VobMap m, VobCoorder c, VobMatcher mat,
gzz.client.GraphicsAPI gfxapi,
- gzz.client.GraphicsAPI.Window window,
+ gzz.client.GraphicsAPI.RenderingSurface window,
Dimension size) {
this.map = m;
this.coords = c;
Index: gzz/gzz/vob/vobs/CalendarVob.java
diff -u gzz/gzz/vob/vobs/CalendarVob.java:1.1
gzz/gzz/vob/vobs/CalendarVob.java:1.2
--- gzz/gzz/vob/vobs/CalendarVob.java:1.1 Fri Nov 1 20:23:46 2002
+++ gzz/gzz/vob/vobs/CalendarVob.java Thu Dec 5 05:57:34 2002
@@ -13,7 +13,7 @@
import java.util.*;
public class CalendarVob extends Vob {
-public static final String rcsid = "$Id: CalendarVob.java,v 1.1 2002/11/02
01:23:46 benja Exp $";
+public static final String rcsid = "$Id: CalendarVob.java,v 1.2 2002/12/05
10:57:34 tjl Exp $";
public static boolean dbg = false;
static final void p(String s) { if(dbg) System.out.println(s); }
static final void pa(String s) { System.out.println(s); }
@@ -230,7 +230,7 @@
static GL.DisplayList list;
- public int addToListGL(GraphicsAPI.Window win,
+ public int addToListGL(GraphicsAPI.RenderingSurface win,
int[] list, int curs,
int coordsys1,
int coordsys2)
Index: gzz/gzz/vob/vobs/FilledRectVob.java
diff -u gzz/gzz/vob/vobs/FilledRectVob.java:1.3
gzz/gzz/vob/vobs/FilledRectVob.java:1.4
--- gzz/gzz/vob/vobs/FilledRectVob.java:1.3 Wed Nov 27 11:35:41 2002
+++ gzz/gzz/vob/vobs/FilledRectVob.java Thu Dec 5 05:57:34 2002
@@ -39,7 +39,7 @@
*/
public class FilledRectVob extends Vob {
-public static final String rcsid = "$Id: FilledRectVob.java,v 1.3 2002/11/27
16:35:41 humppake Exp $";
+public static final String rcsid = "$Id: FilledRectVob.java,v 1.4 2002/12/05
10:57:34 tjl Exp $";
public static boolean dbg = false;
static final void pa(String s) { System.out.println(s); }
@@ -70,7 +70,7 @@
Vob glList;
- public int addToListGL(GraphicsAPI.Window win,
+ public int addToListGL(GraphicsAPI.RenderingSurface win,
int[] list, int curs, int coordsys1,
int coordsys2) {
float [] boxwh = new float[2];
Index: gzz/gzz/vob/vobs/LineVob.java
diff -u gzz/gzz/vob/vobs/LineVob.java:1.5 gzz/gzz/vob/vobs/LineVob.java:1.6
--- gzz/gzz/vob/vobs/LineVob.java:1.5 Wed Nov 27 11:35:41 2002
+++ gzz/gzz/vob/vobs/LineVob.java Thu Dec 5 05:57:34 2002
@@ -35,7 +35,7 @@
*/
public class LineVob extends Vob {
-public static final String rcsid = "$Id: LineVob.java,v 1.5 2002/11/27
16:35:41 humppake Exp $";
+public static final String rcsid = "$Id: LineVob.java,v 1.6 2002/12/05
10:57:34 tjl Exp $";
int x0, y0, x1, y1;
Color color;
@@ -69,7 +69,7 @@
}
Vob dlist;
- public int addToListGL(gzz.client.GraphicsAPI.Window win,
+ public int addToListGL(gzz.client.GraphicsAPI.RenderingSurface win,
int[] list, int curs, int coordsys1,
int coordsys2) {
if(dlist == null)
Index: gzz/gzz/vob/vobs/OvalBgVob.java
diff -u gzz/gzz/vob/vobs/OvalBgVob.java:1.4 gzz/gzz/vob/vobs/OvalBgVob.java:1.5
--- gzz/gzz/vob/vobs/OvalBgVob.java:1.4 Wed Nov 27 11:35:41 2002
+++ gzz/gzz/vob/vobs/OvalBgVob.java Thu Dec 5 05:57:34 2002
@@ -41,7 +41,7 @@
*/
public class OvalBgVob extends Vob {
-public static final String rcsid = "$Id: OvalBgVob.java,v 1.4 2002/11/27
16:35:41 humppake Exp $";
+public static final String rcsid = "$Id: OvalBgVob.java,v 1.5 2002/12/05
10:57:34 tjl Exp $";
public static boolean dbg = false;
static final void p(String s) { if(dbg) System.out.println(s); }
static final void pa(String s) { System.out.println(s); }
@@ -107,7 +107,7 @@
Vob glList;
- public int addToListGL(GraphicsAPI.Window win,
+ public int addToListGL(GraphicsAPI.RenderingSurface win,
int[] list, int curs, int coordsys1,
int coordsys2) {
if(dbg) pa("Addtolistgl rectbg "+coordsys1);
Index: gzz/gzz/vob/vobs/RectBgVob.java
diff -u gzz/gzz/vob/vobs/RectBgVob.java:1.4 gzz/gzz/vob/vobs/RectBgVob.java:1.5
--- gzz/gzz/vob/vobs/RectBgVob.java:1.4 Wed Nov 27 11:35:41 2002
+++ gzz/gzz/vob/vobs/RectBgVob.java Thu Dec 5 05:57:34 2002
@@ -40,7 +40,7 @@
*/
public class RectBgVob extends Vob {
-public static final String rcsid = "$Id: RectBgVob.java,v 1.4 2002/11/27
16:35:41 humppake Exp $";
+public static final String rcsid = "$Id: RectBgVob.java,v 1.5 2002/12/05
10:57:34 tjl Exp $";
public static boolean dbg = false;
static final void pa(String s) { System.out.println(s); }
@@ -94,7 +94,7 @@
Vob glList;
- public int addToListGL(GraphicsAPI.Window win,
+ public int addToListGL(GraphicsAPI.RenderingSurface win,
int[] list, int curs, int coordsys1,
int coordsys2) {
if(dbg) pa("Addtolistgl rectbg "+coordsys1);
Index: gzz/gzz/vob/vobs/SimpleConnection.java
diff -u gzz/gzz/vob/vobs/SimpleConnection.java:1.3
gzz/gzz/vob/vobs/SimpleConnection.java:1.4
--- gzz/gzz/vob/vobs/SimpleConnection.java:1.3 Mon Nov 25 11:03:40 2002
+++ gzz/gzz/vob/vobs/SimpleConnection.java Thu Dec 5 05:57:34 2002
@@ -31,7 +31,7 @@
*/
public class SimpleConnection extends Vob {
-public static final String rcsid = "$Id: SimpleConnection.java,v 1.3
2002/11/25 16:03:40 humppake Exp $";
+public static final String rcsid = "$Id: SimpleConnection.java,v 1.4
2002/12/05 10:57:34 tjl Exp $";
float x0, y0, x1, y1;
Color color;
@@ -73,7 +73,7 @@
}
static Vob line;
- public int addToListGL(GraphicsAPI.Window win,
+ public int addToListGL(GraphicsAPI.RenderingSurface win,
int[] list, int curs, int coordsys1,
int coordsys2) {
if(color != null)
Index: gzz/gzz/vob/vobs/SolidBgVob.java
diff -u gzz/gzz/vob/vobs/SolidBgVob.java:1.1
gzz/gzz/vob/vobs/SolidBgVob.java:1.2
--- gzz/gzz/vob/vobs/SolidBgVob.java:1.1 Fri Nov 1 20:23:46 2002
+++ gzz/gzz/vob/vobs/SolidBgVob.java Thu Dec 5 05:57:34 2002
@@ -82,7 +82,7 @@
Vob glList;
- public int addToListGL(gzz.client.GraphicsAPI.Window win,
+ public int addToListGL(gzz.client.GraphicsAPI.RenderingSurface win,
int[] list, int curs, int coordsys1, int coordsys2)
{
if(glList == null) {
Index: gzz/gzz/vob/vobs/TDecor.java
diff -u gzz/gzz/vob/vobs/TDecor.java:1.3 gzz/gzz/vob/vobs/TDecor.java:1.4
--- gzz/gzz/vob/vobs/TDecor.java:1.3 Thu Nov 28 01:59:21 2002
+++ gzz/gzz/vob/vobs/TDecor.java Thu Dec 5 05:57:34 2002
@@ -30,7 +30,7 @@
/** A "T" decoration indicating a connection that isn't shown.
*/
public class TDecor extends Vob {
-public static final String rcsid = "$Id: TDecor.java,v 1.3 2002/11/28 06:59:21
humppake Exp $";
+public static final String rcsid = "$Id: TDecor.java,v 1.4 2002/12/05 10:57:34
tjl Exp $";
Color color;
@@ -84,7 +84,7 @@
}
Vob decor;
- public int addToListGL(gzz.client.GraphicsAPI.Window win,
+ public int addToListGL(gzz.client.GraphicsAPI.RenderingSurface win,
int[] list, int curs, int coordsys1,
int coordsys2) {
float r, g, b, a;
Index: gzz/gzz/vob/vobs/TestSpotVob.java
diff -u gzz/gzz/vob/vobs/TestSpotVob.java:1.3
gzz/gzz/vob/vobs/TestSpotVob.java:1.4
--- gzz/gzz/vob/vobs/TestSpotVob.java:1.3 Thu Nov 28 02:18:08 2002
+++ gzz/gzz/vob/vobs/TestSpotVob.java Thu Dec 5 05:57:34 2002
@@ -34,7 +34,7 @@
* This is most likely not useful for anything else.
*/
public class TestSpotVob extends Vob {
-public static final String rcsid = "$Id: TestSpotVob.java,v 1.3 2002/11/28
07:18:08 humppake Exp $";
+public static final String rcsid = "$Id: TestSpotVob.java,v 1.4 2002/12/05
10:57:34 tjl Exp $";
float x, y, z;
@@ -60,7 +60,7 @@
g.fillRect(i.x+((int)x-1), i.y+((int)y-1), 3, 3);
}
- public int addToListGL(gzz.client.GraphicsAPI.Window win,
+ public int addToListGL(gzz.client.GraphicsAPI.RenderingSurface win,
int[] list, int curs, int coordsys1,
int coordsys2) {
if(glrend == null) {
Index: gzz/gzz/vob/vobs/TextCursorVob.java
diff -u gzz/gzz/vob/vobs/TextCursorVob.java:1.4
gzz/gzz/vob/vobs/TextCursorVob.java:1.5
--- gzz/gzz/vob/vobs/TextCursorVob.java:1.4 Wed Nov 27 11:35:41 2002
+++ gzz/gzz/vob/vobs/TextCursorVob.java Thu Dec 5 05:57:34 2002
@@ -39,7 +39,7 @@
*/
public class TextCursorVob extends Vob {
-String rcsid = "$Id: TextCursorVob.java,v 1.4 2002/11/27 16:35:41 humppake Exp
$";
+String rcsid = "$Id: TextCursorVob.java,v 1.5 2002/12/05 10:57:34 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); }
@@ -83,7 +83,7 @@
}
Vob dlist;
- public int addToListGL(gzz.client.GraphicsAPI.Window win,
+ public int addToListGL(gzz.client.GraphicsAPI.RenderingSurface win,
int[] list, int curs, int coordsys1,
int coordsys2) {
if(dlist == null)
Index: gzz/gzz/vob/vobs/TextVob.java
diff -u gzz/gzz/vob/vobs/TextVob.java:1.5 gzz/gzz/vob/vobs/TextVob.java:1.6
--- gzz/gzz/vob/vobs/TextVob.java:1.5 Fri Nov 22 19:35:21 2002
+++ gzz/gzz/vob/vobs/TextVob.java Thu Dec 5 05:57:34 2002
@@ -48,7 +48,7 @@
* XXX Diagram!
*/
public class TextVob extends HBox.VobHBox {
-String rcsid = "$Id: TextVob.java,v 1.5 2002/11/23 00:35:21 benja Exp $";
+String rcsid = "$Id: TextVob.java,v 1.6 2002/12/05 10:57:34 tjl Exp $";
public static boolean dbg = false;
private static void pa(String s) { System.err.println(s); }
@@ -172,7 +172,7 @@
/** The OpenGL renderable for this TextVob.
*/
private Vob ht;
- public int addToListGL(GraphicsAPI.Window win,
+ public int addToListGL(GraphicsAPI.RenderingSurface win,
int[] list, int curs, int coordsys1,
int coordsys2) {
if(dbg) pa("Addtolistgl text "+text);
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gzz-commits] gzz ./TODO gfx/jni/GzzGL-jni.cxx gzz/client/gl/...,
Tuomas J. Lukka <=