From 4b8bd5ec58cb2edfb51bd9ee930beb9c539a8a0b Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
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/RegionRenderer.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'src/com/jogamp/graph/curve/opengl/RegionRenderer.java')
diff --git a/src/com/jogamp/graph/curve/opengl/RegionRenderer.java b/src/com/jogamp/graph/curve/opengl/RegionRenderer.java
index 746eba636..c1fec10b8 100644
--- a/src/com/jogamp/graph/curve/opengl/RegionRenderer.java
+++ b/src/com/jogamp/graph/curve/opengl/RegionRenderer.java
@@ -59,7 +59,7 @@ public abstract class RegionRenderer extends Renderer {
* @return the resulting Region.
*/
protected Region createRegion(GL2ES2 gl, OutlineShape outlineShape, float sharpness) {
- Region region = RegionFactory.create(gl.getContext(), st, regionType);
+ Region region = RegionFactory.create(gl.getContext(), st, renderType);
outlineShape.transformOutlines(OutlineShape.QUADRATIC_NURBS);
@@ -78,7 +78,7 @@ public abstract class RegionRenderer extends Renderer {
* @return the resulting Region inclusive the generated region
*/
protected Region createRegion(GL2ES2 gl, OutlineShape[] outlineShapes, float sharpness) {
- Region region = RegionFactory.create(gl.getContext(), st, regionType);
+ Region region = RegionFactory.create(gl.getContext(), st, renderType);
int numVertices = region.getNumVertices();
--
cgit v1.2.3