[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gzz-commits] gzz ./Makefile ./TODO gfx/jni/Makefile gfx/libr...
|
From: |
Tuomas J. Lukka |
|
Subject: |
[Gzz-commits] gzz ./Makefile ./TODO gfx/jni/Makefile gfx/libr... |
|
Date: |
Mon, 23 Sep 2002 04:24:26 -0400 |
CVSROOT: /cvsroot/gzz
Module name: gzz
Changes by: Tuomas J. Lukka <address@hidden> 02/09/23 04:24:26
Modified files:
. : Makefile TODO
gfx/jni : Makefile
gfx/librenderables: Makefile-javaonly renderables.py
gzz/client/gl : GLAPI.java GLScreen.java GLUpdateManager.java
gzz/gfx/gl : GLBackgroundImageLoader.java
GLCellConnector.java GLCellVob.java
GLSpans.java GLVanishingClient.java
GLVobCoorder.java Stencil.java
gzz/modules/pp : ViewportVob.java
gzz/modules/pp/vob: BgVob.java CursorVob.java TextCursorVob.java
gzz/vob : GLTextStyle.java RectBgVob.java
SimpleConnection.java SolidBgVob.java
TextCursorVob.java TextVob.java
Added files:
gzz/gfx/gl : GL.java
Log message:
BIG split. Expect problems in Jython code: all occurrences of GZZGL
need to be replaced by 'GL' or 'GLRen' depending on the use.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/Makefile.diff?tr1=1.170&tr2=1.171&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/TODO.diff?tr1=1.119&tr2=1.120&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/jni/Makefile.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/librenderables/Makefile-javaonly.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/librenderables/renderables.py.diff?tr1=1.58&tr2=1.59&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/client/gl/GLAPI.java.diff?tr1=1.17&tr2=1.18&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/client/gl/GLScreen.java.diff?tr1=1.27&tr2=1.28&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/client/gl/GLUpdateManager.java.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/gfx/gl/GL.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/gfx/gl/GLBackgroundImageLoader.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/gfx/gl/GLCellConnector.java.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/gfx/gl/GLCellVob.java.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/gfx/gl/GLSpans.java.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/gfx/gl/GLVanishingClient.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.26&tr2=1.27&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/gfx/gl/Stencil.java.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/pp/ViewportVob.java.diff?tr1=1.16&tr2=1.17&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/pp/vob/BgVob.java.diff?tr1=1.24&tr2=1.25&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/pp/vob/CursorVob.java.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/pp/vob/TextCursorVob.java.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/vob/GLTextStyle.java.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/vob/RectBgVob.java.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/vob/SimpleConnection.java.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/vob/SolidBgVob.java.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/vob/TextCursorVob.java.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/vob/TextVob.java.diff?tr1=1.26&tr2=1.27&r1=text&r2=text
Patches:
Index: gzz/Makefile
diff -c gzz/Makefile:1.170 gzz/Makefile:1.171
*** gzz/Makefile:1.170 Mon Sep 16 09:59:42 2002
--- gzz/Makefile Mon Sep 23 04:24:25 2002
***************
*** 145,154 ****
GENERATEDBASALT=basalt/gzz/impl/Merge1.java
basalt/gzz/impl/clasm/ClasmPrimitiveSet1.java
basalt/gzz/impl/PartialOrder.java basalt/gzz/impl/ExternalEditor.java
basalt/gzz/impl/PlainVStreamDim.java
! GENERATED=gzz/mediaserver/MediaTypes.java gzz/gfx/gl/GZZGL.java
! gzz/gfx/gl/GZZGL.java: gfx/librenderables/*
! (cd gfx/librenderables; make -f Makefile-javaonly
../../gzz/gfx/gl/GZZGL.java)
basalt/gzz/impl/Merge1.java: basalt/gzz/impl/Merge1 gzz/impl/genmerge.pl
perl gzz/impl/genmerge.pl basalt/gzz/impl/Merge1
--- 145,154 ----
GENERATEDBASALT=basalt/gzz/impl/Merge1.java
basalt/gzz/impl/clasm/ClasmPrimitiveSet1.java
basalt/gzz/impl/PartialOrder.java basalt/gzz/impl/ExternalEditor.java
basalt/gzz/impl/PlainVStreamDim.java
! GENERATED=gzz/mediaserver/MediaTypes.java gzz/gfx/gl/GLRen.java
! gzz/gfx/gl/GLRen.java: gfx/librenderables/*
! (cd gfx/librenderables; make -f Makefile-javaonly
../../gzz/gfx/gl/GLRen.java)
basalt/gzz/impl/Merge1.java: basalt/gzz/impl/Merge1 gzz/impl/genmerge.pl
perl gzz/impl/genmerge.pl basalt/gzz/impl/Merge1
***************
*** 457,461 ****
test-lava-junit:
$(JAVA) -Dzdir=$(Z_DIR) junit.textui.TestRunner gzz.TestLava
! compile-xxx: gzz/gfx/gl/GZZGL.java
! $(JAVAC) $(DEBUG) -d $(CLASSDIR) gzz/client/*.java
gzz/gfx/gl/GZZGL.java gzz/client/gl/*.java
--- 457,461 ----
test-lava-junit:
$(JAVA) -Dzdir=$(Z_DIR) junit.textui.TestRunner gzz.TestLava
! compile-xxx: gzz/gfx/gl/GLRen.java
! $(JAVAC) $(DEBUG) -d $(CLASSDIR) gzz/client/*.java
gzz/gfx/gl/GLRen.java gzz/client/gl/*.java
Index: gzz/TODO
diff -c gzz/TODO:1.119 gzz/TODO:1.120
*** gzz/TODO:1.119 Mon Sep 23 03:43:27 2002
--- gzz/TODO Mon Sep 23 04:24:25 2002
***************
*** 68,76 ****
that we don't have to do silly "execfile" tricks in
papertest.py and others.
tjl:
- - split GZZGL --> GL, GLRen. GLRen will be the autogenerated
- file and GL will be (finally) a properly javadocced
- Java source file.
- fix utf8 string non-null end bug found by Benja
- distorted multi-page PDF view with xu links
- texture performance, look at imagecache
--- 68,73 ----
Index: gzz/gfx/jni/Makefile
diff -c gzz/gfx/jni/Makefile:1.3 gzz/gfx/jni/Makefile:1.4
*** gzz/gfx/jni/Makefile:1.3 Tue Aug 20 12:33:21 2002
--- gzz/gfx/jni/Makefile Mon Sep 23 04:24:25 2002
***************
*** 6,13 ****
include $(sources:.cxx=.dep)
! gzz_gfx_gl_GZZGL.h: ../../CLASSES/gzz/gfx/gl/GZZGL.class
! javah -classpath $(CLASSPATH):../../CLASSES gzz.gfx.gl.GZZGL
gzz_gfx_gl_Paper.h: ../../CLASSES/gzz/gfx/gl/Paper.class
javah -classpath $(CLASSPATH):../../CLASSES gzz.gfx.gl.Paper
--- 6,13 ----
include $(sources:.cxx=.dep)
! gzz_gfx_gl_GZZGL.h: ../../CLASSES/gzz/gfx/gl/GL.class
! javah -classpath $(CLASSPATH):../../CLASSES gzz.gfx.gl.GL
gzz_gfx_gl_Paper.h: ../../CLASSES/gzz/gfx/gl/Paper.class
javah -classpath $(CLASSPATH):../../CLASSES gzz.gfx.gl.Paper
Index: gzz/gfx/librenderables/Makefile-javaonly
diff -c gzz/gfx/librenderables/Makefile-javaonly:1.1
gzz/gfx/librenderables/Makefile-javaonly:1.2
*** gzz/gfx/librenderables/Makefile-javaonly:1.1 Wed Aug 28 10:22:38 2002
--- gzz/gfx/librenderables/Makefile-javaonly Mon Sep 23 04:24:25 2002
***************
*** 1,4 ****
! ../../gzz/gfx/gl/GZZGL.java RealRenderables.hxx RealRenderables-jni.hxx:
renderables.py
python2.2 renderables.py
--- 1,4 ----
! ../../gzz/gfx/gl/GLRen.java RealRenderables.hxx RealRenderables-jni.hxx:
renderables.py
python2.2 renderables.py
Index: gzz/gfx/librenderables/renderables.py
diff -c gzz/gfx/librenderables/renderables.py:1.58
gzz/gfx/librenderables/renderables.py:1.59
*** gzz/gfx/librenderables/renderables.py:1.58 Sat Sep 21 03:35:17 2002
--- gzz/gfx/librenderables/renderables.py Mon Sep 23 04:24:25 2002
***************
*** 1,6 ****
import string
! javafile = "../../gzz/gfx/gl/GZZGL.java"
headerfile = "RealRenderables.hxx"
jnifile = "RealRenderables-jni.hxx"
--- 1,6 ----
import string
! javafile = "../../gzz/gfx/gl/GLRen.java"
headerfile = "RealRenderables.hxx"
jnifile = "RealRenderables-jni.hxx"
***************
*** 1050,1056 ****
params = [param.strip().split(" ") for param in Params.split(",") if
param != ""]
idparams = [param for param in params if param[0] in idded]
! cls += (" static public class " + Name + " extends Renderable"
+ Type + "JavaObject { \n"
+ string.join([p[0]+" "+p[1]+";\n" for p in idparams], "")
+ "private "+Name+"(int id "
--- 1050,1056 ----
params = [param.strip().split(" ") for param in Params.split(",") if
param != ""]
idparams = [param for param in params if param[0] in idded]
! cls += (" static public class " + Name + " extends GL.Renderable"
+ Type + "JavaObject { \n"
+ string.join([p[0]+" "+p[1]+";\n" for p in idparams], "")
+ "private "+Name+"(int id "
***************
*** 1127,1672 ****
gzzgljava = """
// DO NOT EDIT -- Generated from renderables.py
- /*
- GZZGL.java
- *
- * Copyright (c) 2001, Tuomas Lukka
- *
- * You may use and distribute under the terms of either the GNU Lesser
- * General Public License, either version 2 of the license or,
- * at your choice, any later version. Alternatively, you may use and
- * distribute under the terms of the XPL.
- *
- * See the LICENSE.lgpl and LICENSE.xpl files for the specific terms
of
- * the licenses.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the README
- * file for more details.
- *
- */
- /*
- * Written by Tuomas Lukka
- */
- package gzz.gfx.gl;
- import java.awt.Rectangle;
- import gzz.client.GraphicsAPI;
-
- /** The interface to the native OpenGL library.
- * Note: here we must be VERY careful, as this is one of the places
- * where foreign code is not sandboxed automatically for us.
- *
- * All parameters that go to C level must be checked either here
- * or at the C level, otherwise -- BOOM.
- *
- */
- public class GZZGL {
- public static boolean dbg = false;
- private static void p(String s) { if(dbg) System.out.println(s); }
- private static void pa(String s) { System.err.println(s); }
-
- private static native int init(int debug);
-
- // Necessary to allow debug to be set before
- // init.
-
- private static boolean libLoaded = false;
- public static void loadLib() {
- if(!libLoaded) {
- System.loadLibrary("GZZGL");
- libLoaded = true;
- }
- }
- public static void init() {
- loadLib();
- init(1);
- }
-
- public interface EventHandler {
- int PRESS = 1;
- int MOTION = 2;
- int RELEASE = 3;
- void repaint();
- /** Receive a keystroke event.
- */
- void keystroke(String s);
- void mouse(int x, int y, int button, int type);
- void timeout(int id);
- }
-
- public interface Ticker {
- boolean tick();
- }
-
- public static final int RENDERABLE0 = 0x0800000;
- public static final int RENDERABLE1 = 0x1000000;
- public static final int RENDERABLE2 = 0x2000000;
-
- /** The Java proxy for a C++ object.
- */
- static public abstract class JavaObject extends gzz.vob.Vob {
- private int id = 0;
- JavaObject(int id) { super(); this.id = id; }
- public void finalize() {
- if(this.dbg) pa("Finalizing "+this+" "+id);
- if(id != 0) throw new Error("Zero id object!");
- deleteObj();
- id = 0;
- }
- public void render(java.awt.Graphics g,
- boolean fast,
- RenderInfo info1,
- RenderInfo info2
- ) { }
- protected abstract void deleteObj();
- protected int getId() { return id; }
- }
-
- 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) {
- throw new Error("Not right to try to add me to a display list");
- }
- }
-
- /** The Java proxy representing a Renderable object.
- */
- static public abstract class Renderable0JavaObject extends JavaObject {
- public Renderable0JavaObject(int id) { super(id); }
- /** Add this object to the given list with the given coordinate
system.
- * Usage:
- * <pre>
- * int[] list;
- * int curs;
- * curs = obj.addToListGL(list, curs, coordsys);
- * </pre>
- * @param list The display list to add this to.
- * @param cur The current index, to which the first int goes
- * @param coordsys The number of the coordinate system.
- * @return The new current index after adding these.
- */
- public int addToList(int[] list, int cur) {
- list[cur++] = (RENDERABLE0 | getId());
- return cur;
- }
- public int addToListGL(GraphicsAPI.Window win, int[] list, int cur,
int cs1, int cs2) {
- return addToList(list, cur);
- }
- protected void deleteObj() {
- deleteRenderable1(getId());
- }
- }
- static private native void deleteRenderable0(int id);
-
-
- /** The Java proxy representing a Renderable object.
- */
- static public abstract class Renderable1JavaObject extends JavaObject {
- public Renderable1JavaObject(int id) { super(id); }
- /** Add this object to the given list with the given coordinate
system.
- * Usage:
- * <pre>
- * int[] list;
- * int curs;
- * curs = obj.addToList(list, curs, coordsys);
- * </pre>
- * @param list The display list to add this to.
- * @param cur The current index, to which the first int goes
- * @param coordsys The number of the coordinate system.
- * @return The new current index after adding these.
- */
- public int addToList(int[] list, int cur, int coordsys) {
- list[cur++] = (RENDERABLE1 | getId());
- list[cur++] = coordsys;
- return cur;
- }
- public int addToListGL(GraphicsAPI.Window win, int[] list, int cur,
int cs1, int cs2) {
- return addToList(list, cur, cs1);
- }
- protected void deleteObj() {
- deleteRenderable1(getId());
- }
- }
- static private native void deleteRenderable1(int id);
-
- /** The Java proxy representing a Renderable2 object.
- */
- static public abstract class Renderable2JavaObject extends JavaObject {
- public Renderable2JavaObject(int id) { super(id); }
- /** Add this object to the given list with the given coordinate
- * systems.
- * Usage:
- * <pre>
- * int[] list;
- * int curs;
- * curs = obj.addToList(list, curs, coordsys1, coordsys2);
- * </pre>
- * @param list The display list to add this to.
- * @param cur The current index, to which the first int goes
- * @param coordsys1 The number of the first system.
- * @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,
- int coordsys1, int coordsys2) {
- list[cur++] = (RENDERABLE2 | getId());
- list[cur++] = coordsys1;
- list[cur++] = coordsys2;
- return cur;
- }
- protected void deleteObj() {
- deleteRenderable2(getId());
- }
- }
- static private native void deleteRenderable2(int id);
-
- //--------- Window
- final static public class Window extends NonRenderableJavaObject {
-
- private Window(int id) { super(id); }
-
- protected void deleteObj() { deleteWindow(getId()); }
-
- public void repaint() { GZZGL.repaintWindow(getId()); }
-
- public void addTimeout(int ms, int id) {
- addTimeoutWindow(getId(), ms, id);
- }
-
- public Rectangle getBounds() {
- Rectangle rect = new Rectangle();
- getWindowSize(getId(), rect);
- return rect;
- }
-
- public void setCurrent() { impl_Window_setCurrent(getId()); }
- public void release() { impl_Window_release(getId()); }
-
- public void move(int x, int y) { impl_Window_move(getId(), x, y); }
- public void resize(int w, int h) { impl_Window_resize(getId(), w,
h); }
- }
- final private static Window defaultWindow = new Window(-1);
-
- static public Window createWindow(int x, int y, int w, int h,
EventHandler eh) {
- return new Window(createWindowImpl(x, y, w, h, eh));
- }
- static private native int createWindowImpl(int x, int y, int w, int h,
EventHandler eh);
- static private native void deleteWindow(int i);
-
- static private native void repaintWindow(int id);
-
- static private native void getWindowSize(int id, Rectangle into);
-
- static private native void addTimeoutWindow(int id, int ms, int tid);
-
- static private native void impl_Window_setCurrent(int id);
- static private native void impl_Window_release(int id);
- static private native void impl_Window_move(int id, int x, int y);
- static private native void impl_Window_resize(int id, int w, int h);
-
- //--------- Image
- static public class Image extends NonRenderableJavaObject {
- private Image(int id) { super(id); }
- protected void deleteObj() { deleteImage(getId()); }
- int getSize(int dimNo) { return getImageSize(getId(), dimNo); }
- }
-
- /** THIS METHOD IS A SEVERE SECURITY HOLE AND WILL BE REMOVED.
- * Exploit: load something that the image loader library doesn't like...
- * Need to work out how this should properly interact with mediaserver.
- */
- static public Image createImage(String filename) {
- return new Image(createImageImpl(filename));
- }
- static private native int createImageImpl(String filename);
- static private native void deleteImage(int i);
- static private native int getImageSize(int id, int dimNo);
-
- //--------- ImageCache
- static public class ImageCache {
- public static void get(String uri, int lod) {
- getFromImageCache(uri, lod);
- }
-
- public static void write(String uri, char buf[], int len) {
- writeToImageCache(uri, buf, len);
- }
- }
-
- static private native void getFromImageCache(String uri, int lod);
- static private native void writeToImageCache(String uri, char buf[],
int len);
-
- static public void startBackgroundImageLoader(String uri) {
- gzz.gfx.gl.GLBackgroundImageLoader.startLoading(uri);
- }
-
- //--------- TexRect
- /** A rectangular region of an image, loaded into a texture.
- */
- static public class TexRect extends NonRenderableJavaObject {
- private TexRect(int id) { super(id); }
- protected void deleteObj() { deleteImage(getId()); }
- public int getTexId() {
- return getTexRectTexID(getId());
- }
- public double getTexCoord(int coordInd, double c) {
- return getTexRectTexCoord(getId(), coordInd, c);
- }
-
- }
-
- static public TexRect createTexRect(Image img) {
- return new TexRect(createTexRectImpl(img.getId()));
- }
- static private native int createTexRectImpl(int img);
- static private native void deleteTexRect(int i);
- static private native int getTexRectTexID(int i);
- static private native double getTexRectTexCoord(int i,
- int coordInd, double c);
-
- //--------- Texture
- /** A texture object.
- * Here, id == directly the texture id.
- */
- static public class Texture extends NonRenderableJavaObject {
- private Texture(int id) { super(id); }
- protected void deleteObj() { impl_deleteTexture(getId()); }
- public int getTexId() { return getId(); }
- public int shade(int w, int h, int d, int comps,
- String internalFormat, String format,
- String shaderName, String[] params) {
- return impl_Texture_shade(getId(), w, h, d, comps,
internalFormat, format,
- shaderName, params);
- }
- public void loadNull2D(int level,
- String internalFormat, int w, int h,
- int border, String format, String type) {
- impl_Texture_loadNull2D(getId(),
- level, internalFormat, w, h, border, format, type);
- }
- public void loadSubImage(int level, Image img, int xoffs, int
yoffs) {
- impl_Texture_loadSubImage(getId(), level, img.getId(), xoffs,
yoffs);
- }
- public void downsampleInto(Texture into, String target, int level,
String internalFormat, String transferformat) {
- impl_Texture_downsampleInto(getId(), into.getId(), target,
level,
- internalFormat, transferformat);
- }
- }
- static public Texture createTexture() {
- return new Texture(impl_createTexture());
- }
- static private native int impl_createTexture();
- static private native void impl_deleteTexture(int id);
- static private native int impl_Texture_shade(int id, int w, int h, int
d, int comps,
- String internalFormat, String format,
- String shaderName, String[] params);
-
- static private native void impl_Texture_loadNull2D(int id, int level,
- String internalFormat, int w, int h,
- int border, String format, String type) ;
- static private native void impl_Texture_loadSubImage(int id,
- int level, int imgid, int xoffs, int yoffs) ;
- static private native void impl_Texture_downsampleInto(int id, int
intoid, String target,
- int level, String internalFormat, String transferformat);
-
- //--------- VertexProgramNV
- /** A vertex program object.
- * Like Texture, id = directly VP id
- */
- static public class VertexProgramNV extends NonRenderableJavaObject {
- private VertexProgramNV(int id) { super(id); }
- protected void deleteObj() { impl_deleteVertexProgramNV(getId()); }
- public int getVPId() { return getId(); }
- public int load(String program) {
- return impl_VertexProgramNV_load(getId(), program);
- }
- }
- static public VertexProgramNV createVertexProgramNV() {
- return new VertexProgramNV(impl_createVertexProgramNV());
- }
- static public VertexProgramNV createVertexProgramNV(String program) {
- VertexProgramNV vp = new
VertexProgramNV(impl_createVertexProgramNV());
- vp.load(program);
- return vp;
- }
- static private native int impl_createVertexProgramNV();
- static private native void impl_deleteVertexProgramNV(int id);
- static private native int impl_VertexProgramNV_load(int id, String
program);
-
-
- //--------- ShaderRect
- /** 3D/2D shader image data, loaded into textures.
- */
- static public class ShaderRect extends NonRenderableJavaObject {
- private ShaderRect(int id) { super(id); }
- protected void deleteObj() { deleteImage(getId()); }
- }
-
- static public ShaderRect createShaderRect(String turb, String col,
String spots, String cell) {
- return new ShaderRect(createShaderRectImpl(turb, col, spots, cell));
- }
- static private native int createShaderRectImpl(String turb, String col,
String spots, String cell);
- static private native void deleteShaderRect(int i);
-
- //--------- Font
- static public class Font extends NonRenderableJavaObject{
- float height; float yoffs;
- private Font(int id) {
- super(id);
- height = getFontHeight(getId());
- yoffs = getFontYOffs(getId());
- }
- protected void deleteObj() { deleteFont(getId()); }
- public float getHeight() { return height; }
- public float getYOffs() { return yoffs; }
- public void getWidths(short[] w) { putFontWidths(getId(), w); }
- }
- static public Font createFont(String name, int loadPt) {
- return new Font(createFontImpl(name, loadPt));
- }
- static private native float getFontHeight(int id);
- static private native float getFontYOffs(int id);
- static private native int createFontImpl(String name, int loadPt);
- static private native void deleteFont(int id);
- static private native void putFontWidths(int id, short[] w);
-
- //--------- DisplayList
- static public class DisplayList extends NonRenderableJavaObject{
- private DisplayList(int id) {
- super(id);
- }
- protected void deleteObj() { deleteDisplayList(getId()); }
- public void startCompile(Window w) { GZZGL.startCompile(getId(),
- w.getId()); }
- public void endCompile(Window w) { GZZGL.endCompile(getId(),
- w.getId()); }
- public void compileCallGL(String s)
- { GZZGL.compileCallGL(getId(), s); }
- }
- static public DisplayList createDisplayList() {
- return new DisplayList(createDisplayListImpl());
- }
- static public DisplayList createDisplayList(String s) {
- DisplayList d = new DisplayList(createDisplayListImpl());
- d.compileCallGL(s);
- return d;
- }
- static private native int createDisplayListImpl();
- static private native void startCompile(int id, int wid);
- static private native void endCompile(int id, int wid);
- static private native void compileCallGL(int id, String s);
- static private native void deleteDisplayList(int id);
-
- //---------- ByteVector
- static public class ByteVector extends NonRenderableJavaObject {
- private ByteVector(int id) {
- super(id);
- }
- protected void deleteObj() { deleteByteVector(getId()); }
-
- public int get(int ind) { return impl_ByteVector_get(getId(), ind);
}
- public void readFromBuffer_ubytes(Window win,
- String buffer,
- int x, int y, int width, int height,
- String format) {
- impl_ByteVector_readFromBuffer_ubytes(getId(), win.getId(),
- buffer, x, y, width, height, format);
- }
-
- }
- static public ByteVector createByteVector() {
- return createByteVector(0);
- }
- static public ByteVector createByteVector(int size) {
- return new ByteVector(createByteVectorImpl(size));
- }
- static private native int createByteVectorImpl(int size);
- static private native void deleteByteVector(int id);
-
- static private native void impl_ByteVector_readFromBuffer_ubytes(
- int id, int winid, String buffer,
- int x, int y, int width, int height,
- String format) ;
- static private native int impl_ByteVector_get(int id, int ind);
-
- //----------Misc
-
- public static void render(
- Window win, int[] codes, float[] pts1, float[] pts2,
- int numpts, float fract, boolean standardcoords,
- boolean showFinal) {
- renderImpl(win.getId(), codes, pts1, null, pts2, numpts, fract,
- standardcoords, showFinal);
- }
- public static void render(
- Window win, int[] codes, float[] pts1, int[] indices2,
- float[] pts2,
- int numpts, float fract, boolean standardcoords,
- boolean showFinal) {
- renderImpl(win.getId(), codes, pts1, indices2, pts2, numpts, fract,
- standardcoords, showFinal);
- }
- private static native void renderImpl(
- int window, int[] codes, float[] pts1, int[] indices2,
- float[] pts2,
- int numpts, float fract, boolean standardcoords,
- boolean showFinal);
-
- public static float timeRender(
- Window win, int[] codes, float[] pts1,
- int numpts, boolean standardcoords, int iters) {
- return timeRenderImpl(win.getId(), codes, pts1, numpts,
- standardcoords, iters);
- }
- private static native float timeRenderImpl(
- int window, int[] codes, float[] pts1,
- int numpts, boolean standardcoords, int iters);
-
- public static void eventLoop(Ticker t) {
- while(true) {
- p("TICK");
- boolean ret = t.tick();
- p("GOING TO EVENTLOOP");
- eventLoop(!ret);
- }
- }
! /** Shorthands.
! */
! public static PaperQuad createPaperQuad(Paper paper,
! float x0, float y0, float x1, float y1) {
! return createPaperQuad(paper, x0, y0, x1, y1, 1);
! }
!
! /** Process native events.
! * @param wait If false, this function will return once there are no
more
! * native events to process. If true, this function will
wait
! * for the next native event.
! */
! public static native void eventLoop(boolean wait);
!
! public static gzz.vob.Vob createCallList(String s) {
! return createCallList(createDisplayList(s));
! }
! public static gzz.vob.Vob createCallListCoorded(String s) {
! return createCallListCoorded(createDisplayList(s));
! }
!
! public static native void setDebugVar(String name, int value);
! public static native int getDebugVar(String name);
! public static native String[] getDebugVarNames();
!
! public static native String getGLString(String name);
! public static native float[] getGLFloat(String name);
! public static native float[] getGLTexParameterFloat(String target, int
tex, String name);
! public static native float[] getGLTexLevelParameterFloat(String target,
int tex, int level, String name);
! public static native String getGLTokenString(int value);
!
! // Clear stencil buffer: on some NVIDIA drivers, there
! // seems to be a bug.
! public static native void reallyClearStencilBuffer(int w, int h);
""" + cls + " } \n"
--- 1127,1153 ----
gzzgljava = """
// DO NOT EDIT -- Generated from renderables.py
+ package gzz.gfx.gl;
+ import java.awt.Rectangle;
+ import gzz.client.GraphicsAPI;
+
+ public class GLRen extends GL {
+
+ // ---- Shorthands.
+ public static PaperQuad createPaperQuad(Paper paper,
+ float x0, float y0, float x1, float y1) {
+ return createPaperQuad(paper, x0, y0, x1, y1, 1);
+ }
+
+ public static gzz.vob.Vob createCallList(String s) {
+ return createCallList(createDisplayList(s));
+ }
+ public static gzz.vob.Vob createCallListCoorded(String s) {
+ return createCallListCoorded(createDisplayList(s));
+ }
! // ---- classes
""" + cls + " } \n"
Index: gzz/gzz/client/gl/GLAPI.java
diff -c gzz/gzz/client/gl/GLAPI.java:1.17 gzz/gzz/client/gl/GLAPI.java:1.18
*** gzz/gzz/client/gl/GLAPI.java:1.17 Thu Aug 29 05:41:16 2002
--- gzz/gzz/client/gl/GLAPI.java Mon Sep 23 04:24:25 2002
***************
*** 37,43 ****
GLUpdateManager.startGLUpdateManager(
new Runnable() {
public void run() {
! GZZGL.init();
r.run();
}
});
--- 37,43 ----
GLUpdateManager.startGLUpdateManager(
new Runnable() {
public void run() {
! GL.init();
r.run();
}
});
Index: gzz/gzz/client/gl/GLScreen.java
diff -c gzz/gzz/client/gl/GLScreen.java:1.27
gzz/gzz/client/gl/GLScreen.java:1.28
*** gzz/gzz/client/gl/GLScreen.java:1.27 Thu Sep 5 14:16:01 2002
--- gzz/gzz/client/gl/GLScreen.java Mon Sep 23 04:24:25 2002
***************
*** 33,39 ****
import java.util.HashMap;
public class GLScreen extends GraphicsAPI.Window {
! public static final String rcsid = "$Id: GLScreen.java,v 1.27 2002/09/05
18:16:01 benja 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.28 2002/09/23
08:24:25 tjl Exp $";
public static boolean dbg = false;
private static void pa(String s) { System.err.println(s); }
***************
*** 50,56 ****
return 0;
}
! class GLEventHandler implements GZZGL.EventHandler {
public void repaint() {
if(dbg) pa("GLScreen repaint ");
}
--- 50,56 ----
return 0;
}
! class GLEventHandler implements GL.EventHandler {
public void repaint() {
if(dbg) pa("GLScreen repaint ");
}
***************
*** 155,161 ****
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"+
--- 155,161 ----
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"+
***************
*** 189,205 ****
binder = s;
}
! GZZGL.Window window;
! public GZZGL.Window getWindow() { return window; }
GLEventHandler h = new GLEventHandler();
public GLScreen(GraphicsAPI api) {
super(api);
if(dbg) pa("Create glscreen");
! window = GZZGL.createWindow(0, 0, 1200, 900, h);
! // window = GZZGL.createWindow(0, 0, 200, 200, h);
if(dbg) pa("Created window");
}
--- 189,205 ----
binder = s;
}
! GL.Window window;
! public GL.Window getWindow() { return window; }
GLEventHandler h = new GLEventHandler();
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");
}
Index: gzz/gzz/client/gl/GLUpdateManager.java
diff -c gzz/gzz/client/gl/GLUpdateManager.java:1.6
gzz/gzz/client/gl/GLUpdateManager.java:1.7
*** gzz/gzz/client/gl/GLUpdateManager.java:1.6 Sat Sep 21 03:35:17 2002
--- gzz/gzz/client/gl/GLUpdateManager.java Mon Sep 23 04:24:25 2002
***************
*** 30,36 ****
import java.util.*;
public class GLUpdateManager extends AbstractUpdateManager {
! public static final String rcsid = "$Id: GLUpdateManager.java,v 1.6
2002/09/21 07:35:17 tjl Exp $";
private static boolean dbg = false;
private static void p(String s) { if(dbg) pa(s); }
private static void pa(String s) { System.err.println(s); }
--- 30,36 ----
import java.util.*;
public class GLUpdateManager extends AbstractUpdateManager {
! public static final String rcsid = "$Id: GLUpdateManager.java,v 1.7
2002/09/23 08:24:25 tjl Exp $";
private static boolean dbg = false;
private static void p(String s) { if(dbg) pa(s); }
private static void pa(String s) { System.err.println(s); }
***************
*** 49,55 ****
protected boolean handleEvents(boolean waitForEvent) {
p("HandleEvents "+waitForEvent);
! GZZGL.eventLoop(waitForEvent);
return true;
}
--- 49,55 ----
protected boolean handleEvents(boolean waitForEvent) {
p("HandleEvents "+waitForEvent);
! GL.eventLoop(waitForEvent);
return true;
}
Index: gzz/gzz/gfx/gl/GLBackgroundImageLoader.java
diff -c gzz/gzz/gfx/gl/GLBackgroundImageLoader.java:1.1
gzz/gzz/gfx/gl/GLBackgroundImageLoader.java:1.2
*** gzz/gzz/gfx/gl/GLBackgroundImageLoader.java:1.1 Wed Sep 18 04:04:05 2002
--- gzz/gzz/gfx/gl/GLBackgroundImageLoader.java Mon Sep 23 04:24:25 2002
***************
*** 24,30 ****
import java.io.*;
public class GLBackgroundImageLoader implements Runnable {
! public static final String rcsid = "$Id: GLBackgroundImageLoader.java,v 1.1
2002/09/18 08:04:05 deetsay Exp $";
private String uri;
private Thread loaderThread = null;
--- 24,30 ----
import java.io.*;
public class GLBackgroundImageLoader implements Runnable {
! public static final String rcsid = "$Id: GLBackgroundImageLoader.java,v 1.2
2002/09/23 08:24:25 tjl Exp $";
private String uri;
private Thread loaderThread = null;
***************
*** 53,59 ****
char buf[] = new char[4096];
int amount = in.read(buf, 0, 4096);
while (amount > 0) {
! GZZGL.ImageCache.write(uri, buf, amount);
amount = in.read(buf, 0, 4096);
}
in.close();
--- 53,59 ----
char buf[] = new char[4096];
int amount = in.read(buf, 0, 4096);
while (amount > 0) {
! GL.ImageCache.write(uri, buf, amount);
amount = in.read(buf, 0, 4096);
}
in.close();
Index: gzz/gzz/gfx/gl/GLCellConnector.java
diff -c gzz/gzz/gfx/gl/GLCellConnector.java:1.7
gzz/gzz/gfx/gl/GLCellConnector.java:1.8
*** gzz/gzz/gfx/gl/GLCellConnector.java:1.7 Tue Jul 16 10:57:50 2002
--- gzz/gzz/gfx/gl/GLCellConnector.java Mon Sep 23 04:24:25 2002
***************
*** 28,37 ****
import gzz.client.GraphicsAPI;
public class GLCellConnector extends Vob {
! public static final String rcsid = "$Id: GLCellConnector.java,v 1.7
2002/07/16 14:57:50 tjl Exp $";
public static void p(String s) { System.out.println(s); }
! GZZGL.SmoothConnector nur;
int w;
int h;
--- 28,37 ----
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 void p(String s) { System.out.println(s); }
! GLRen.SmoothConnector nur;
int w;
int h;
***************
*** 42,49 ****
RenderInfo info2
) { }
! public GLCellConnector( GZZGL.TexRect start, float startb,
! GZZGL.TexRect end, float endb,
int x1l, int y1l, int x1r, int y1r,
int x1li, int y1li, int x1ri, int y1ri,
int x2l, int y2l, int x2r, int y2r,
--- 42,49 ----
RenderInfo info2
) { }
! public GLCellConnector( GL.TexRect start, float startb,
! GL.TexRect end, float endb,
int x1l, int y1l, int x1r, int y1r,
int x1li, int y1li, int x1ri, int y1ri,
int x2l, int y2l, int x2r, int y2r,
***************
*** 51,57 ****
) {
super();
! nur = GZZGL.createSmoothConnector(start, startb, end, endb,
x1l, y1l, x1r, y1r, x1li, y1li, x1ri, y1ri,
x2l, y2l, x2r, y2r, x2li, y2li, x2ri, y2ri,
0.02f);
--- 51,57 ----
) {
super();
! nur = GLRen.createSmoothConnector(start, startb, end, endb,
x1l, y1l, x1r, y1r, x1li, y1li, x1ri, y1ri,
x2l, y2l, x2r, y2r, x2li, y2li, x2ri, y2ri,
0.02f);
Index: gzz/gzz/gfx/gl/GLCellVob.java
diff -c gzz/gzz/gfx/gl/GLCellVob.java:1.8 gzz/gzz/gfx/gl/GLCellVob.java:1.9
*** gzz/gzz/gfx/gl/GLCellVob.java:1.8 Sun Jul 28 09:23:13 2002
--- gzz/gzz/gfx/gl/GLCellVob.java Mon Sep 23 04:24:25 2002
***************
*** 28,51 ****
import gzz.client.GraphicsAPI;
public class GLCellVob extends Vob {
! public static final String rcsid = "$Id: GLCellVob.java,v 1.8 2002/07/28
13:23:13 tjl Exp $";
public static void p(String s) { System.out.println(s); }
! GZZGL.HorizText text;
public void render(Graphics g,
boolean fast,
RenderInfo info1,
RenderInfo info2
) { }
! static Vob black = GZZGL.createCallList("Color 0 0 0 1");
! static Vob white = GZZGL.createCallList("Color 1 1 1 1");
int w = 100;
int h = 100;
! public GLCellVob(String str, GZZGL.TexRect bg,
! GZZGL.Font font, int w0, int h0) {
super();
w = w0;
h = h0;
--- 28,51 ----
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 void p(String s) { System.out.println(s); }
! GLRen.HorizText text;
public void render(Graphics g,
boolean fast,
RenderInfo info1,
RenderInfo info2
) { }
! static Vob black = GLRen.createCallList("Color 0 0 0 1");
! static Vob white = GLRen.createCallList("Color 1 1 1 1");
int w = 100;
int h = 100;
! public GLCellVob(String str, GL.TexRect bg,
! GL.Font font, int w0, int h0) {
super();
w = w0;
h = h0;
Index: gzz/gzz/gfx/gl/GLSpans.java
diff -c gzz/gzz/gfx/gl/GLSpans.java:1.4 gzz/gzz/gfx/gl/GLSpans.java:1.5
*** gzz/gzz/gfx/gl/GLSpans.java:1.4 Tue Sep 17 05:23:23 2002
--- gzz/gzz/gfx/gl/GLSpans.java Mon Sep 23 04:24:25 2002
***************
*** 31,42 ****
static class LoadedTexRect {
LoadedTexRect(String file) {
! GZZGL.Image img = GZZGL.createImage(file);
this.w = img.getSize(0);
this.h = img.getSize(1);
int overw = 1; while(overw < w) overw *= 2;
int overh = 1; while(overh < h) overh *= 2;
! tex = GZZGL.createTexture();
tex.loadNull2D(0, "R3_G3_B2", overw, overh, 0, "RGB", "FLOAT");
tex.loadSubImage(0, img, 0, 0);
// tex.shade(overw, overh, 0, 1, "LUMINANCE4", "LUMINANCE",
"noise", new String[] {});
--- 31,42 ----
static class LoadedTexRect {
LoadedTexRect(String file) {
! GL.Image img = GL.createImage(file);
this.w = img.getSize(0);
this.h = img.getSize(1);
int overw = 1; while(overw < w) overw *= 2;
int overh = 1; while(overh < h) overh *= 2;
! tex = GL.createTexture();
tex.loadNull2D(0, "R3_G3_B2", overw, overh, 0, "RGB", "FLOAT");
tex.loadSubImage(0, img, 0, 0);
// tex.shade(overw, overh, 0, 1, "LUMINANCE4", "LUMINANCE",
"noise", new String[] {});
***************
*** 49,55 ****
img = null;
System.gc(); // GC the image, it's big.
}
! GZZGL.Texture tex; // Need to save this so it won't get GC'ed.
Rect rect;
/** Width and height in pixels of the loaded image.
*/
--- 49,55 ----
img = null;
System.gc(); // GC the image, it's big.
}
! GL.Texture tex; // Need to save this so it won't get GC'ed.
Rect rect;
/** Width and height in pixels of the loaded image.
*/
Index: gzz/gzz/gfx/gl/GLVanishingClient.java
diff -c gzz/gzz/gfx/gl/GLVanishingClient.java:1.9
gzz/gzz/gfx/gl/GLVanishingClient.java:1.10
*** gzz/gzz/gfx/gl/GLVanishingClient.java:1.9 Mon Aug 19 10:45:48 2002
--- gzz/gzz/gfx/gl/GLVanishingClient.java Mon Sep 23 04:24:25 2002
***************
*** 35,41 ****
public static void p(String s) { System.out.println(s); }
Vob cellImage;
! GZZGL.SmoothConnector connVert, connHoriz;
int w = 100, h = 100;
--- 35,41 ----
public static void p(String s) { System.out.println(s); }
Vob cellImage;
! GLRen.SmoothConnector connVert, connHoriz;
int w = 100, h = 100;
***************
*** 46,53 ****
public GLVanishingClient(VobScene vs, int into,
Vob cellImage,
! GZZGL.SmoothConnector connVert,
! GZZGL.SmoothConnector connHoriz,
int w, int h) {
this.vs = vs;
this.into = into;
--- 46,53 ----
public GLVanishingClient(VobScene vs, int into,
Vob cellImage,
! GLRen.SmoothConnector connVert,
! GLRen.SmoothConnector connHoriz,
int w, int h) {
this.vs = vs;
this.into = into;
Index: gzz/gzz/gfx/gl/GLVobCoorder.java
diff -c gzz/gzz/gfx/gl/GLVobCoorder.java:1.26
gzz/gzz/gfx/gl/GLVobCoorder.java:1.27
*** gzz/gzz/gfx/gl/GLVobCoorder.java:1.26 Sun Sep 15 06:11:14 2002
--- gzz/gzz/gfx/gl/GLVobCoorder.java Mon Sep 23 04:24:25 2002
***************
*** 29,35 ****
import gzz.client.gl.*;
public class GLVobCoorder extends AffineVobCoorder {
! public static final String rcsid = "$Id: GLVobCoorder.java,v 1.26 2002/09/15
10:11:14 tjl Exp $";
public static boolean dbg = false;
private static void pa(String s) { System.err.println(s); }
--- 29,35 ----
import gzz.client.gl.*;
public class GLVobCoorder extends AffineVobCoorder {
! public static final String rcsid = "$Id: GLVobCoorder.java,v 1.27 2002/09/23
08:24:25 tjl Exp $";
public static boolean dbg = false;
private static void pa(String s) { System.err.println(s); }
***************
*** 185,207 ****
renderInterp(((GLScreen)into).getWindow(), theVobs, other, fract,
standardcoords, showFinal);
}
! public void renderInterp(GZZGL.Window into, GLVobMap theVobs,
GLVobCoorder other, float fract,
boolean standardcoords, boolean showFinal) {
if(other == this) {
! GZZGL.render(into, theVobs.list, coordsys, null,
coordsys, ncoordsys, fract, standardcoords,
showFinal);
} else {
makeindexlist(other);
! GZZGL.render(into, theVobs.list, coordsys, interpList,
other.coordsys, ncoordsys, fract,
standardcoords, showFinal);
}
}
! public float timeRender(GZZGL.Window into, GLVobMap theVobs,
boolean standardcoords, int iters) {
! return GZZGL.timeRender(into, theVobs.list,
coordsys, ncoordsys, standardcoords, iters);
}
--- 185,207 ----
renderInterp(((GLScreen)into).getWindow(), theVobs, other, fract,
standardcoords, showFinal);
}
! public void renderInterp(GL.Window into, GLVobMap theVobs,
GLVobCoorder other, float fract,
boolean standardcoords, boolean showFinal) {
if(other == this) {
! GL.render(into, theVobs.list, coordsys, null,
coordsys, ncoordsys, fract, standardcoords,
showFinal);
} else {
makeindexlist(other);
! GL.render(into, theVobs.list, coordsys, interpList,
other.coordsys, ncoordsys, fract,
standardcoords, showFinal);
}
}
! public float timeRender(GL.Window into, GLVobMap theVobs,
boolean standardcoords, int iters) {
! return GL.timeRender(into, theVobs.list,
coordsys, ncoordsys, standardcoords, iters);
}
Index: gzz/gzz/gfx/gl/Stencil.java
diff -c gzz/gzz/gfx/gl/Stencil.java:1.13 gzz/gzz/gfx/gl/Stencil.java:1.14
*** gzz/gzz/gfx/gl/Stencil.java:1.13 Sat Sep 21 03:35:17 2002
--- gzz/gzz/gfx/gl/Stencil.java Mon Sep 23 04:24:25 2002
***************
*** 47,53 ****
private static void init() {
if(initStencil != null) return;
! initStencil = GZZGL.createCallList(
" PushAttrib DEPTH_BUFFER_BIT ENABLE_BIT STENCIL_BUFFER_BIT
COLOR_BUFFER_BIT\n"+
" Enable STENCIL_TEST\n"+
" StencilFunc ALWAYS 1 255\n"+
--- 47,53 ----
private static void init() {
if(initStencil != null) return;
! initStencil = GLRen.createCallList(
" PushAttrib DEPTH_BUFFER_BIT ENABLE_BIT STENCIL_BUFFER_BIT
COLOR_BUFFER_BIT\n"+
" Enable STENCIL_TEST\n"+
" StencilFunc ALWAYS 1 255\n"+
***************
*** 57,70 ****
" DepthMask 0 \n"
);
! initOutside = GZZGL.createCallList(
" StencilFunc EQUAL 0 1\n"+
" ColorMask 1 1 1 1\n"+
" StencilMask 0\n"+
" DepthMask 1\n"
);
! initBackplane = GZZGL.createCallList(
" PushAttrib ENABLE_BIT STENCIL_BUFFER_BIT COLOR_BUFFER_BIT\n"+
" PushMatrix \n"+
" Translate 0 0 10000 \n"+
--- 57,70 ----
" DepthMask 0 \n"
);
! initOutside = GLRen.createCallList(
" StencilFunc EQUAL 0 1\n"+
" ColorMask 1 1 1 1\n"+
" StencilMask 0\n"+
" DepthMask 1\n"
);
! initBackplane = GLRen.createCallList(
" PushAttrib ENABLE_BIT STENCIL_BUFFER_BIT COLOR_BUFFER_BIT\n"+
" PushMatrix \n"+
" Translate 0 0 10000 \n"+
***************
*** 72,88 ****
" Disable DEPTH_TEST\n"
);
! exitBackplane = GZZGL.createCallList(
" PopMatrix\n" +
" PopAttrib\n"
);
! initContents_depth = GZZGL.createCallList(
" ColorMask 1 1 1 1\n"+
" StencilFunc EQUAL 1 1\n"+
" StencilMask 0\n"
);
! initContents_nodepth = GZZGL.createCallList(
" ColorMask 1 1 1 1\n"+
" StencilFunc EQUAL 1 1\n"+
" DepthMask 0\n"+
--- 72,88 ----
" Disable DEPTH_TEST\n"
);
! exitBackplane = GLRen.createCallList(
" PopMatrix\n" +
" PopAttrib\n"
);
! initContents_depth = GLRen.createCallList(
" ColorMask 1 1 1 1\n"+
" StencilFunc EQUAL 1 1\n"+
" StencilMask 0\n"
);
! initContents_nodepth = GLRen.createCallList(
" ColorMask 1 1 1 1\n"+
" StencilFunc EQUAL 1 1\n"+
" DepthMask 0\n"+
***************
*** 90,103 ****
" Disable DEPTH_TEST\n"
);
! initZero = GZZGL.createCallList(
" StencilFunc EQUAL 1 1\n"+
" StencilOp ZERO ZERO ZERO\n"+ // XXX
" StencilMask 255\n"+
" DepthMask 1\n"+ // Do write now.
" ColorMask 0 0 0 0\n"
);
! exit = GZZGL.createCallList(
" PopAttrib\n"
);
--- 90,103 ----
" Disable DEPTH_TEST\n"
);
! initZero = GLRen.createCallList(
" StencilFunc EQUAL 1 1\n"+
" StencilOp ZERO ZERO ZERO\n"+ // XXX
" StencilMask 255\n"+
" DepthMask 1\n"+ // Do write now.
" ColorMask 0 0 0 0\n"
);
! exit = GLRen.createCallList(
" PopAttrib\n"
);
Index: gzz/gzz/modules/pp/ViewportVob.java
diff -c gzz/gzz/modules/pp/ViewportVob.java:1.16
gzz/gzz/modules/pp/ViewportVob.java:1.17
*** gzz/gzz/modules/pp/ViewportVob.java:1.16 Wed Sep 4 18:15:39 2002
--- gzz/gzz/modules/pp/ViewportVob.java Mon Sep 23 04:24:25 2002
***************
*** 79,102 ****
(p11.y-porig.y)/1000.0f);
}
! GZZGL.DisplayList displayList;
! GZZGL.CallList callList;
! static GZZGL.Viewport vp;
! static GZZGL.CloseViewport cvp;
public int addToListGL(GraphicsAPI.Window win,
int[] list, int curs, int coordsys1,
int coordsys2) {
if(vp == null) {
! vp = GZZGL.createViewport();
! cvp = GZZGL.createCloseViewport();
}
if(displayList == null) {
! GZZGL.Window w = ((GLScreen)win).getWindow();
! displayList= GZZGL.createDisplayList();
displayList.startCompile(w);
--- 79,102 ----
(p11.y-porig.y)/1000.0f);
}
! GL.DisplayList displayList;
! GLRen.CallList callList;
! static GLRen.Viewport vp;
! static GLRen.CloseViewport cvp;
public int addToListGL(GraphicsAPI.Window win,
int[] list, int curs, int coordsys1,
int coordsys2) {
if(vp == null) {
! vp = GLRen.createViewport();
! cvp = GLRen.createCloseViewport();
}
if(displayList == null) {
! GL.Window w = ((GLScreen)win).getWindow();
! displayList= GL.createDisplayList();
displayList.startCompile(w);
***************
*** 109,115 ****
displayList.endCompile(w);
! callList = GZZGL.createCallList(displayList);
}
curs = vp.addToListGL(win, list, curs, coordsys1, coordsys2);
--- 109,115 ----
displayList.endCompile(w);
! callList = GLRen.createCallList(displayList);
}
curs = vp.addToListGL(win, list, curs, coordsys1, coordsys2);
Index: gzz/gzz/modules/pp/vob/BgVob.java
diff -c gzz/gzz/modules/pp/vob/BgVob.java:1.24
gzz/gzz/modules/pp/vob/BgVob.java:1.25
*** gzz/gzz/modules/pp/vob/BgVob.java:1.24 Wed Sep 4 09:07:52 2002
--- gzz/gzz/modules/pp/vob/BgVob.java Mon Sep 23 04:24:26 2002
***************
*** 36,42 ****
* used to pan pretty easily.
*/
public class BgVob extends gzz.vob.Vob {
! public static final String rcsid = "$Id: BgVob.java,v 1.24 2002/09/04
13:07:52 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); }
--- 36,42 ----
* used to pan pretty easily.
*/
public class BgVob extends gzz.vob.Vob {
! public static final String rcsid = "$Id: BgVob.java,v 1.25 2002/09/23
08:24:26 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); }
***************
*** 77,95 ****
}
static HashMap papers = new HashMap();
! static GZZGL.DisplayList list;
static Vob triangle;
! GZZGL.PaperQuad getPaperQuad(Cell c) {
! GZZGL.PaperQuad ret = (GZZGL.PaperQuad)papers.get(c);
if(ret == null) {
Paper pap;
! GZZGL.PaperQuad pq;
pap = PaperMill.getInstance().getPaper(c.hashCode());
! ret = GZZGL.createPaperQuad(pap, -1, -1, 1, 1, 100);
papers.put(c, ret);
! list = GZZGL.createDisplayList(
"Disable TEXTURE_2D\nColor 1 0 0 1\nBegin TRIANGLES\nVertex
-1 -1\n" +
"Vertex 1 -1\nVertex 1 1\nEnd\n"
);
--- 77,95 ----
}
static HashMap papers = new HashMap();
! static GL.DisplayList list;
static Vob triangle;
! GLRen.PaperQuad getPaperQuad(Cell c) {
! GLRen.PaperQuad ret = (GLRen.PaperQuad)papers.get(c);
if(ret == null) {
Paper pap;
! GLRen.PaperQuad pq;
pap = PaperMill.getInstance().getPaper(c.hashCode());
! ret = GLRen.createPaperQuad(pap, -1, -1, 1, 1, 100);
papers.put(c, ret);
! list = GL.createDisplayList(
"Disable TEXTURE_2D\nColor 1 0 0 1\nBegin TRIANGLES\nVertex
-1 -1\n" +
"Vertex 1 -1\nVertex 1 1\nEnd\n"
);
***************
*** 104,110 ****
int[] list, int curs, int coordsys1,
int coordsys2) {
! GZZGL.PaperQuad pq = getPaperQuad(papercode);
curs = pq.addToListGL(win, list, curs, coordsys1, coordsys2);
// curs = triangle.addToListGL(win, list, curs, coordsys1, -1);
return curs;
--- 104,110 ----
int[] list, int curs, int coordsys1,
int coordsys2) {
! GLRen.PaperQuad pq = getPaperQuad(papercode);
curs = pq.addToListGL(win, list, curs, coordsys1, coordsys2);
// curs = triangle.addToListGL(win, list, curs, coordsys1, -1);
return curs;
Index: gzz/gzz/modules/pp/vob/CursorVob.java
diff -c gzz/gzz/modules/pp/vob/CursorVob.java:1.6
gzz/gzz/modules/pp/vob/CursorVob.java:1.7
*** gzz/gzz/modules/pp/vob/CursorVob.java:1.6 Sun Jul 28 09:23:13 2002
--- gzz/gzz/modules/pp/vob/CursorVob.java Mon Sep 23 04:24:26 2002
***************
*** 29,35 ****
public class CursorVob extends gzz.vob.Vob {
! public static final String rcsid = "$Id: CursorVob.java,v 1.6 2002/07/28
13:23:13 tjl Exp $";
static Point p1 = new Point();
--- 29,35 ----
public class CursorVob extends gzz.vob.Vob {
! public static final String rcsid = "$Id: CursorVob.java,v 1.7 2002/09/23
08:24:26 tjl Exp $";
static Point p1 = new Point();
***************
*** 65,71 ****
int[] list, int curs, int coordsys1,
int coordsys2) {
if(crosshair == null)
! crosshair = GZZGL.createCallListCoorded(
"Begin LINES\nVertex -1 -1\nVertex 1 1\nVertex 1 -1\nVertex
-1 1\nEnd"
);
curs = crosshair.addToListGL(win, list, curs, coordsys1, coordsys2);
--- 65,71 ----
int[] list, int curs, int coordsys1,
int coordsys2) {
if(crosshair == null)
! crosshair = GLRen.createCallListCoorded(
"Begin LINES\nVertex -1 -1\nVertex 1 1\nVertex 1 -1\nVertex
-1 1\nEnd"
);
curs = crosshair.addToListGL(win, list, curs, coordsys1, coordsys2);
Index: gzz/gzz/modules/pp/vob/TextCursorVob.java
diff -c gzz/gzz/modules/pp/vob/TextCursorVob.java:1.4
gzz/gzz/modules/pp/vob/TextCursorVob.java:1.5
*** gzz/gzz/modules/pp/vob/TextCursorVob.java:1.4 Sun Jul 28 09:23:13 2002
--- gzz/gzz/modules/pp/vob/TextCursorVob.java Mon Sep 23 04:24:26 2002
***************
*** 29,35 ****
/** A vertical line for now */
public class TextCursorVob extends gzz.vob.Vob {
! public static final String rcsid = "$Id: TextCursorVob.java,v 1.4 2002/07/28
13:23:13 tjl Exp $";
static Point p1 = new Point();
static Point p2 = new Point();
--- 29,35 ----
/** A vertical line for now */
public class TextCursorVob extends gzz.vob.Vob {
! public static final String rcsid = "$Id: TextCursorVob.java,v 1.5 2002/09/23
08:24:26 tjl Exp $";
static Point p1 = new Point();
static Point p2 = new Point();
***************
*** 52,58 ****
int[] list, int curs, int coordsys1,
int coordsys2) {
if(crosshair == null)
! crosshair = GZZGL.createCallListCoorded(
"Begin LINE_STRIP\nVertex 0 1\nVertex 0 -1\nEnd\n");
curs = crosshair.addToListGL(win, list, curs, coordsys1, coordsys2);
return curs;
--- 52,58 ----
int[] list, int curs, int coordsys1,
int coordsys2) {
if(crosshair == null)
! crosshair = GLRen.createCallListCoorded(
"Begin LINE_STRIP\nVertex 0 1\nVertex 0 -1\nEnd\n");
curs = crosshair.addToListGL(win, list, curs, coordsys1, coordsys2);
return curs;
Index: gzz/gzz/vob/GLTextStyle.java
diff -c gzz/gzz/vob/GLTextStyle.java:1.11 gzz/gzz/vob/GLTextStyle.java:1.12
*** gzz/gzz/vob/GLTextStyle.java:1.11 Fri Sep 20 15:45:27 2002
--- gzz/gzz/vob/GLTextStyle.java Mon Sep 23 04:24:26 2002
***************
*** 33,45 ****
* it's much better to use GraphicsAPI.getTextStyle.
*/
public class GLTextStyle extends TextStyle {
! public static final String rcsid = "$Id: GLTextStyle.java,v 1.11 2002/09/20
19:45:27 benja Exp $";
public static boolean dbg = false;
private static void pa(String s) { System.err.println(s); }
! static GZZGL.Font theStaticFont;
static GLTextStyle[] instances = new GLTextStyle[250];
static public GLTextStyle create(String family, int style, int size) {
--- 33,45 ----
* it's much better to use GraphicsAPI.getTextStyle.
*/
public class GLTextStyle extends TextStyle {
! public static final String rcsid = "$Id: GLTextStyle.java,v 1.12 2002/09/23
08:24:26 tjl Exp $";
public static boolean dbg = false;
private static void pa(String s) { System.err.println(s); }
! static GL.Font theStaticFont;
static GLTextStyle[] instances = new GLTextStyle[250];
static public GLTextStyle create(String family, int style, int size) {
***************
*** 47,53 ****
GLTextStyle s = instances[size];
if(s == null) {
if(theStaticFont == null)
! theStaticFont = GZZGL.createFont("gfx/fonts/a010013l.pfb", 16);
s = new GLTextStyle(theStaticFont, size / (float)16);
instances[size] = s;
}
--- 47,53 ----
GLTextStyle s = instances[size];
if(s == null) {
if(theStaticFont == null)
! theStaticFont = GL.createFont("gfx/fonts/a010013l.pfb", 16);
s = new GLTextStyle(theStaticFont, size / (float)16);
instances[size] = s;
}
***************
*** 56,65 ****
float fontScale;
! GZZGL.Font theFont;
short[] charWidths = new short[256];
! private GLTextStyle(GZZGL.Font f, float scale) {
this.theFont = f;
this.fontScale = scale;
f.getWidths(charWidths);
--- 56,65 ----
float fontScale;
! GL.Font theFont;
short[] charWidths = new short[256];
! private GLTextStyle(GL.Font f, float scale) {
this.theFont = f;
this.fontScale = scale;
f.getWidths(charWidths);
Index: gzz/gzz/vob/RectBgVob.java
diff -c gzz/gzz/vob/RectBgVob.java:1.13 gzz/gzz/vob/RectBgVob.java:1.14
*** gzz/gzz/vob/RectBgVob.java:1.13 Sun Sep 22 12:30:11 2002
--- gzz/gzz/vob/RectBgVob.java Mon Sep 23 04:24:26 2002
***************
*** 27,33 ****
import gzz.errors.*;
import gzz.vob.*;
import gzz.client.*;
! import gzz.gfx.gl.GZZGL;
import java.awt.*;
import java.awt.event.*;
import java.util.*;
--- 27,33 ----
import gzz.errors.*;
import gzz.vob.*;
import gzz.client.*;
! import gzz.gfx.gl.*;
import java.awt.*;
import java.awt.event.*;
import java.util.*;
***************
*** 39,45 ****
*/
public class RectBgVob extends Vob {
! public static final String rcsid = "$Id: RectBgVob.java,v 1.13 2002/09/22
16:30:11 benja 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); }
--- 39,45 ----
*/
public class RectBgVob extends Vob {
! public static final String rcsid = "$Id: RectBgVob.java,v 1.14 2002/09/23
08:24:26 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); }
***************
*** 125,131 ****
"End\n");
}
! glList = GZZGL.createCallListCoorded(
"PushAttrib ENABLE_BIT\n"+
"Disable TEXTURE_2D\n"+
--- 125,131 ----
"End\n");
}
! glList = GLRen.createCallListCoorded(
"PushAttrib ENABLE_BIT\n"+
"Disable TEXTURE_2D\n"+
Index: gzz/gzz/vob/SimpleConnection.java
diff -c gzz/gzz/vob/SimpleConnection.java:1.2
gzz/gzz/vob/SimpleConnection.java:1.3
*** gzz/gzz/vob/SimpleConnection.java:1.2 Wed Sep 18 08:04:46 2002
--- gzz/gzz/vob/SimpleConnection.java Mon Sep 23 04:24:26 2002
***************
*** 22,28 ****
* Written by Benja Fallenstein
*/
package gzz.vob;
! import gzz.gfx.gl.GZZGL;
import gzz.client.*;
import java.awt.*;
--- 22,28 ----
* Written by Benja Fallenstein
*/
package gzz.vob;
! import gzz.gfx.gl.*;
import gzz.client.*;
import java.awt.*;
***************
*** 30,36 ****
*/
public class SimpleConnection extends Vob {
! public static final String rcsid = "$Id: SimpleConnection.java,v 1.2
2002/09/18 12:04:46 benja Exp $";
float x0, y0, x1, y1;
Color color;
--- 30,36 ----
*/
public class SimpleConnection extends Vob {
! public static final String rcsid = "$Id: SimpleConnection.java,v 1.3
2002/09/23 08:24:26 tjl Exp $";
float x0, y0, x1, y1;
Color color;
***************
*** 76,82 ****
int[] list, int curs, int coordsys1,
int coordsys2) {
if(line == null)
! line = GZZGL.createLineConnector(1, 1);
curs = line.addToListGL(win, list, curs, coordsys1, coordsys2);
return curs;
}
--- 76,82 ----
int[] list, int curs, int coordsys1,
int coordsys2) {
if(line == null)
! line = GLRen.createLineConnector(1, 1);
curs = line.addToListGL(win, list, curs, coordsys1, coordsys2);
return curs;
}
Index: gzz/gzz/vob/SolidBgVob.java
diff -c gzz/gzz/vob/SolidBgVob.java:1.7 gzz/gzz/vob/SolidBgVob.java:1.8
*** gzz/gzz/vob/SolidBgVob.java:1.7 Sat Sep 21 06:31:52 2002
--- gzz/gzz/vob/SolidBgVob.java Mon Sep 23 04:24:26 2002
***************
*** 84,90 ****
int[] list, int curs, int coordsys1, int coordsys2)
{
if(glList == null) {
! glList = GZZGL.createCallList( getGLStr() );
}
curs = glList.addToListGL( win, list, curs, coordsys1, coordsys2);
return curs;
--- 84,90 ----
int[] list, int curs, int coordsys1, int coordsys2)
{
if(glList == null) {
! glList = GLRen.createCallList( getGLStr() );
}
curs = glList.addToListGL( win, list, curs, coordsys1, coordsys2);
return curs;
Index: gzz/gzz/vob/TextCursorVob.java
diff -c gzz/gzz/vob/TextCursorVob.java:1.4 gzz/gzz/vob/TextCursorVob.java:1.5
*** gzz/gzz/vob/TextCursorVob.java:1.4 Wed Aug 21 17:32:42 2002
--- gzz/gzz/vob/TextCursorVob.java Mon Sep 23 04:24:26 2002
***************
*** 21,27 ****
* Written by Benja Fallenstein and Tuomas Lukka
*/
package gzz.vob;
! import gzz.gfx.gl.GZZGL;
import java.awt.Rectangle;
import java.awt.Shape;
import gzz.client.*;
--- 21,27 ----
* Written by Benja Fallenstein and Tuomas Lukka
*/
package gzz.vob;
! import gzz.gfx.gl.GLRen;
import java.awt.Rectangle;
import java.awt.Shape;
import gzz.client.*;
***************
*** 37,43 ****
*/
public class TextCursorVob extends Vob {
! String rcsid = "$Id: TextCursorVob.java,v 1.4 2002/08/21 21:32:42 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); }
--- 37,43 ----
*/
public class TextCursorVob extends Vob {
! String rcsid = "$Id: TextCursorVob.java,v 1.5 2002/09/23 08:24:26 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); }
Index: gzz/gzz/vob/TextVob.java
diff -c gzz/gzz/vob/TextVob.java:1.26 gzz/gzz/vob/TextVob.java:1.27
*** gzz/gzz/vob/TextVob.java:1.26 Sat Sep 21 17:49:04 2002
--- gzz/gzz/vob/TextVob.java Mon Sep 23 04:24:26 2002
***************
*** 21,27 ****
* Written by Benja Fallenstein and Tuomas Lukka
*/
package gzz.vob;
! import gzz.gfx.gl.GZZGL;
import java.awt.Rectangle;
import java.awt.Shape;
import gzz.client.*;
--- 21,27 ----
* Written by Benja Fallenstein and Tuomas Lukka
*/
package gzz.vob;
! import gzz.gfx.gl.GLRen;
import java.awt.Rectangle;
import java.awt.Shape;
import gzz.client.*;
***************
*** 31,37 ****
* from these and use a LineBreaker.
*/
public class TextVob extends HBox.VobHBox {
! String rcsid = "$Id: TextVob.java,v 1.26 2002/09/21 21:49:04 benja Exp $";
public static boolean dbg = false;
private static void pa(String s) { System.err.println(s); }
--- 31,37 ----
* from these and use a LineBreaker.
*/
public class TextVob extends HBox.VobHBox {
! String rcsid = "$Id: TextVob.java,v 1.27 2002/09/23 08:24:26 tjl Exp $";
public static boolean dbg = false;
private static void pa(String s) { System.err.println(s); }
***************
*** 105,111 ****
/** The OpenGL renderable for this TextVob.
*/
! private GZZGL.HorizText ht;
static Vob cl; // Color callList - XXX Should be removed -
// color should come from outside.
public int addToListGL(GraphicsAPI.Window win,
--- 105,111 ----
/** The OpenGL renderable for this TextVob.
*/
! private GLRen.HorizText ht;
static Vob cl; // Color callList - XXX Should be removed -
// color should come from outside.
public int addToListGL(GraphicsAPI.Window win,
***************
*** 116,129 ****
float sh = 2.0f/style.getHeight(1);
float sw = 2.0f/style.getWidth(text, 1);
GLTextStyle gls = (GLTextStyle)style;
! ht = GZZGL.createHorizText(
gls.theFont,
text,
-1, 0.7f, -1f,
sw * gls.fontScale, sh * gls.fontScale);
}
if(cl == null) {
! cl = GZZGL.createCallList("Color 0 0 0 1");
}
curs = cl.addToListGL(win, list, curs, coordsys1, 0);
curs = ht.addToListGL(win, list, curs, coordsys1, 0);
--- 116,129 ----
float sh = 2.0f/style.getHeight(1);
float sw = 2.0f/style.getWidth(text, 1);
GLTextStyle gls = (GLTextStyle)style;
! ht = GLRen.createHorizText(
gls.theFont,
text,
-1, 0.7f, -1f,
sw * gls.fontScale, sh * gls.fontScale);
}
if(cl == null) {
! cl = GLRen.createCallList("Color 0 0 0 1");
}
curs = cl.addToListGL(win, list, curs, coordsys1, 0);
curs = ht.addToListGL(win, list, curs, coordsys1, 0);
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gzz-commits] gzz ./Makefile ./TODO gfx/jni/Makefile gfx/libr...,
Tuomas J. Lukka <=