From 4b8bd5ec58cb2edfb51bd9ee930beb9c539a8a0b Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Fri, 1 Apr 2011 06:48:52 +0200 Subject: Final core and demo changes for jogl merge Core: - Region: Cleanup up constant names - Renderer: Add getRenderType() - TextRenderer: Add cache size limit - JavaFontLoader: Add FIXME 'Add cache size to limit memory usage' - UbuntuFontLoader: Add cache and FIXME 'Add cache size to limit memory usage' - TypecastFont: Add FIXME 'Add cache size to limit memory usage ??' Demos: - Relocated and split (main/listener) for jogl merge - Add 's' for screenshot - Text: - Add 'i' for live editing mode (until CR, backspace supported) --- src/com/jogamp/graph/curve/opengl/Renderer.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'src/com/jogamp/graph/curve/opengl/Renderer.java') diff --git a/src/com/jogamp/graph/curve/opengl/Renderer.java b/src/com/jogamp/graph/curve/opengl/Renderer.java index a36cf870b..863928ed4 100644 --- a/src/com/jogamp/graph/curve/opengl/Renderer.java +++ b/src/com/jogamp/graph/curve/opengl/Renderer.java @@ -6,7 +6,6 @@ import javax.media.opengl.fixedfunc.GLMatrixFunc; import jogamp.opengl.Debug; -import com.jogamp.graph.curve.Region; import com.jogamp.graph.geom.Vertex; import com.jogamp.graph.geom.opengl.SVertex; import com.jogamp.opengl.util.PMVMatrix; @@ -34,15 +33,20 @@ public abstract class Renderer { protected ShaderState st = new ShaderState(); protected PMVMatrix pmvMatrix = new PMVMatrix(); protected GLUniformData mgl_PMVMatrix; - protected int regionType = Region.SINGLE_PASS; + protected int renderType; protected int vp_width = 0; protected int vp_height = 0; private boolean vboSupported = false; private boolean initialized = false; - protected Renderer(Vertex.Factory factory, int type) { - this.regionType = type; + /** + * + * @param factory + * @param renderType either {@link com.jogamp.graph.curve.Region#SINGLE_PASS} or {@link com.jogamp.graph.curve.Region#TWO_PASS} + */ + protected Renderer(Vertex.Factory factory, int renderType) { + this.renderType = renderType; this.pointFactory = (null != factory) ? factory : SVertex.factory(); } @@ -52,6 +56,8 @@ public abstract class Renderer { public final boolean isVBOSupported() { return vboSupported; } + public final int getRenderType() { return renderType; } + public final int getWidth() { return vp_width; } public final int getHeight() { return vp_height; } -- cgit v1.2.3