Project

General

Profile

« Previous | Next » 

Revision 15aa7d94

Added by Leszek Koltunski almost 7 years ago

Progress with support for Effect classes.

View differences:

src/main/java/org/distorted/library/main/EffectQueueFragment.java
24 24
import org.distorted.library.effect.Effect;
25 25
import org.distorted.library.effect.FragmentEffect;
26 26
import org.distorted.library.message.EffectMessage;
27
import org.distorted.library.type.Dynamic4D;
28
import org.distorted.library.type.Static;
29
import org.distorted.library.type.Static1D;
30
import org.distorted.library.type.Static2D;
31
import org.distorted.library.type.Static3D;
32
import org.distorted.library.type.Static4D;
33
import org.distorted.library.type.Static5D;
34 27

  
35 28
///////////////////////////////////////////////////////////////////////////////////////////////////
36 29

  
37 30
class EffectQueueFragment extends EffectQueue
38 31
  {
39
  private static final int NUM_UNIFORMS = 8;
40
  private static final int NUM_CACHE    = 4;
32
  private static final int NUM_UNIFORMS = FragmentEffect.NUM_UNIFORMS;
41 33
  private static final int INDEX = Effect.FRAGMENT;
42 34
  private static int mNumEffectsH;
43
  private static int mTypeH;
35
  private static int mNameH;
44 36
  private static int mUniformsH;
45 37
  
46 38
///////////////////////////////////////////////////////////////////////////////////////////////////
47 39
   
48 40
  EffectQueueFragment(long id)
49 41
    { 
50
    super(id,NUM_UNIFORMS,NUM_CACHE,INDEX);
42
    super(id,NUM_UNIFORMS,INDEX);
51 43
    }
52 44

  
53 45
///////////////////////////////////////////////////////////////////////////////////////////////////
......
55 47
  static void getUniforms(int mProgramH)
56 48
    {
57 49
    mNumEffectsH= GLES30.glGetUniformLocation( mProgramH, "fNumEffects");
58
    mTypeH      = GLES30.glGetUniformLocation( mProgramH, "fType");
50
    mNameH      = GLES30.glGetUniformLocation( mProgramH, "fName");
59 51
    mUniformsH  = GLES30.glGetUniformLocation( mProgramH, "fUniforms");
60 52
    }
61 53

  
......
66 58
    if( currTime==mTime ) return;
67 59
    if( mTime==0 ) mTime = currTime;
68 60
    long step = (currTime-mTime);
69
   
61

  
70 62
    for(int i=0; i<mNumEffects; i++)
71 63
      {
72 64
      mCurrentDuration[i] += step;
73 65

  
74
      if( mInter[0][i]!=null && mInter[0][i].interpolateMain(mUniforms ,NUM_UNIFORMS*i, mCurrentDuration[i], step) )
66
      if( mEffects[i].compute(mUniforms, NUM_UNIFORMS*i, mCurrentDuration[i], step) )
75 67
        {
76
        for(int j=0; j<mNumListeners; j++)   
77
          EffectMessageSender.newMessage( mListeners.elementAt(j),
78
                                          EffectMessage.EFFECT_FINISHED,
79
                                          (mID[i]<<Effect.LENGTH)+Effect.FRAGMENT,
80
                                          mName[i],
81
                                          mObjectID);
82
      
83
        if( FragmentEffect.isUnity(mName[i], mUniforms, NUM_UNIFORMS*i) )
84
          {
85
          remove(i);
86
          i--;
87
          continue;
88
          }
89
        else mInter[0][i] = null;
90
        }
68
        for(int j=0; j<mNumListeners; j++)
69
          EffectMessageSender.newMessage( mListeners.elementAt(j), EffectMessage.EFFECT_FINISHED, mEffects[i].getID(), mID);
91 70

  
92
      if( mInter[1][i]!=null ) mInter[2][i].interpolateMain( mUniforms, NUM_UNIFORMS*i+1, mCurrentDuration[i], step);
93
      if( mInter[2][i]!=null ) mInter[1][i].interpolateMain( mCache   , NUM_CACHE*i     , mCurrentDuration[i], step);
71
        if( FragmentEffect.isUnity( mEffects[i].getName(), mUniforms, NUM_UNIFORMS*i) )
72
          remove(i--);
73
        }
94 74
      }
95
   
75

  
96 76
    mTime = currTime;  
97 77
    }
98 78

  
99
///////////////////////////////////////////////////////////////////////////////////////////////////
100

  
101
  protected void moveEffect(int index)
102
    {
103
    mUniforms[NUM_UNIFORMS*index  ] = mUniforms[NUM_UNIFORMS*(index+1)  ];
104
    mUniforms[NUM_UNIFORMS*index+1] = mUniforms[NUM_UNIFORMS*(index+1)+1];
105
    mUniforms[NUM_UNIFORMS*index+2] = mUniforms[NUM_UNIFORMS*(index+1)+2];
106
    mUniforms[NUM_UNIFORMS*index+3] = mUniforms[NUM_UNIFORMS*(index+1)+3];
107

  
108
    mCache[NUM_CACHE*index  ] = mCache[NUM_CACHE*(index+1)  ];
109
    mCache[NUM_CACHE*index+1] = mCache[NUM_CACHE*(index+1)+1];
110
    mCache[NUM_CACHE*index+2] = mCache[NUM_CACHE*(index+1)+2];
111
    mCache[NUM_CACHE*index+3] = mCache[NUM_CACHE*(index+1)+3];
112
    }
