Project

General

Profile

« Previous | Next » 

Revision 936287ff

Added by Leszek Koltunski almost 7 years ago

Progress with Effect classes.

The last 10 errors in the last 2 APPs.

View differences:

src/main/java/org/distorted/examples/effects3d/Effects3DEffect.java
24 24
import android.widget.TextView;
25 25

  
26 26
import org.distorted.examples.R;
27
import org.distorted.library.effect.Effect;
27 28
import org.distorted.library.effect.EffectName;
28 29
import org.distorted.library.effect.EffectType;
30
import org.distorted.library.effect.FragmentEffectAlpha;
31
import org.distorted.library.effect.FragmentEffectBrightness;
32
import org.distorted.library.effect.FragmentEffectChroma;
33
import org.distorted.library.effect.FragmentEffectContrast;
34
import org.distorted.library.effect.FragmentEffectSaturation;
35
import org.distorted.library.effect.MatrixEffectMove;
36
import org.distorted.library.effect.MatrixEffectQuaternion;
37
import org.distorted.library.effect.MatrixEffectRotate;
38
import org.distorted.library.effect.MatrixEffectScale;
39
import org.distorted.library.effect.MatrixEffectShear;
40
import org.distorted.library.effect.VertexEffectDeform;
41
import org.distorted.library.effect.VertexEffectDistort;
42
import org.distorted.library.effect.VertexEffectPinch;
43
import org.distorted.library.effect.VertexEffectSink;
44
import org.distorted.library.effect.VertexEffectSwirl;
45
import org.distorted.library.effect.VertexEffectWave;
29 46
import org.distorted.library.main.DistortedEffects;
30 47
import org.distorted.library.type.Dynamic1D;
31 48
import org.distorted.library.type.Dynamic2D;
......
79 96

  
80 97
  void apply(DistortedEffects effects)
81 98
    {
99
    Effect effect=null;
100

  
82 101
    switch(mName)
83 102
      {
84
      case ROTATE           : mId = effects.rotate    (mDyn4, mCenterDyn); break;
85
      case QUATERNION       : mId = effects.quaternion(mDyn4, mCenterDyn); break;
86
      case MOVE             : mId = effects.move      (mDyn3)            ; break;
87
      case SCALE            : mId = effects.scale     (mDyn3)            ; break;
88
      case SHEAR            : mId = effects.shear     (mDyn3, mCenterDyn); break;
89

  
90
      case DISTORT          : mId = effects.distort   (mDyn3, mCenterDyn, mRegionDyn); break;
91
      case DEFORM           : mId = effects.deform    (mDyn3, mCenterDyn, mRegionDyn); break;
92
      case SINK             : mId = effects.sink      (mDyn1, mCenterDyn, mRegionDyn); break;
93
      case PINCH            : mId = effects.pinch     (mDyn2, mCenterDyn, mRegionDyn); break;
94
      case SWIRL            : mId = effects.swirl     (mDyn1, mCenterDyn, mRegionDyn); break;
95
      case WAVE             : mId = effects.wave      (mDyn5, mCenterDyn, mRegionDyn); break;
96

  
97
      case ALPHA            : mId = effects.alpha     (mDyn1,        mRegionDyn, false); break;
98
      case SMOOTH_ALPHA     : mId = effects.alpha     (mDyn1,        mRegionDyn, true ); break;
99
      case CHROMA           : mId = effects.chroma    (mDyn1, mDyn3, mRegionDyn, false); break;
100
      case SMOOTH_CHROMA    : mId = effects.chroma    (mDyn1, mDyn3, mRegionDyn, true ); break;
101
      case BRIGHTNESS       : mId = effects.brightness(mDyn1,        mRegionDyn, false); break;
102
      case SMOOTH_BRIGHTNESS: mId = effects.brightness(mDyn1,        mRegionDyn, true ); break;
103
      case SATURATION       : mId = effects.saturation(mDyn1,        mRegionDyn, false); break;
104
      case SMOOTH_SATURATION: mId = effects.saturation(mDyn1,        mRegionDyn, true ); break;
105
      case CONTRAST         : mId = effects.contrast  (mDyn1,        mRegionDyn, false); break;
106
      case SMOOTH_CONTRAST  : mId = effects.contrast  (mDyn1,        mRegionDyn, true ); break;
107

  
108
      default: mId = -1;
103
      case ROTATE           : effect = new MatrixEffectRotate(mDyn4, mCenterDyn); break;
104
      case QUATERNION       : effect = new MatrixEffectQuaternion(mDyn4, mCenterDyn); break;
105
      case MOVE             : effect = new MatrixEffectMove(mDyn3)            ; break;
106
      case SCALE            : effect = new MatrixEffectScale(mDyn3)            ; break;
107
      case SHEAR            : effect = new MatrixEffectShear(mDyn3, mCenterDyn); break;
108

  
109
      case DISTORT          : effect = new VertexEffectDistort(mDyn3, mCenterDyn, mRegionDyn); break;
110
      case DEFORM           : effect = new VertexEffectDeform(mDyn3, mCenterDyn, mRegionDyn); break;
111
      case SINK             : effect = new VertexEffectSink(mDyn1, mCenterDyn, mRegionDyn); break;
112
      case PINCH            : effect = new VertexEffectPinch(mDyn2, mCenterDyn, mRegionDyn); break;
113
      case SWIRL            : effect = new VertexEffectSwirl(mDyn1, mCenterDyn, mRegionDyn); break;
114
      case WAVE             : effect = new VertexEffectWave(mDyn5, mCenterDyn, mRegionDyn); break;
115

  
116
      case ALPHA            : effect = new FragmentEffectAlpha(mDyn1,        mRegionDyn, false); break;
117
      case SMOOTH_ALPHA     : effect = new FragmentEffectAlpha     (mDyn1,        mRegionDyn, true ); break;
118
      case CHROMA           : effect = new FragmentEffectChroma(mDyn1, mDyn3, mRegionDyn, false); break;
119
      case SMOOTH_CHROMA    : effect = new FragmentEffectChroma    (mDyn1, mDyn3, mRegionDyn, true ); break;
120
      case BRIGHTNESS       : effect = new FragmentEffectBrightness(mDyn1,        mRegionDyn, false); break;
121
      case SMOOTH_BRIGHTNESS: effect = new FragmentEffectBrightness(mDyn1,        mRegionDyn, true ); break;
122
      case SATURATION       : effect = new FragmentEffectSaturation(mDyn1,        mRegionDyn, false); break;
123
      case SMOOTH_SATURATION: effect = new FragmentEffectSaturation(mDyn1,        mRegionDyn, true ); break;
124
      case CONTRAST         : effect = new FragmentEffectContrast(mDyn1,        mRegionDyn, false); break;
125
      case SMOOTH_CONTRAST  : effect = new FragmentEffectContrast  (mDyn1,        mRegionDyn, true ); break;
126
      }
127

  
128
    if( effect!=null )
129
      {
130
      effects.apply(effect);
131
      mId = effect.getID();
109 132
      }
110 133
    }
111 134

  

Also available in: Unified diff