From bbeefc54e76e80f6c776813c80ab6e58dd4eddc1 Mon Sep 17 00:00:00 2001 From: Jorge Ruesga Date: Wed, 14 Aug 2013 21:24:30 +0200 Subject: Clean up Signed-off-by: Jorge Ruesga --- .../wallpapers/photophase/effects/HalftoneEffect.java | 7 ++++--- .../wallpapers/photophase/effects/ScanlinesEffect.java | 9 +++++---- src/org/cyanogenmod/wallpapers/photophase/shapes/OopsShape.java | 4 ++-- 3 files changed, 11 insertions(+), 9 deletions(-) (limited to 'src/org/cyanogenmod') diff --git a/src/org/cyanogenmod/wallpapers/photophase/effects/HalftoneEffect.java b/src/org/cyanogenmod/wallpapers/photophase/effects/HalftoneEffect.java index 7e03396..3f9c4e7 100644 --- a/src/org/cyanogenmod/wallpapers/photophase/effects/HalftoneEffect.java +++ b/src/org/cyanogenmod/wallpapers/photophase/effects/HalftoneEffect.java @@ -23,6 +23,7 @@ package org.cyanogenmod.wallpapers.photophase.effects; import android.media.effect.EffectContext; +import android.media.effect.EffectFactory; import android.opengl.GLES20; import android.util.Log; @@ -54,7 +55,7 @@ public class HalftoneEffect extends PhotoPhaseEffect { "float half_step = dotsize / 2.0;\n" + "void main() {\n" + " vec2 center = v_texcoord - vec2(mod(v_texcoord.x, dotsize),mod(v_texcoord.y, dotsize)) + half_step;\n" + - " vec4 pel = texture2D( tex_sampler, center);\n" + + " vec4 pel = texture2D(tex_sampler, center);\n" + " float size = length(pel);\n" + " if (distance(v_texcoord,center) <= dotsize*size/4.0) {\n" + " gl_FragColor = pel;\n" + @@ -67,8 +68,8 @@ public class HalftoneEffect extends PhotoPhaseEffect { private int mStepsHandle; /** - * An abstract contructor of Effect to follow the rules - * defined by {@see EffectFactory}. + * An abstract constructor of Effect to follow the rules + * defined by {@link EffectFactory}. * * @param ctx The effect context * @param name The effect name diff --git a/src/org/cyanogenmod/wallpapers/photophase/effects/ScanlinesEffect.java b/src/org/cyanogenmod/wallpapers/photophase/effects/ScanlinesEffect.java index a8bfeae..183e207 100644 --- a/src/org/cyanogenmod/wallpapers/photophase/effects/ScanlinesEffect.java +++ b/src/org/cyanogenmod/wallpapers/photophase/effects/ScanlinesEffect.java @@ -23,6 +23,7 @@ package org.cyanogenmod.wallpapers.photophase.effects; import android.media.effect.EffectContext; +import android.media.effect.EffectFactory; /** * A TV scanline effect
@@ -41,14 +42,14 @@ public class ScanlinesEffect extends PhotoPhaseEffect { "void main(void)\n" + "{\n" + " float global_pos = (v_texcoord.y + offset) * frequency;\n" + - " float wave_pos = cos((fract( global_pos ) - 0.5)*3.14);\n" + - " vec4 pel = texture2D( tex_sampler, v_texcoord );\n" + + " float wave_pos = cos((fract(global_pos) - 0.5)*3.14);\n" + + " vec4 pel = texture2D(tex_sampler, v_texcoord);\n" + " gl_FragColor = mix(vec4(0,0,0,0), pel, wave_pos);\n" + "}"; /** - * An abstract contructor of Effect to follow the rules - * defined by {@see EffectFactory}. + * An abstract constructor of Effect to follow the rules + * defined by {@link EffectFactory}. * * @param ctx The effect context * @param name The effect name diff --git a/src/org/cyanogenmod/wallpapers/photophase/shapes/OopsShape.java b/src/org/cyanogenmod/wallpapers/photophase/shapes/OopsShape.java index 43e8022..e657fe4 100644 --- a/src/org/cyanogenmod/wallpapers/photophase/shapes/OopsShape.java +++ b/src/org/cyanogenmod/wallpapers/photophase/shapes/OopsShape.java @@ -115,7 +115,7 @@ public class OopsShape implements DrawableShape { mMVPMatrixHandlers = new int[2]; // Create all the params - for (int i=0; i < 2; i++) { + for (int i = 0; i < 2; i++) { mProgramHandlers[i] = GLESUtil.createProgram( ctx.getResources(), VERTEX_SHADER, FRAGMENT_SHADER); @@ -246,7 +246,7 @@ public class OopsShape implements DrawableShape { mPositionBuffer = null; mTextureBuffer = null; - for (int i=0; i < 2; i++) { + for (int i = 0; i < 2; i++) { if (GLES20.glIsProgram(mProgramHandlers[i])) { GLES20.glDeleteProgram(mProgramHandlers[i]); GLESUtil.glesCheckError("glDeleteProgram(" + i + ")"); -- cgit v1.2.3