commit a20f274ff15581155e542438789fa505c8c76883 Author: Leszek Koltunski Date: Wed Jun 28 12:16:23 2017 +0100 Simplify Statics. diff --git a/src/main/java/org/distorted/library/effect/FragmentEffect.java b/src/main/java/org/distorted/library/effect/FragmentEffect.java index 97df1ad..f21d2be 100644 --- a/src/main/java/org/distorted/library/effect/FragmentEffect.java +++ b/src/main/java/org/distorted/library/effect/FragmentEffect.java @@ -21,7 +21,7 @@ package org.distorted.library.effect; /////////////////////////////////////////////////////////////////////////////////////////////////// /** - * Fragment Effect - an Effect that works by injecting certain code into the main Fragment shader. + * Abstract class that represents an Effect that works by injecting certain code into the main Fragment shader. */ public abstract class FragmentEffect extends Effect { diff --git a/src/main/java/org/distorted/library/effect/MatrixEffect.java b/src/main/java/org/distorted/library/effect/MatrixEffect.java index 31b131a..81e0f3e 100644 --- a/src/main/java/org/distorted/library/effect/MatrixEffect.java +++ b/src/main/java/org/distorted/library/effect/MatrixEffect.java @@ -21,7 +21,7 @@ package org.distorted.library.effect; /////////////////////////////////////////////////////////////////////////////////////////////////// /** - * Matrix Effect - an Effect that works by modifying the ModelView matrix. + * Abstract class that represents an Effect that works by modifying the ModelView matrix. */ public abstract class MatrixEffect extends Effect { diff --git a/src/main/java/org/distorted/library/effect/PostprocessEffect.java b/src/main/java/org/distorted/library/effect/PostprocessEffect.java index 3197870..2a9dc90 100644 --- a/src/main/java/org/distorted/library/effect/PostprocessEffect.java +++ b/src/main/java/org/distorted/library/effect/PostprocessEffect.java @@ -30,7 +30,7 @@ import java.util.ArrayList; /////////////////////////////////////////////////////////////////////////////////////////////////// /** - * Postprocessing Effect - an Effect that works by running a certain Shader Program(s) on a Framebuffer. + * Abstract class that represents an Effect that works by running a certain Shader Program(s) on a Framebuffer. */ public abstract class PostprocessEffect extends Effect implements DistortedMaster.Slave { diff --git a/src/main/java/org/distorted/library/effect/PostprocessEffectGlow.java b/src/main/java/org/distorted/library/effect/PostprocessEffectGlow.java index 7c1f4f9..b9ab8d2 100644 --- a/src/main/java/org/distorted/library/effect/PostprocessEffectGlow.java +++ b/src/main/java/org/distorted/library/effect/PostprocessEffectGlow.java @@ -249,7 +249,7 @@ public class PostprocessEffectGlow extends PostprocessEffect " alpha += ( texture(u_ColorTexture,vec2(v_TexCoord.x+u_Offsets[i],v_TexCoord.y)).a + \n"+ " texture(u_ColorTexture,vec2(v_TexCoord.x-u_Offsets[i],v_TexCoord.y)).a ) * u_Weights[i]; \n"+ " } \n"+ - " fragColor = vec4(u_Color.rgb,u_Color.a*alpha); \n"+ + " fragColor = vec4(u_Color.rgb,alpha); \n"+ " }"; final String glowFragment2 = @@ -273,7 +273,7 @@ public class PostprocessEffectGlow extends PostprocessEffect " alpha += ( texture(u_ColorTexture,vec2(v_TexCoord.x,v_TexCoord.y+u_Offsets[i])).a + \n"+ " texture(u_ColorTexture,vec2(v_TexCoord.x,v_TexCoord.y-u_Offsets[i])).a ) * u_Weights[i]; \n"+ " } \n"+ - " fragColor = vec4(u_Color.rgb,u_Color.a*alpha); \n"+ + " fragColor = vec4(u_Color.rgb,alpha); \n"+ " }"; mIndex1 = PostprocessEffect.register("BLUR1", glowVertex,glowFragment1); diff --git a/src/main/java/org/distorted/library/effect/VertexEffect.java b/src/main/java/org/distorted/library/effect/VertexEffect.java index 67d8dba..39812e8 100644 --- a/src/main/java/org/distorted/library/effect/VertexEffect.java +++ b/src/main/java/org/distorted/library/effect/VertexEffect.java @@ -21,7 +21,7 @@ package org.distorted.library.effect; /////////////////////////////////////////////////////////////////////////////////////////////////// /** - * Vertex Effect - an Effect that works by injecting certain code into the main Vertex shader. + * Abstract class that represents an Effect that works by injecting certain code into the main Vertex shader. */ public abstract class VertexEffect extends Effect { diff --git a/src/main/java/org/distorted/library/type/Dynamic.java b/src/main/java/org/distorted/library/type/Dynamic.java index d193a75..8d059a3 100644 --- a/src/main/java/org/distorted/library/type/Dynamic.java +++ b/src/main/java/org/distorted/library/type/Dynamic.java @@ -333,11 +333,13 @@ public abstract class Dynamic /////////////////////////////////////////////////////////////////////////////////////////////////// // helper function in case we are interpolating through exactly 2 points - protected void computeOrthonormalBase2(Static1D curr, Static1D next) + protected void computeOrthonormalBase2(Static curr, Static next) { switch(mDimension) { - case 1: baseV[0][0] = (next.x-curr.x); + case 1: Static1D curr1 = (Static1D)curr; + Static1D next1 = (Static1D)next; + baseV[0][0] = (next1.x-curr1.x); break; case 2: Static2D curr2 = (Static2D)curr; Static2D next2 = (Static2D)next; diff --git a/src/main/java/org/distorted/library/type/Static1D.java b/src/main/java/org/distorted/library/type/Static1D.java index a37cb12..78b157d 100644 --- a/src/main/java/org/distorted/library/type/Static1D.java +++ b/src/main/java/org/distorted/library/type/Static1D.java @@ -30,26 +30,6 @@ public class Static1D extends Static implements Data1D { float x; -/////////////////////////////////////////////////////////////////////////////////////////////////// - - Static1D(int dim, float ox) - { - super(dim); - x = ox; - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// -/** - * Constructor that initialises the value of the single float to ox. - * - * @param ox value of the single float. - */ - public Static1D(int ox) - { - super(1); - x = ox; - } - /////////////////////////////////////////////////////////////////////////////////////////////////// /** * Constructor that initialises the value of the single float to ox. @@ -61,17 +41,6 @@ public class Static1D extends Static implements Data1D super(1); x = ox; } - -/////////////////////////////////////////////////////////////////////////////////////////////////// -/** - * Resets the value of the single float. - * - * @param ox new value of the single float. - */ - public void set(int ox) - { - x = ox; - } /////////////////////////////////////////////////////////////////////////////////////////////////// /** @@ -84,17 +53,6 @@ public class Static1D extends Static implements Data1D x = ox; } -/////////////////////////////////////////////////////////////////////////////////////////////////// -/** - * Resets the value of the first float. - * - * @param ox new value of the first float. - */ - public void set1(int ox) - { - x = ox; - } - /////////////////////////////////////////////////////////////////////////////////////////////////// /** * Resets the value of the first float. @@ -112,7 +70,7 @@ public class Static1D extends Static implements Data1D * * @return The single float. */ - public float getX() + public float get1() { return x; } @@ -120,7 +78,6 @@ public class Static1D extends Static implements Data1D /////////////////////////////////////////////////////////////////////////////////////////////////// /** * 'Interpolation' between the single Point (i.e. always this very value) returned to the buffer. - *

