Revision 7625e47e
Added by Leszek Koltunski over 8 years ago
| src/main/java/org/distorted/library/effect/FragmentEffectAlpha.java | ||
|---|---|---|
| 53 | 53 |
mStatic0 = (Static1D)alpha; |
| 54 | 54 |
} |
| 55 | 55 |
|
| 56 |
if( region instanceof Static4D)
|
|
| 56 |
if( region == null )
|
|
| 57 | 57 |
{
|
| 58 |
mStaticRegion = (Static4D)region;
|
|
| 58 |
mStaticRegion = new Static4D(0,0,Float.MAX_VALUE, Float.MAX_VALUE);
|
|
| 59 | 59 |
} |
| 60 |
else if( region instanceof Dynamic4D)
|
|
| 60 |
else |
|
| 61 | 61 |
{
|
| 62 |
mDynamicRegion = (Dynamic4D)region; |
|
| 62 |
if (region instanceof Static4D) |
|
| 63 |
{
|
|
| 64 |
mStaticRegion = (Static4D) region; |
|
| 65 |
} |
|
| 66 |
else if (region instanceof Dynamic4D) |
|
| 67 |
{
|
|
| 68 |
mDynamicRegion = (Dynamic4D) region; |
|
| 69 |
} |
|
| 63 | 70 |
} |
| 64 | 71 |
} |
| 65 | 72 |
|
| src/main/java/org/distorted/library/effect/FragmentEffectBrightness.java | ||
|---|---|---|
| 52 | 52 |
mStatic0 = (Static1D)brightness; |
| 53 | 53 |
} |
| 54 | 54 |
|
| 55 |
if( region instanceof Static4D)
|
|
| 55 |
if( region == null )
|
|
| 56 | 56 |
{
|
| 57 |
mStaticRegion = (Static4D)region;
|
|
| 57 |
mStaticRegion = new Static4D(0,0,Float.MAX_VALUE, Float.MAX_VALUE);
|
|
| 58 | 58 |
} |
| 59 |
else if( region instanceof Dynamic4D)
|
|
| 59 |
else |
|
| 60 | 60 |
{
|
| 61 |
mDynamicRegion = (Dynamic4D)region; |
|
| 61 |
if (region instanceof Static4D) |
|
| 62 |
{
|
|
| 63 |
mStaticRegion = (Static4D) region; |
|
| 64 |
} |
|
| 65 |
else if (region instanceof Dynamic4D) |
|
| 66 |
{
|
|
| 67 |
mDynamicRegion = (Dynamic4D) region; |
|
| 68 |
} |
|
| 62 | 69 |
} |
| 63 | 70 |
} |
| 64 | 71 |
|
| src/main/java/org/distorted/library/effect/FragmentEffectChroma.java | ||
|---|---|---|
| 66 | 66 |
mStatic1 = (Static3D)color; |
| 67 | 67 |
} |
| 68 | 68 |
|
| 69 |
if( region instanceof Static4D)
|
|
| 69 |
if( region == null )
|
|
| 70 | 70 |
{
|
| 71 |
mStaticRegion = (Static4D)region;
|
|
| 71 |
mStaticRegion = new Static4D(0,0,Float.MAX_VALUE, Float.MAX_VALUE);
|
|
| 72 | 72 |
} |
| 73 |
else if( region instanceof Dynamic4D)
|
|
| 73 |
else |
|
| 74 | 74 |
{
|
| 75 |
mDynamicRegion = (Dynamic4D)region; |
|
| 75 |
if (region instanceof Static4D) |
|
| 76 |
{
|
|
| 77 |
mStaticRegion = (Static4D) region; |
|
| 78 |
} |
|
| 79 |
else if (region instanceof Dynamic4D) |
|
| 80 |
{
|
|
| 81 |
mDynamicRegion = (Dynamic4D) region; |
|
| 82 |
} |
|
| 76 | 83 |
} |
| 77 | 84 |
} |
| 78 | 85 |
|
| src/main/java/org/distorted/library/effect/FragmentEffectContrast.java | ||
|---|---|---|
| 52 | 52 |
mStatic0 = (Static1D)contrast; |
| 53 | 53 |
} |
| 54 | 54 |
|
| 55 |
if( region instanceof Static4D)
|
|
| 55 |
if( region == null )
|
|
| 56 | 56 |
{
|
| 57 |
mStaticRegion = (Static4D)region;
|
|
| 57 |
mStaticRegion = new Static4D(0,0,Float.MAX_VALUE, Float.MAX_VALUE);
|
|
| 58 | 58 |
} |
| 59 |
else if( region instanceof Dynamic4D)
|
|
| 59 |
else |
|
| 60 | 60 |
{
|
| 61 |
mDynamicRegion = (Dynamic4D)region; |
|
| 61 |
if (region instanceof Static4D) |
|
| 62 |
{
|
|
| 63 |
mStaticRegion = (Static4D) region; |
|
| 64 |
} |
|
| 65 |
else if (region instanceof Dynamic4D) |
|
| 66 |
{
|
|
| 67 |
mDynamicRegion = (Dynamic4D) region; |
|
| 68 |
} |
|
| 62 | 69 |
} |
| 63 | 70 |
} |
| 64 | 71 |
|
| src/main/java/org/distorted/library/effect/FragmentEffectSaturation.java | ||
|---|---|---|
| 52 | 52 |
mStatic0 = (Static1D)saturation; |
| 53 | 53 |
} |
| 54 | 54 |
|
| 55 |
if( region instanceof Static4D)
|
|
| 55 |
if( region == null )
|
|
| 56 | 56 |
{
|
| 57 |
mStaticRegion = (Static4D)region;
|
|
| 57 |
mStaticRegion = new Static4D(0,0,Float.MAX_VALUE, Float.MAX_VALUE);
|
|
| 58 | 58 |
} |
| 59 |
else if( region instanceof Dynamic4D)
|
|
| 59 |
else |
|
| 60 | 60 |
{
|
| 61 |
mDynamicRegion = (Dynamic4D)region; |
|
| 61 |
if (region instanceof Static4D) |
|
| 62 |
{
|
|
| 63 |
mStaticRegion = (Static4D) region; |
|
| 64 |
} |
|
| 65 |
else if (region instanceof Dynamic4D) |
|
| 66 |
{
|
|
| 67 |
mDynamicRegion = (Dynamic4D) region; |
|
| 68 |
} |
|
| 62 | 69 |
} |
| 63 | 70 |
} |
| 64 | 71 |
|
| src/main/java/org/distorted/library/effect/MatrixEffect.java | ||
|---|---|---|
| 29 | 29 |
{
|
| 30 | 30 |
public static final int NUM_UNIFORMS = 7; |
| 31 | 31 |
|
| 32 |
Dynamic mDynamic0,mDynamic1;
|
|
| 32 |
Dynamic mDynamic0; |
|
| 33 | 33 |
Static mStatic0 , mStatic1; |
| 34 | 34 |
Dynamic3D mDynamicCenter; |
| 35 | 35 |
Static3D mStaticCenter; |
| src/main/java/org/distorted/library/effect/VertexEffectDeform.java | ||
|---|---|---|
| 61 | 61 |
mDynamicCenter = (Dynamic3D)center; |
| 62 | 62 |
} |
| 63 | 63 |
|
| 64 |
if( region instanceof Static4D)
|
|
| 64 |
if( region == null )
|
|
| 65 | 65 |
{
|
| 66 |
mStaticRegion = (Static4D)region;
|
|
| 66 |
mStaticRegion = new Static4D(0,0,Float.MAX_VALUE, Float.MAX_VALUE);
|
|
| 67 | 67 |
} |
| 68 |
else if( region instanceof Dynamic4D)
|
|
| 68 |
else |
|
| 69 | 69 |
{
|
| 70 |
mDynamicRegion = (Dynamic4D)region; |
|
| 70 |
if (region instanceof Static4D) |
|
| 71 |
{
|
|
| 72 |
mStaticRegion = (Static4D) region; |
|
| 73 |
} |
|
| 74 |
else if (region instanceof Dynamic4D) |
|
| 75 |
{
|
|
| 76 |
mDynamicRegion = (Dynamic4D) region; |
|
| 77 |
} |
|
| 71 | 78 |
} |
| 72 | 79 |
} |
| 73 | 80 |
|
| src/main/java/org/distorted/library/effect/VertexEffectDistort.java | ||
|---|---|---|
| 61 | 61 |
mDynamicCenter = (Dynamic3D)center; |
| 62 | 62 |
} |
| 63 | 63 |
|
| 64 |
if( region instanceof Static4D)
|
|
| 64 |
if( region == null )
|
|
| 65 | 65 |
{
|
| 66 |
mStaticRegion = (Static4D)region;
|
|
| 66 |
mStaticRegion = new Static4D(0,0,Float.MAX_VALUE, Float.MAX_VALUE);
|
|
| 67 | 67 |
} |
| 68 |
else if( region instanceof Dynamic4D)
|
|
| 68 |
else |
|
| 69 | 69 |
{
|
| 70 |
mDynamicRegion = (Dynamic4D)region; |
|
| 70 |
if (region instanceof Static4D) |
|
| 71 |
{
|
|
| 72 |
mStaticRegion = (Static4D) region; |
|
| 73 |
} |
|
| 74 |
else if (region instanceof Dynamic4D) |
|
| 75 |
{
|
|
| 76 |
mDynamicRegion = (Dynamic4D) region; |
|
| 77 |
} |
|
| 71 | 78 |
} |
| 72 | 79 |
} |
| 73 | 80 |
|
| src/main/java/org/distorted/library/effect/VertexEffectPinch.java | ||
|---|---|---|
| 64 | 64 |
mDynamicCenter = (Dynamic3D)center; |
| 65 | 65 |
} |
| 66 | 66 |
|
| 67 |
if( region instanceof Static4D)
|
|
| 67 |
if( region == null )
|
|
| 68 | 68 |
{
|
| 69 |
mStaticRegion = (Static4D)region;
|
|
| 69 |
mStaticRegion = new Static4D(0,0,Float.MAX_VALUE, Float.MAX_VALUE);
|
|
| 70 | 70 |
} |
| 71 |
else if( region instanceof Dynamic4D)
|
|
| 71 |
else |
|
| 72 | 72 |
{
|
| 73 |
mDynamicRegion = (Dynamic4D)region; |
|
| 73 |
if (region instanceof Static4D) |
|
| 74 |
{
|
|
| 75 |
mStaticRegion = (Static4D) region; |
|
| 76 |
} |
|
| 77 |
else if (region instanceof Dynamic4D) |
|
| 78 |
{
|
|
| 79 |
mDynamicRegion = (Dynamic4D) region; |
|
| 80 |
} |
|
| 74 | 81 |
} |
| 75 | 82 |
} |
| 76 | 83 |
|
| src/main/java/org/distorted/library/effect/VertexEffectSink.java | ||
|---|---|---|
| 64 | 64 |
mDynamicCenter = (Dynamic3D)center; |
| 65 | 65 |
} |
| 66 | 66 |
|
| 67 |
if( region instanceof Static4D)
|
|
| 67 |
if( region == null )
|
|
| 68 | 68 |
{
|
| 69 |
mStaticRegion = (Static4D)region;
|
|
| 69 |
mStaticRegion = new Static4D(0,0,Float.MAX_VALUE, Float.MAX_VALUE);
|
|
| 70 | 70 |
} |
| 71 |
else if( region instanceof Dynamic4D)
|
|
| 71 |
else |
|
| 72 | 72 |
{
|
| 73 |
mDynamicRegion = (Dynamic4D)region; |
|
| 73 |
if (region instanceof Static4D) |
|
| 74 |
{
|
|
| 75 |
mStaticRegion = (Static4D) region; |
|
| 76 |
} |
|
| 77 |
else if (region instanceof Dynamic4D) |
|
| 78 |
{
|
|
| 79 |
mDynamicRegion = (Dynamic4D) region; |
|
| 80 |
} |
|
| 74 | 81 |
} |
| 75 | 82 |
} |
| 76 | 83 |
|
| src/main/java/org/distorted/library/effect/VertexEffectSwirl.java | ||
|---|---|---|
| 63 | 63 |
mDynamicCenter = (Dynamic3D)center; |
| 64 | 64 |
} |
| 65 | 65 |
|
| 66 |
if( region instanceof Static4D)
|
|
| 66 |
if( region == null )
|
|
| 67 | 67 |
{
|
| 68 |
mStaticRegion = (Static4D)region;
|
|
| 68 |
mStaticRegion = new Static4D(0,0,Float.MAX_VALUE, Float.MAX_VALUE);
|
|
| 69 | 69 |
} |
| 70 |
else if( region instanceof Dynamic4D)
|
|
| 70 |
else |
|
| 71 | 71 |
{
|
| 72 |
mDynamicRegion = (Dynamic4D)region; |
|
| 72 |
if (region instanceof Static4D) |
|
| 73 |
{
|
|
| 74 |
mStaticRegion = (Static4D) region; |
|
| 75 |
} |
|
| 76 |
else if (region instanceof Dynamic4D) |
|
| 77 |
{
|
|
| 78 |
mDynamicRegion = (Dynamic4D) region; |
|
| 79 |
} |
|
| 73 | 80 |
} |
| 74 | 81 |
} |
| 75 | 82 |
|
| src/main/java/org/distorted/library/effect/VertexEffectWave.java | ||
|---|---|---|
| 116 | 116 |
mDynamicCenter = (Dynamic3D)center; |
| 117 | 117 |
} |
| 118 | 118 |
|
| 119 |
if( region instanceof Static4D)
|
|
| 119 |
if( region == null )
|
|
| 120 | 120 |
{
|
| 121 |
mStaticRegion = (Static4D)region;
|
|
| 121 |
mStaticRegion = new Static4D(0,0,Float.MAX_VALUE, Float.MAX_VALUE);
|
|
| 122 | 122 |
} |
| 123 |
else if( region instanceof Dynamic4D)
|
|
| 123 |
else |
|
| 124 | 124 |
{
|
| 125 |
mDynamicRegion = (Dynamic4D)region; |
|
| 125 |
if (region instanceof Static4D) |
|
| 126 |
{
|
|
| 127 |
mStaticRegion = (Static4D) region; |
|
| 128 |
} |
|
| 129 |
else if (region instanceof Dynamic4D) |
|
| 130 |
{
|
|
| 131 |
mDynamicRegion = (Dynamic4D) region; |
|
| 132 |
} |
|
| 126 | 133 |
} |
| 127 | 134 |
} |
| 128 | 135 |
|
Also available in: Unified diff
Bugfix in Effect regions.