113
  
114 79
///////////////////////////////////////////////////////////////////////////////////////////////////
115 80
  
116 81
  synchronized void send(float halfX, float halfY)
......
121 86
      {
122 87
      for(int i=0; i<mNumEffects; i++)
123 88
        {
124
        mUniforms[NUM_UNIFORMS*i+4] = mCache[NUM_CACHE*i  ]-halfX;
125
        mUniforms[NUM_UNIFORMS*i+5] =-mCache[NUM_CACHE*i+1]+halfY;
126
        mUniforms[NUM_UNIFORMS*i+6] = mCache[NUM_CACHE*i+2];
127
        mUniforms[NUM_UNIFORMS*i+7] = mCache[NUM_CACHE*i+3];
89
        mUniforms[NUM_UNIFORMS*i+4] = mUniforms[NUM_UNIFORMS*i+4]-halfX;
90
        mUniforms[NUM_UNIFORMS*i+5] =-mUniforms[NUM_UNIFORMS*i+5]+halfY;
128 91
        }
129 92

  
130
      GLES30.glUniform1iv( mTypeH    ,                 mNumEffects, mName    ,0);
93
      GLES30.glUniform1iv( mNameH    ,                 mNumEffects, mName    ,0);
131 94
      GLES30.glUniform4fv( mUniformsH,(NUM_UNIFORMS/4)*mNumEffects, mUniforms,0);
132 95
      }  
133 96
    }
134

  
135
///////////////////////////////////////////////////////////////////////////////////////////////////
136

  
137
  synchronized long add(FragmentEffect fe)
138
    {
139
    if( mMax[INDEX]>mNumEffects )
140
      {
141
      int dim0 = 0;
142

  
143
      if( fe.mDynamic0 != null )
144
        {
145
        mInter[0][mNumEffects] = fe.mDynamic0;
146
        dim0 = fe.mDynamic0.getDimension();
147
        }
148
      else
149
        {
150
        mInter[0][mNumEffects] = null;
151

  
152
        if( fe.mStatic0 != null )
153
          {
154
          Static s = fe.mStatic0;
155
          dim0 = s.getDimension();
156

  
157
          switch( dim0 )
158
            {
159
            case 5 : mUniforms[NUM_UNIFORMS*mNumEffects + 4] = ((Static5D)s).getV();
160
            case 4 : mUniforms[NUM_UNIFORMS*mNumEffects + 3] = ((Static4D)s).getW();
161
            case 3 : mUniforms[NUM_UNIFORMS*mNumEffects + 2] = ((Static3D)s).getZ();
162
            case 2 : mUniforms[NUM_UNIFORMS*mNumEffects + 1] = ((Static2D)s).getY();
163
            case 1 : mUniforms[NUM_UNIFORMS*mNumEffects    ] = ((Static1D)s).getX();
164
            }
165
          }
166
        }
167

  
168
      if( fe.mDynamic1 != null )
169
        {
170
        mInter[1][mNumEffects] = fe.mDynamic1;
171
        }
172
      else
173
        {
174
        mInter[1][mNumEffects] = null;
175

  
176
        if( fe.mStatic1 != null )
177
          {
178
          Static s = fe.mStatic1;
179
          int dim1 = s.getDimension();
180

  
181
          switch( dim1 )
182
            {
183
            case 5 : mUniforms[NUM_UNIFORMS*mNumEffects + dim0 + 4] = ((Static5D)s).getV();
184
            case 4 : mUniforms[NUM_UNIFORMS*mNumEffects + dim0 + 3] = ((Static4D)s).getW();
185
            case 3 : mUniforms[NUM_UNIFORMS*mNumEffects + dim0 + 2] = ((Static3D)s).getZ();
186
            case 2 : mUniforms[NUM_UNIFORMS*mNumEffects + dim0 + 1] = ((Static2D)s).getY();
187
            case 1 : mUniforms[NUM_UNIFORMS*mNumEffects + dim0    ] = ((Static1D)s).getX();
188
            }
189
          }
190
        }
191

  
192
      if( fe.mRegion instanceof Dynamic4D)
193
        {
194
        mInter[2][mNumEffects] = (Dynamic4D)fe.mRegion;
195
        }
196
      else if( fe.mRegion instanceof Static4D )
197
        {
198
        mInter[2][mNumEffects]  = null;
199

  
200
        Static4D s = (Static4D)fe.mRegion;
201
        mCache[NUM_CACHE*mNumEffects  ] = s.getX();
202
        mCache[NUM_CACHE*mNumEffects+1] = s.getY();
203
        mCache[NUM_CACHE*mNumEffects+2] = s.getZ();
204
        mCache[NUM_CACHE*mNumEffects+3] = s.getW();
205
        }
206
      else return -1;
207

  
208
      return addBase(fe);
209
      }
210
      
211
    return -1;
212
    }
213 97
  }

Also available in: Unified diff