* * @param buffer Float buffer we will write the results to. * @param offset Offset in the buffer where to write the result. diff --git a/src/main/java/org/distorted/library/type/Static2D.java b/src/main/java/org/distorted/library/type/Static2D.java index 5f107c8..cee8cbe 100644 --- a/src/main/java/org/distorted/library/type/Static2D.java +++ b/src/main/java/org/distorted/library/type/Static2D.java @@ -26,30 +26,9 @@ package org.distorted.library.type; * a few of which the Dynamic interpolates between. */ -public class Static2D extends Static1D implements Data2D +public class Static2D extends Static implements Data2D { - float y; - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - Static2D(int dim, float ox, float oy) - { - super(dim,ox); - y = oy; - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// -/** - * Constructor that initialises the value of the two floats to (ox,oy). - * - * @param ox value of the first float. - * @param oy value of the second float. - */ - public Static2D(int ox, int oy) - { - super(2,ox); - y = oy; - } + float x,y; /////////////////////////////////////////////////////////////////////////////////////////////////// /** @@ -60,18 +39,19 @@ public class Static2D extends Static1D implements Data2D */ public Static2D(float ox, float oy) { - super(2,ox); + super(2); + x = ox; y = oy; } - + /////////////////////////////////////////////////////////////////////////////////////////////////// /** * Reset the value of the floats to (ox,oy). * * @param ox new value of the first float - * @param oy new value of the second float + * @param oy new value of the seond float */ - public void set(int ox, int oy) + public void set(float ox, float oy) { x = ox; y = oy; @@ -79,15 +59,13 @@ public class Static2D extends Static1D implements Data2D /////////////////////////////////////////////////////////////////////////////////////////////////// /** - * Reset the value of the floats to (ox,oy). - * - * @param ox new value of the first float - * @param oy new value of the seond float + * Resets the value of the first float. + * + * @param ox new value of the first float. */ - public void set(float ox, float oy) + public void set1(float ox) { x = ox; - y = oy; } /////////////////////////////////////////////////////////////////////////////////////////////////// @@ -96,20 +74,20 @@ public class Static2D extends Static1D implements Data2D * * @param oy new value of the second float. */ - public void set2(int oy) + public void set2(float oy) { y = oy; } /////////////////////////////////////////////////////////////////////////////////////////////////// /** - * Resets the value of the second float. + * Return the value of the first float contained. * - * @param oy new value of the second float. + * @return The first float. */ - public void set2(float oy) + public float get1() { - y = oy; + return x; } /////////////////////////////////////////////////////////////////////////////////////////////////// @@ -118,7 +96,7 @@ public class Static2D extends Static1D implements Data2D * * @return The second float. */ - public float getY() + public float get2() { return y; } @@ -126,7 +104,6 @@ public class Static2D extends Static1D implements Data2D /////////////////////////////////////////////////////////////////////////////////////////////////// /** * 'Interpolation' between the single Point (i.e. always this very value) returned to the buffer. - *

* * @param buffer Float buffer we will write the results to. * @param offset Offset in the buffer where to write the result. diff --git a/src/main/java/org/distorted/library/type/Static3D.java b/src/main/java/org/distorted/library/type/Static3D.java index 01fe655..3742d5a 100644 --- a/src/main/java/org/distorted/library/type/Static3D.java +++ b/src/main/java/org/distorted/library/type/Static3D.java @@ -26,31 +26,9 @@ package org.distorted.library.type; * a few of which the Dynamic interpolates between. */ -public class Static3D extends Static2D implements Data3D +public class Static3D extends Static implements Data3D { - float z; - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - Static3D(int dim, float vx, float vy, float vz) - { - super(dim,vx,vy); - z = vz; - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// -/** - * Constructor that initialises the value of the three floats to (vx,vy,vz). - * - * @param vx value of the first float. - * @param vy value of the second float. - * @param vz value of the third float. - */ - public Static3D(int vx, int vy, int vz) - { - super(3,vx,vy); - z = vz; - } + float x,y,z; /////////////////////////////////////////////////////////////////////////////////////////////////// /** @@ -62,7 +40,9 @@ public class Static3D extends Static2D implements Data3D */ public Static3D(float vx, float vy, float vz) { - super(3,vx,vy); + super(3); + x = vx; + y = vy; z = vz; } @@ -74,7 +54,7 @@ public class Static3D extends Static2D implements Data3D * @param vy new value of the second float * @param vz new value of the third float */ - public void set(int vx, int vy, int vz) + public void set(float vx, float vy, float vz) { x = vx; y = vy; @@ -83,28 +63,24 @@ public class Static3D extends Static2D implements Data3D /////////////////////////////////////////////////////////////////////////////////////////////////// /** - * Reset the value of the floats to (vx,vy,vz). - * - * @param vx new value of the first float - * @param vy new value of the second float - * @param vz new value of the third float + * Resets the value of the first float. + * + * @param ox new value of the first float. */ - public void set(float vx, float vy, float vz) + public void set1(float ox) { - x = vx; - y = vy; - z = vz; + x = ox; } /////////////////////////////////////////////////////////////////////////////////////////////////// /** - * Resets the value of the third float. + * Resets the value of the second float. * - * @param oz new value of the third float. + * @param oy new value of the second float. */ - public void set3(int oz) + public void set2(float oy) { - z = oz; + y = oy; } /////////////////////////////////////////////////////////////////////////////////////////////////// @@ -118,13 +94,35 @@ public class Static3D extends Static2D implements Data3D z = oz; } +/////////////////////////////////////////////////////////////////////////////////////////////////// +/** + * Return the value of the first float contained. + * + * @return The first float. + */ + public float get1() + { + return x; + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// +/** + * Return the value of the second float contained. + * + * @return The second float. + */ + public float get2() + { + return y; + } + /////////////////////////////////////////////////////////////////////////////////////////////////// /** * Return the value of the third float contained. * * @return The third float. */ - public float getZ() + public float get3() { return z; } @@ -132,7 +130,6 @@ public class Static3D extends Static2D implements Data3D /////////////////////////////////////////////////////////////////////////////////////////////////// /** * 'Interpolation' between the single Point (i.e. always this very value) returned to the buffer. - *

* * @param buffer Float buffer we will write the results to. * @param offset Offset in the buffer where to write the result. diff --git a/src/main/java/org/distorted/library/type/Static4D.java b/src/main/java/org/distorted/library/type/Static4D.java index 8e5c763..671cd7c 100644 --- a/src/main/java/org/distorted/library/type/Static4D.java +++ b/src/main/java/org/distorted/library/type/Static4D.java @@ -26,32 +26,9 @@ package org.distorted.library.type; * a few of which the Dynamic interpolates between. */ -public class Static4D extends Static3D implements Data4D +public class Static4D extends Static implements Data4D { - float w; - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - Static4D(int dim, float vx, float vy, float vz, float vw) - { - super(dim,vx,vy,vz); - w = vw; - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// -/** - * Constructor that initialises the value of the four floats to (vx,vy,vz,vw). - * - * @param vx value of the first float. - * @param vy value of the second float. - * @param vz value of the third float. - * @param vw value of the fourth float. - */ - public Static4D(int vx, int vy, int vz, int vw) - { - super(4,vx,vy,vz); - w = vw; - } + float x,y,z,w; /////////////////////////////////////////////////////////////////////////////////////////////////// /** @@ -64,7 +41,10 @@ public class Static4D extends Static3D implements Data4D */ public Static4D(float vx, float vy, float vz, float vw) { - super(4,vx,vy,vz); + super(4); + x = vx; + y = vy; + z = vz; w = vw; } @@ -77,7 +57,7 @@ public class Static4D extends Static3D implements Data4D * @param vz new value of the third float * @param vw new value of the fourth float */ - public void set(int vx, int vy, int vz, int vw) + public void set(float vx, float vy, float vz, float vw) { x = vx; y = vy; @@ -87,30 +67,35 @@ public class Static4D extends Static3D implements Data4D /////////////////////////////////////////////////////////////////////////////////////////////////// /** - * Reset the value of the floats to (vx,vy,vz,vw). - * - * @param vx new value of the first float - * @param vy new value of the second float - * @param vz new value of the third float - * @param vw new value of the fourth float + * Resets the value of the first float. + * + * @param ox new value of the first float. */ - public void set(float vx, float vy, float vz, float vw) + public void set1(float ox) { - x = vx; - y = vy; - z = vz; - w = vw; + x = ox; } /////////////////////////////////////////////////////////////////////////////////////////////////// /** - * Resets the value of the fourth float. + * Resets the value of the second float. * - * @param ow new value of the fourth float. + * @param oy new value of the second float. */ - public void set4(int ow) + public void set2(float oy) { - w = ow; + y = oy; + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// +/** + * Resets the value of the third float. + * + * @param oz new value of the third float. + */ + public void set3(float oz) + { + z = oz; } /////////////////////////////////////////////////////////////////////////////////////////////////// @@ -124,21 +109,53 @@ public class Static4D extends Static3D implements Data4D w = ow; } +/////////////////////////////////////////////////////////////////////////////////////////////////// +/** + * Return the value of the first float contained. + * + * @return The first float. + */ + public float get1() + { + return x; + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// +/** + * Return the value of the second float contained. + * + * @return The second float. + */ + public float get2() + { + return y; + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// +/** + * Return the value of the third float contained. + * + * @return The third float. + */ + public float get3() + { + return z; + } + /////////////////////////////////////////////////////////////////////////////////////////////////// /** * Return the value of the fourth float contained. - * + * * @return The fourth float. */ - public float getW() + public float get4() { - return w; + return w; } /////////////////////////////////////////////////////////////////////////////////////////////////// /** * 'Interpolation' between the single Point (i.e. always this very value) returned to the buffer. - *

* * @param buffer Float buffer we will write the results to. * @param offset Offset in the buffer where to write the result. diff --git a/src/main/java/org/distorted/library/type/Static5D.java b/src/main/java/org/distorted/library/type/Static5D.java index ca1bb9d..545ce2e 100644 --- a/src/main/java/org/distorted/library/type/Static5D.java +++ b/src/main/java/org/distorted/library/type/Static5D.java @@ -26,25 +26,9 @@ package org.distorted.library.type; * a few of which the Dynamic interpolates between. */ -public class Static5D extends Static4D implements Data5D +public class Static5D extends Static implements Data5D { - float v; - -/////////////////////////////////////////////////////////////////////////////////////////////////// -/** - * Constructor that initialises the value of the five floats to (vx,vy,vz,vw,vv). - * - * @param vx value of the first float. - * @param vy value of the second float. - * @param vz value of the third float. - * @param vw value of the fourth float. - * @param vv value of the fifth float. - */ - public Static5D(int vx, int vy, int vz, int vw, int vv) - { - super(5,vx,vy,vz,vw); - v = vv; - } + float x,y,z,w,v; /////////////////////////////////////////////////////////////////////////////////////////////////// /** @@ -58,7 +42,11 @@ public class Static5D extends Static4D implements Data5D */ public Static5D(float vx, float vy, float vz, float vw, float vv) { - super(5,vx,vy,vz,vw); + super(5); + x = vx; + y = vy; + z = vz; + w = vw; v = vv; } @@ -72,7 +60,7 @@ public class Static5D extends Static4D implements Data5D * @param vw new value of the fourth float * @param vv new value of the fifth float */ - public void set(int vx, int vy, int vz, int vw, int vv) + public void set(float vx, float vy, float vz, float vw, float vv) { x = vx; y = vy; @@ -83,32 +71,46 @@ public class Static5D extends Static4D implements Data5D /////////////////////////////////////////////////////////////////////////////////////////////////// /** - * Reset the value of the floats to (vx,vy,vz,vw,vv). - * - * @param vx new value of the first float - * @param vy new value of the second float - * @param vz new value of the third float - * @param vw new value of the fourth float - * @param vv new value of the fifth float + * Resets the value of the first float. + * + * @param ox new value of the first float. */ - public void set(float vx, float vy, float vz, float vw, float vv) + public void set1(float ox) { - x = vx; - y = vy; - z = vz; - w = vw; - v = vv; + x = ox; } /////////////////////////////////////////////////////////////////////////////////////////////////// /** - * Resets the value of the fifth float. + * Resets the value of the second float. * - * @param ov new value of the fifth float. + * @param oy new value of the second float. */ - public void set5(int ov) + public void set2(float oy) { - v = ov; + y = oy; + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// +/** + * Resets the value of the third float. + * + * @param oz new value of the third float. + */ + public void set3(float oz) + { + z = oz; + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// +/** + * Resets the value of the fourth float. + * + * @param ow new value of the fourth float. + */ + public void set4(float ow) + { + w = ow; } /////////////////////////////////////////////////////////////////////////////////////////////////// @@ -122,13 +124,58 @@ public class Static5D extends Static4D implements Data5D v = ov; } +/////////////////////////////////////////////////////////////////////////////////////////////////// +/** + * Return the value of the first float contained. + * + * @return The first float. + */ + public float get1() + { + return x; + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// +/** + * Return the value of the second float contained. + * + * @return The second float. + */ + public float get2() + { + return y; + } + + +/////////////////////////////////////////////////////////////////////////////////////////////////// +/** + * Return the value of the third float contained. + * + * @return The third float. + */ + public float get3() + { + return z; + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// +/** + * Return the value of the fourth float contained. + * + * @return The fourth float. + */ + public float get4() + { + return w; + } + /////////////////////////////////////////////////////////////////////////////////////////////////// /** * Return the value of the fifth float contained. * * @return The fifth float. */ - public float getV() + public float get5() { return v; } @@ -136,7 +183,6 @@ public class Static5D extends Static4D implements Data5D /////////////////////////////////////////////////////////////////////////////////////////////////// /** * 'Interpolation' between the single Point (i.e. always this very value) returned to the buffer. - *

* * @param buffer Float buffer we will write the results to. * @param offset Offset in the buffer where to write the result.