diff options
author | Jorge Ruesga <jorge@ruesga.com> | 2013-08-14 21:24:30 +0200 |
---|---|---|
committer | Jorge Ruesga <jorge@ruesga.com> | 2013-08-14 21:24:30 +0200 |
commit | bbeefc54e76e80f6c776813c80ab6e58dd4eddc1 (patch) | |
tree | f5fe7bc3c3d8492090c47754dede578904096a7e /src/org/cyanogenmod/wallpapers/photophase/effects | |
parent | 9390e9c4ccd9521a29b925da3054c65da0fce6c8 (diff) | |
download | android_packages_wallpapers_PhotoPhase-bbeefc54e76e80f6c776813c80ab6e58dd4eddc1.tar.gz android_packages_wallpapers_PhotoPhase-bbeefc54e76e80f6c776813c80ab6e58dd4eddc1.tar.bz2 android_packages_wallpapers_PhotoPhase-bbeefc54e76e80f6c776813c80ab6e58dd4eddc1.zip |
Clean up
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
Diffstat (limited to 'src/org/cyanogenmod/wallpapers/photophase/effects')
-rw-r--r-- | src/org/cyanogenmod/wallpapers/photophase/effects/HalftoneEffect.java | 7 | ||||
-rw-r--r-- | src/org/cyanogenmod/wallpapers/photophase/effects/ScanlinesEffect.java | 9 |
2 files changed, 9 insertions, 7 deletions
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 <code>Effect</code> to follow the rules - * defined by {@see EffectFactory}. + * An abstract constructor of <code>Effect</code> 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<br/> @@ -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 <code>Effect</code> to follow the rules - * defined by {@see EffectFactory}. + * An abstract constructor of <code>Effect</code> to follow the rules + * defined by {@link EffectFactory}. * * @param ctx The effect context * @param name The effect name |