From 0fff6032340aec5510aba121a0a7415dbf223222 Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Sun, 2 Oct 2011 08:03:37 +0200 Subject: Graph: Reflect shader name change in impl. TODO: Use/switch to 2nd pass shader --- src/jogl/classes/com/jogamp/graph/curve/opengl/Renderer.java | 5 ++++- .../classes/jogamp/graph/curve/opengl/RegionRendererImpl01.java | 6 +++++- 2 files changed, 9 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/jogl/classes/com/jogamp/graph/curve/opengl/Renderer.java b/src/jogl/classes/com/jogamp/graph/curve/opengl/Renderer.java index e77fc14d4..0a9e865cb 100644 --- a/src/jogl/classes/com/jogamp/graph/curve/opengl/Renderer.java +++ b/src/jogl/classes/com/jogamp/graph/curve/opengl/Renderer.java @@ -265,8 +265,11 @@ public abstract class Renderer { return "curverenderer01" + getShaderGLVersionSuffix(gl); } + /** + * FIXME: 2nd pass shader ! + */ protected String getFragmentShaderName(GL2ES2 gl) { - return "curverenderer01" + getShaderGLVersionSuffix(gl); + return "curverenderer01a" + getShaderGLVersionSuffix(gl); } protected String getShaderGLVersionSuffix(GL2ES2 gl) { diff --git a/src/jogl/classes/jogamp/graph/curve/opengl/RegionRendererImpl01.java b/src/jogl/classes/jogamp/graph/curve/opengl/RegionRendererImpl01.java index 58086e06c..0218c729a 100755 --- a/src/jogl/classes/jogamp/graph/curve/opengl/RegionRendererImpl01.java +++ b/src/jogl/classes/jogamp/graph/curve/opengl/RegionRendererImpl01.java @@ -46,12 +46,16 @@ public class RegionRendererImpl01 extends RegionRenderer { } + /** + * FIXME: 2nd pass shader ! + */ @Override protected String getFragmentShaderName(GL2ES2 gl) { if(Region.isNonUniformWeight(renderModes)){ + // FIXME: split shader ! return "curverenderer02" + getShaderGLVersionSuffix(gl); } - return "curverenderer01" + getShaderGLVersionSuffix(gl); + return "curverenderer01a" + getShaderGLVersionSuffix(gl); } protected boolean initShaderProgram(GL2ES2 gl) { -- cgit v1.2.3