Project

General

Profile

« Previous | Next » 

Revision 1e438fc7

Added by Leszek Koltunski almost 8 years ago

Introduce ENUM EffectTypes

View differences:

src/main/java/org/distorted/library/EffectListFragment.java
6 6

  
7 7
class EffectListFragment extends EffectList
8 8
  {
9
  private static final int NUM_UNIFORMS = 9; 
9
  private static final int NUM_UNIFORMS = 9;
10
  private static final int INDEX = EffectTypes.FRAGMENT.ordinal();
10 11
  private float[] mBuf;
11 12
  private static int mNumEffectsH;
12 13
  private static int mTypeH;
......
16 17
   
17 18
  public EffectListFragment(DistortedObject obj)
18 19
    { 
19
    super(obj,NUM_UNIFORMS,FRAGMENT);
20
    super(obj,NUM_UNIFORMS,INDEX);
20 21
   
21
    if( mMax[FRAGMENT]>0 )
22
    if( mMax[INDEX]>0 )
22 23
      {
23
      mBuf= new float[4*mMax[FRAGMENT]];
24
      mBuf= new float[4*mMax[INDEX]];
24 25
      }
25 26
    }
26 27
  
......
30 31
  
31 32
  static boolean setMax(int m)
32 33
    {
33
    if( (mCreated==false && !Distorted.isInitialized()) || m<=mMax[FRAGMENT] ) 
34
    if( (mCreated==false && !Distorted.isInitialized()) || m<=mMax[INDEX] )
34 35
      {
35 36
           if( m<0              ) m = 0;
36 37
      else if( m>Byte.MAX_VALUE ) m = Byte.MAX_VALUE;
37 38
      
38
      mMax[FRAGMENT] = m;
39
      mMax[INDEX] = m;
39 40
      return true;
40 41
      }
41 42
   
......
46 47

  
47 48
  static int getMax()
48 49
    {
49
    return mMax[FRAGMENT];
50
    return mMax[INDEX];
50 51
    }
51 52

  
52 53
///////////////////////////////////////////////////////////////////////////////////////////////////
......
77 78
        for(int j=0; j<mNumListeners; j++)   
78 79
          EffectMessageSender.newMessage( mListeners.elementAt(j),
79 80
                                          EffectMessage.EFFECT_FINISHED, 
80
                                          (mID[i]<<DistortedObject.TYPE_NUM)+Distorted.TYPE_FRAG, 
81
                                          (mID[i]<<EffectTypes.LENGTH)+EffectTypes.FRAGMENT.type,
81 82
                                          mType[i], 
82 83
                                          mBitmapID); 
83 84
      
......
167 168
       
168 169
  synchronized long add(EffectNames eln, Interpolator inter, Float4D region, Interpolator2D point)
169 170
    {
170
    if( mMax[FRAGMENT]>mNumEffects )
171
    if( mMax[INDEX]>mNumEffects )
171 172
      {
172 173
      EffectNames.fillWithUnities(eln.ordinal(), mUniforms, NUM_UNIFORMS*mNumEffects); 
173 174
      mInterI[mNumEffects] = inter;
......
185 186

  
186 187
  synchronized long add(EffectNames eln, Interpolator inter, Float4D region, float x, float y)
187 188
    {
188
    if( mMax[FRAGMENT]>mNumEffects )
189
    if( mMax[INDEX]>mNumEffects )
189 190
      {
190 191
      EffectNames.fillWithUnities(eln.ordinal(), mUniforms, NUM_UNIFORMS*mNumEffects);    
191 192
      mInterI[mNumEffects] = inter;
......
205 206
       
206 207
  synchronized long add(EffectNames eln, Interpolator1D inter, Float3D c, Float4D region, Interpolator2D point)
207 208
    {
208
    if( mMax[FRAGMENT]>mNumEffects )
209
    if( mMax[INDEX]>mNumEffects )
209 210
      {
210 211
      mInterI[mNumEffects] = inter;
211 212
      mInterP[mNumEffects] = point;
......
226 227

  
227 228
  synchronized long add(EffectNames eln, Interpolator1D inter, Float3D c, Float4D region, float x, float y)
228 229
    {
229
    if( mMax[FRAGMENT]>mNumEffects )
230
    if( mMax[INDEX]>mNumEffects )
230 231
      {
231 232
      mInterI[mNumEffects] = inter;
232 233
      mInterP[mNumEffects] = null;
......
249 250
       
250 251
  synchronized long add(EffectNames eln, float t, Float3D c, Float4D region, Interpolator2D point)
251 252
    {
252
    if( mMax[FRAGMENT]>mNumEffects )
253
    if( mMax[INDEX]>mNumEffects )
253 254
      {
254 255
      mInterI[mNumEffects] = null;
255 256
      mInterP[mNumEffects] = point;
......
271 272

  
272 273
  synchronized long add(EffectNames eln, float t, Float3D c, Float4D region, float x, float y)
273 274
    {
274
    if( mMax[FRAGMENT]>mNumEffects )
275
    if( mMax[INDEX]>mNumEffects )
275 276
      {
276 277
      mInterI[mNumEffects] = null;
277 278
      mInterP[mNumEffects] = null;

Also available in: Unified diff