diff options
author | Sven Gothel <[email protected]> | 2014-07-03 16:21:36 +0200 |
---|---|---|
committer | Sven Gothel <[email protected]> | 2014-07-03 16:21:36 +0200 |
commit | 556d92b63555a085b25e32b1cd55afce24edd07a (patch) | |
tree | 6be2b02c62a77d5aba81ffbe34c46960608be163 /src/jogl/classes/jogamp/opengl/util/glsl/GLSLTextureRaster.java | |
parent | a90f4a51dffec3247278e3c683ed4462b1dd9ab5 (diff) |
Code Clean-Up based on our Recommended Settings (jogamp-scripting c47bc86ae2ee268a1f38c5580d11f93d7f8d6e74)
- Change non static accesses to static members using declaring type
- Change indirect accesses to static members to direct accesses (accesses through subtypes)
- Add final modifier to private fields
- Add final modifier to method parameters
- Add final modifier to local variables
- Remove unnecessary casts
- Remove unnecessary '$NON-NLS$' tags
- Remove trailing white spaces on all lines
Diffstat (limited to 'src/jogl/classes/jogamp/opengl/util/glsl/GLSLTextureRaster.java')
-rw-r--r-- | src/jogl/classes/jogamp/opengl/util/glsl/GLSLTextureRaster.java | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/jogl/classes/jogamp/opengl/util/glsl/GLSLTextureRaster.java b/src/jogl/classes/jogamp/opengl/util/glsl/GLSLTextureRaster.java index 09da8c9ee..d5d0020c5 100644 --- a/src/jogl/classes/jogamp/opengl/util/glsl/GLSLTextureRaster.java +++ b/src/jogl/classes/jogamp/opengl/util/glsl/GLSLTextureRaster.java @@ -52,7 +52,7 @@ public class GLSLTextureRaster { private GLUniformData activeTexUniform; private GLArrayDataServer interleavedVBO; - public GLSLTextureRaster(int textureUnit, boolean textureVertFlipped) { + public GLSLTextureRaster(final int textureUnit, final boolean textureVertFlipped) { this.textureVertFlipped = textureVertFlipped; this.textureUnit = textureUnit; } @@ -63,7 +63,7 @@ public class GLSLTextureRaster { static final String shaderSrcPath = "../../shader"; static final String shaderBinPath = "../../shader/bin"; - public void init(GL2ES2 gl) { + public void init(final GL2ES2 gl) { // Create & Compile the shader objects final ShaderCode rsVp = ShaderCode.create(gl, GL2ES2.GL_VERTEX_SHADER, this.getClass(), shaderSrcPath, shaderBinPath, shaderBasename, true); @@ -83,9 +83,9 @@ public class GLSLTextureRaster { // setup mgl_PMVMatrix pmvMatrix = new PMVMatrix(); - pmvMatrix.glMatrixMode(PMVMatrix.GL_PROJECTION); + pmvMatrix.glMatrixMode(GLMatrixFunc.GL_PROJECTION); pmvMatrix.glLoadIdentity(); - pmvMatrix.glMatrixMode(PMVMatrix.GL_MODELVIEW); + pmvMatrix.glMatrixMode(GLMatrixFunc.GL_MODELVIEW); pmvMatrix.glLoadIdentity(); pmvMatrixUniform = new GLUniformData("mgl_PMVMatrix", 4, 4, pmvMatrix.glGetPMvMatrixf()); // P, Mv if( pmvMatrixUniform.setLocation(gl, sp.program()) < 0 ) { @@ -128,7 +128,7 @@ public class GLSLTextureRaster { sp.useProgram(gl, false); } - public void reshape(GL2ES2 gl, int x, int y, int width, int height) { + public void reshape(final GL2ES2 gl, final int x, final int y, final int width, final int height) { if(null != sp) { pmvMatrix.glMatrixMode(GLMatrixFunc.GL_PROJECTION); pmvMatrix.glLoadIdentity(); @@ -143,7 +143,7 @@ public class GLSLTextureRaster { } } - public void dispose(GL2ES2 gl) { + public void dispose(final GL2ES2 gl) { if(null != pmvMatrixUniform) { pmvMatrixUniform = null; } @@ -158,7 +158,7 @@ public class GLSLTextureRaster { } } - public void display(GL2ES2 gl) { + public void display(final GL2ES2 gl) { if(null != sp) { sp.useProgram(gl, true); interleavedVBO.enableBuffer(gl, true); |