Project

General

Profile

« Previous | Next » 

Revision 40eef4b9

Added by Leszek Koltunski over 7 years ago

Beginnings of split of DistortedObject into two separate classes: DistortedEffectQueues and DistortedTexture.

Still does not compile, but pushing already.

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.DistortedObject;
27
import org.distorted.library.DistortedEffectQueues;
28 28
import org.distorted.library.EffectNames;
29 29
import org.distorted.library.EffectTypes;
30 30
import org.distorted.library.type.Dynamic1D;
......
77 77
///////////////////////////////////////////////////////////////////////////////////////////////////
78 78
// requires knowledge about effect nature
79 79

  
80
  void apply(DistortedObject object)
80
  void apply(DistortedEffectQueues queues)
81 81
    {
82 82
    switch(mName)
83 83
      {
84
      case ROTATE           : mId = object.rotate    (mDyn4, mCenterDyn); break;
85
      case QUATERNION       : mId = object.quaternion(mDyn4, mCenterDyn); break;
86
      case MOVE             : mId = object.move      (mDyn3)            ; break;
87
      case SCALE            : mId = object.scale     (mDyn3)            ; break;
88
      case SHEAR            : mId = object.shear     (mDyn3, mCenterDyn); break;
89

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

  
97
      case ALPHA            : mId = object.alpha     (mDyn1,        mRegionDyn, false); break;
98
      case SMOOTH_ALPHA     : mId = object.alpha     (mDyn1,        mRegionDyn, true ); break;
99
      case CHROMA           : mId = object.chroma    (mDyn1, mDyn3, mRegionDyn, false); break;
100
      case SMOOTH_CHROMA    : mId = object.chroma    (mDyn1, mDyn3, mRegionDyn, true ); break;
101
      case BRIGHTNESS       : mId = object.brightness(mDyn1,        mRegionDyn, false); break;
102
      case SMOOTH_BRIGHTNESS: mId = object.brightness(mDyn1,        mRegionDyn, true ); break;
103
      case SATURATION       : mId = object.saturation(mDyn1,        mRegionDyn, false); break;
104
      case SMOOTH_SATURATION: mId = object.saturation(mDyn1,        mRegionDyn, true ); break;
105
      case CONTRAST         : mId = object.contrast  (mDyn1,        mRegionDyn, false); break;
106
      case SMOOTH_CONTRAST  : mId = object.contrast  (mDyn1,        mRegionDyn, true ); break;
84
      case ROTATE           : mId = queues.rotate    (mDyn4, mCenterDyn); break;
85
      case QUATERNION       : mId = queues.quaternion(mDyn4, mCenterDyn); break;
86
      case MOVE             : mId = queues.move      (mDyn3)            ; break;
87
      case SCALE            : mId = queues.scale     (mDyn3)            ; break;
88
      case SHEAR            : mId = queues.shear     (mDyn3, mCenterDyn); break;
89

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

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

  
108 108
      default: mId = -1;
109 109
      }

Also available in: Unified diff