diff options
| author | Sven Gothel <[email protected]> | 2011-10-02 08:03:37 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2011-10-02 08:03:37 +0200 |
| commit | 0fff6032340aec5510aba121a0a7415dbf223222 (patch) | |
| tree | ad7776b87cf91a9bdb3b50a2641e98fe9594b12b /src/jogl/classes | |
| parent | ea8129ebe2a2ec1157bb752e435d16aab2ee932a (diff) | |
Graph: Reflect shader name change in impl. TODO: Use/switch to 2nd pass shader
Diffstat (limited to 'src/jogl/classes')
| -rw-r--r-- | src/jogl/classes/com/jogamp/graph/curve/opengl/Renderer.java | 5 | ||||
| -rwxr-xr-x | src/jogl/classes/jogamp/graph/curve/opengl/RegionRendererImpl01.java | 6 |
2 files changed, 9 insertions, 2 deletions
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) {
|