commit e2e92a293960deb0bd5ff2b5f4685298a2bd66d8 Author: Leszek Koltunski Date: Fri Jun 16 16:58:45 2017 +0100 Simplify Effect classes. diff --git a/src/main/java/org/distorted/library/effect/FragmentEffectAlpha.java b/src/main/java/org/distorted/library/effect/FragmentEffectAlpha.java index 41efbc4..e958a88 100644 --- a/src/main/java/org/distorted/library/effect/FragmentEffectAlpha.java +++ b/src/main/java/org/distorted/library/effect/FragmentEffectAlpha.java @@ -34,8 +34,7 @@ public class FragmentEffectAlpha extends FragmentEffect /** * Makes a certain sub-region of the Object smoothly change its transparency level. * - * @param alpha 1-dimensional Data that returns the level of transparency we want to have at any given - * moment: pixel.a *= alpha. + * @param alpha level of transparency we want to have at any given moment: pixel.a *= alpha. * Valid range: <0,1> * @param region Region this Effect is limited to. * @param smooth If true, the level of 'alpha' will smoothly fade out towards the edges of the region. @@ -43,7 +42,6 @@ public class FragmentEffectAlpha extends FragmentEffect public FragmentEffectAlpha(Data1D alpha, Data4D region, boolean smooth) { super(smooth? EffectName.SMOOTH_ALPHA:EffectName.ALPHA); - mAlpha = alpha; mRegion = (region==null ? new Static4D(0,0,Float.MAX_VALUE, Float.MAX_VALUE) : region); } @@ -52,14 +50,12 @@ public class FragmentEffectAlpha extends FragmentEffect /** * Makes the whole Object smoothly change its transparency level. * - * @param alpha 1-dimensional Data that returns the level of transparency we want to have at any - * given moment: pixel.a *= alpha. + * @param alpha level of transparency we want to have at any given moment: pixel.a *= alpha. * Valid range: <0,1> */ public FragmentEffectAlpha(Data1D alpha) { super(EffectName.ALPHA); - mAlpha = alpha; mRegion = new Static4D(0,0,Float.MAX_VALUE, Float.MAX_VALUE); } diff --git a/src/main/java/org/distorted/library/effect/FragmentEffectBrightness.java b/src/main/java/org/distorted/library/effect/FragmentEffectBrightness.java index 77d2fb1..ce68759 100644 --- a/src/main/java/org/distorted/library/effect/FragmentEffectBrightness.java +++ b/src/main/java/org/distorted/library/effect/FragmentEffectBrightness.java @@ -34,15 +34,13 @@ public class FragmentEffectBrightness extends FragmentEffect /** * Makes a certain sub-region of the Object smoothly change its brightness level. * - * @param brightness 1-dimensional Data that returns the level of brightness we want to have - * at any given moment. Valid range: <0,infinity) + * @param brightness level of brightness we want to have at any given moment. Valid range: <0,infinity) * @param region Region this Effect is limited to. * @param smooth If true, the level of 'brightness' will smoothly fade out towards the edges of the region. */ public FragmentEffectBrightness(Data1D brightness, Data4D region, boolean smooth) { super(smooth?EffectName.SMOOTH_BRIGHTNESS:EffectName.BRIGHTNESS); - mBrightness = brightness; mRegion = (region==null ? new Static4D(0,0,Float.MAX_VALUE, Float.MAX_VALUE) : region); } @@ -51,13 +49,11 @@ public class FragmentEffectBrightness extends FragmentEffect /** * Makes the whole Object smoothly change its brightness level. * - * @param brightness 1-dimensional Data that returns the level of brightness we want to have - * at any given moment. Valid range: <0,infinity) + * @param brightness level of brightness we want to have at any given moment. Valid range: <0,infinity) */ public FragmentEffectBrightness(Data1D brightness) { super(EffectName.BRIGHTNESS); - mBrightness = brightness; mRegion = new Static4D(0,0,Float.MAX_VALUE, Float.MAX_VALUE); } diff --git a/src/main/java/org/distorted/library/effect/FragmentEffectChroma.java b/src/main/java/org/distorted/library/effect/FragmentEffectChroma.java index 9bf46bf..cdf0c59 100644 --- a/src/main/java/org/distorted/library/effect/FragmentEffectChroma.java +++ b/src/main/java/org/distorted/library/effect/FragmentEffectChroma.java @@ -36,8 +36,8 @@ public class FragmentEffectChroma extends FragmentEffect /** * Makes a certain sub-region of the Object smoothly change all three of its RGB components. * - * @param blend 1-dimensional Data that returns the level of blend a given pixel will be - * mixed with the next parameter 'color': pixel = (1-level)*pixel + level*color. + * @param blend level of blend a given pixel will be mixed with the next parameter 'color': + * pixel = (1-level)*pixel + level*color. * Valid range: <0,1> * @param color Color to mix. (1,0,0) is RED. * @param region Region this Effect is limited to. @@ -46,7 +46,6 @@ public class FragmentEffectChroma extends FragmentEffect public FragmentEffectChroma(Data1D blend, Data3D color, Data4D region, boolean smooth) { super(smooth?EffectName.SMOOTH_CHROMA:EffectName.CHROMA); - mBlend = blend; mColor = color; mRegion = (region==null ? new Static4D(0,0,Float.MAX_VALUE, Float.MAX_VALUE) : region); @@ -56,15 +55,14 @@ public class FragmentEffectChroma extends FragmentEffect /** * Makes the whole Object smoothly change all three of its RGB components. * - * @param blend 1-dimensional Data that returns the level of blend a given pixel will be - * mixed with the next parameter 'color': pixel = (1-level)*pixel + level*color. + * @param blend level of blend a given pixel will be mixed with the next parameter 'color': + * pixel = (1-level)*pixel + level*color. * Valid range: <0,1> * @param color Color to mix. (1,0,0) is RED. */ public FragmentEffectChroma(Data1D blend, Data3D color) { super(EffectName.CHROMA); - mBlend = blend; mColor = color; mRegion = new Static4D(0,0,Float.MAX_VALUE, Float.MAX_VALUE); diff --git a/src/main/java/org/distorted/library/effect/FragmentEffectContrast.java b/src/main/java/org/distorted/library/effect/FragmentEffectContrast.java index 056aca5..f3e80cc 100644 --- a/src/main/java/org/distorted/library/effect/FragmentEffectContrast.java +++ b/src/main/java/org/distorted/library/effect/FragmentEffectContrast.java @@ -34,15 +34,13 @@ public class FragmentEffectContrast extends FragmentEffect /** * Makes a certain sub-region of the Object smoothly change its contrast level. * - * @param contrast 1-dimensional Data that returns the level of contrast we want to have - * at any given moment. Valid range: <0,infinity) + * @param contrast level of contrast we want to have at any given moment. Valid range: <0,infinity) * @param region Region this Effect is limited to. * @param smooth If true, the level of 'contrast' will smoothly fade out towards the edges of the region. */ public FragmentEffectContrast(Data1D contrast, Data4D region, boolean smooth) { super(smooth?EffectName.SMOOTH_CONTRAST:EffectName.CONTRAST); - mContrast = contrast; mRegion = (region==null ? new Static4D(0,0,Float.MAX_VALUE, Float.MAX_VALUE) : region); } @@ -51,13 +49,11 @@ public class FragmentEffectContrast extends FragmentEffect /** * Makes the whole Object smoothly change its contrast level. * - * @param contrast 1-dimensional Data that returns the level of contrast we want to have - * at any given moment. Valid range: <0,infinity) + * @param contrast level of contrast we want to have at any given moment. Valid range: <0,infinity) */ public FragmentEffectContrast(Data1D contrast) { super(EffectName.CONTRAST); - mContrast = contrast; mRegion = new Static4D(0,0,Float.MAX_VALUE, Float.MAX_VALUE); } diff --git a/src/main/java/org/distorted/library/effect/FragmentEffectSaturation.java b/src/main/java/org/distorted/library/effect/FragmentEffectSaturation.java index 3588dcf..f4da466 100644 --- a/src/main/java/org/distorted/library/effect/FragmentEffectSaturation.java +++ b/src/main/java/org/distorted/library/effect/FragmentEffectSaturation.java @@ -34,8 +34,7 @@ public class FragmentEffectSaturation extends FragmentEffect /** * Makes a certain sub-region of the Object smoothly change its saturation level. * - * @param saturation 1-dimensional Data that returns the level of saturation we want to have - * at any given moment. Valid range: <0,infinity) + * @param saturation level of saturation we want to have at any given moment. Valid range: <0,infinity) * @param region Region this Effect is limited to. * @param smooth If true, the level of 'saturation' will smoothly fade out towards the edges of the region. */ @@ -51,8 +50,7 @@ public class FragmentEffectSaturation extends FragmentEffect /** * Makes the whole Object smoothly change its saturation level. * - * @param saturation 1-dimensional Data that returns the level of saturation we want to have - * at any given moment. Valid range: <0,infinity) + * @param saturation level of saturation we want to have at any given moment. Valid range: <0,infinity) */ public FragmentEffectSaturation(Data1D saturation) { diff --git a/src/main/java/org/distorted/library/effect/MatrixEffectMove.java b/src/main/java/org/distorted/library/effect/MatrixEffectMove.java index 3a7cb8f..2195920 100644 --- a/src/main/java/org/distorted/library/effect/MatrixEffectMove.java +++ b/src/main/java/org/distorted/library/effect/MatrixEffectMove.java @@ -31,8 +31,7 @@ public class MatrixEffectMove extends MatrixEffect /** * Moves the Object by a (possibly changing in time) vector. * - * @param vector 3-dimensional Data which at any given time will return a Static3D - * representing the current coordinates of the vector we want to move the Object with. + * @param vector current coordinates of the vector we want to move the Object with. */ public MatrixEffectMove(Data3D vector) { diff --git a/src/main/java/org/distorted/library/effect/MatrixEffectQuaternion.java b/src/main/java/org/distorted/library/effect/MatrixEffectQuaternion.java index 56a2fb4..6f32d87 100644 --- a/src/main/java/org/distorted/library/effect/MatrixEffectQuaternion.java +++ b/src/main/java/org/distorted/library/effect/MatrixEffectQuaternion.java @@ -33,7 +33,7 @@ public class MatrixEffectQuaternion extends MatrixEffect /** * Rotates the Object by quaternion. * - * @param quaternion The quaternion describing the rotation. + * @param quaternion Quaternion describing the rotation. * @param center Coordinates of the Point we are rotating around. */ public MatrixEffectQuaternion(Data4D quaternion, Data3D center ) diff --git a/src/main/java/org/distorted/library/effect/MatrixEffectScale.java b/src/main/java/org/distorted/library/effect/MatrixEffectScale.java index e4fe42f..2ec5407 100644 --- a/src/main/java/org/distorted/library/effect/MatrixEffectScale.java +++ b/src/main/java/org/distorted/library/effect/MatrixEffectScale.java @@ -32,8 +32,7 @@ public class MatrixEffectScale extends MatrixEffect /** * Scales the Object by (possibly changing in time) 3D scale factors. * - * @param scale 3-dimensional Data which at any given time returns a Static3D - * representing the current x- , y- and z- scale factors. + * @param scale current x- , y- and z- scale factors. */ public MatrixEffectScale(Data3D scale) { diff --git a/src/main/java/org/distorted/library/effect/VertexEffectDistort.java b/src/main/java/org/distorted/library/effect/VertexEffectDistort.java index ea45fab..a9c6a88 100644 --- a/src/main/java/org/distorted/library/effect/VertexEffectDistort.java +++ b/src/main/java/org/distorted/library/effect/VertexEffectDistort.java @@ -34,8 +34,7 @@ public class VertexEffectDistort extends VertexEffect /** * Distort a (possibly changing in time) part of the Object by a (possibly changing in time) vector of force. * - * @param vector 3-dimensional Vector which represents the force the Center of the Effect is - * currently being dragged with. + * @param vector vector of force the Center of the Effect is currently being dragged with. * @param center 3-dimensional Data that, at any given time, returns the Center of the Effect. * @param region Region that masks the Effect. */ @@ -51,8 +50,7 @@ public class VertexEffectDistort extends VertexEffect /** * Distort the whole Object by a (possibly changing in time) vector of force. * - * @param vector 3-dimensional Vector which represents the force the Center of the Effect is - * currently being dragged with. + * @param vector vector of force the Center of the Effect is currently being dragged with. * @param center 3-dimensional Data that, at any given time, returns the Center of the Effect. */ public VertexEffectDistort(Data3D vector, Data3D center)