diff options
author | Sven Gothel <[email protected]> | 2011-04-01 06:48:52 +0200 |
---|---|---|
committer | Sven Gothel <[email protected]> | 2011-04-01 06:48:52 +0200 |
commit | 4b8bd5ec58cb2edfb51bd9ee930beb9c539a8a0b (patch) | |
tree | 5567f56606ea248707fe002015b90a9635250e91 /src/com/jogamp/graph/curve/opengl/Renderer.java | |
parent | e8c69e69374b6650e37594ebf104602fb06b548b (diff) |
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)
Diffstat (limited to 'src/com/jogamp/graph/curve/opengl/Renderer.java')
-rw-r--r-- | src/com/jogamp/graph/curve/opengl/Renderer.java | 14 |
1 files changed, 10 insertions, 4 deletions
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<? extends Vertex> 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<? extends Vertex> 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; } |