Revision 26a4e5f6
Added by Leszek Koltunski almost 7 years ago
| src/main/java/org/distorted/library/main/EffectQueue.java | ||
|---|---|---|
| 25 | 25 |
import org.distorted.library.message.EffectListener; |
| 26 | 26 |
import org.distorted.library.message.EffectMessage; |
| 27 | 27 |
|
| 28 |
import java.util.Vector;
|
|
| 28 |
import java.util.ArrayList;
|
|
| 29 | 29 |
|
| 30 | 30 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 31 | 31 |
|
| 32 |
abstract class EffectQueue |
|
| 32 |
abstract class EffectQueue implements DistortedSlave
|
|
| 33 | 33 |
{
|
| 34 |
protected byte mNumEffects; |
|
| 34 |
private static final int ATTACH = 0; |
|
| 35 |
private static final int DETACH = 1; |
|
| 36 |
private static final int DETALL = 2; |
|
| 37 |
|
|
| 38 |
protected int mNumEffects; |
|
| 35 | 39 |
protected float[] mUniforms; |
| 36 | 40 |
protected long[] mCurrentDuration; |
| 37 | 41 |
protected Effect[] mEffects; |
| 38 | 42 |
protected int[] mName; |
| 39 | 43 |
protected long mTime=0; |
| 40 | 44 |
protected static int[] mMax = new int[EffectType.LENGTH]; |
| 41 |
protected Vector<EffectListener> mListeners =null;
|
|
| 45 |
protected ArrayList<EffectListener> mListeners =null;
|
|
| 42 | 46 |
protected int mNumListeners=0; // ==mListeners.length(), but we only create mListeners if the first one gets added |
| 43 | 47 |
protected long mDistortedEffectsID; |
| 44 | 48 |
|
| 49 |
private ArrayList<DistortedNode> mNodes = null; |
|
| 50 |
private long mID; |
|
| 51 |
private int mNumEffectsToBe; // this will be more than mNumEffects if doWork hasn't really added them yet |
|
| 45 | 52 |
private static boolean mCreated; |
| 46 | 53 |
private int mIndex; |
| 47 | 54 |
private int mNumUniforms; |
| 48 | 55 |
|
| 56 |
private class Job |
|
| 57 |
{
|
|
| 58 |
int type; |
|
| 59 |
int index; |
|
| 60 |
boolean notify; |
|
| 61 |
Effect effect; |
|
| 62 |
|
|
| 63 |
Job(int t, int i, boolean n, Effect e) |
|
| 64 |
{
|
|
| 65 |
type = t; |
|
| 66 |
index = i; |
|
| 67 |
notify= n; |
|
| 68 |
effect= e; |
|
| 69 |
} |
|
| 70 |
} |
|
| 71 |
|
|
| 72 |
private ArrayList<Job> mJobs = new ArrayList<>(); |
|
| 73 |
|
|
| 49 | 74 |
static |
| 50 | 75 |
{
|
| 51 | 76 |
onDestroy(); |
| ... | ... | |
| 55 | 80 |
|
| 56 | 81 |
EffectQueue(long id, int numUniforms, int index) |
| 57 | 82 |
{
|
| 83 |
mID = 0; |
|
| 58 | 84 |
mNumEffects = 0; |
| 85 |
mNumEffectsToBe = 0; |
|
| 59 | 86 |
mDistortedEffectsID = id; |
| 60 | 87 |
mIndex = index; |
| 61 | 88 |
mNumUniforms = numUniforms; |
| ... | ... | |
| 73 | 100 |
mCreated = true; |
| 74 | 101 |
} |
| 75 | 102 |
|
| 103 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
| 104 |
// TODO: introduce a Map to return an ID dependant on all Effects in the Queue. |
|
| 105 |
// For now this is good enough. |
|
| 106 |
|
|
| 107 |
private void regenerateID() |
|
| 108 |
{
|
|
| 109 |
mID = mNumEffects>0 ? mEffects[0].getID() : 0; |
|
| 110 |
} |
|
| 111 |
|
|
| 112 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
| 113 |
|
|
| 114 |
void newNode(DistortedNode node) |
|
| 115 |
{
|
|
| 116 |
if( mNodes==null ) mNodes = new ArrayList<>(); |
|
| 117 |
|
|
| 118 |
mNodes.add(node); |
|
| 119 |
} |
|
| 120 |
|
|
| 76 | 121 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 77 | 122 |
|
| 78 | 123 |
@SuppressWarnings("unused")
|
| ... | ... | |
| 82 | 127 |
} |
| 83 | 128 |
|
| 84 | 129 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 85 |
// Only max Byte.MAX_VALUE concurrent effects per DistortedEffects object. |
|
| 86 |
// If you want more, change type of the mNumEffects, mIDIndex and mFreeIndexes variables to shorts. |
|
| 87 |
// (although probably this many uniforms will not fit in the shaders anyway!) |
|
| 130 |
|
|
| 131 |
long getID() |
|
| 132 |
{
|
|
| 133 |
return mID; |
|
| 134 |
} |
|
| 135 |
|
|
| 136 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
| 88 | 137 |
|
| 89 | 138 |
static boolean setMax(int index, int m) |
| 90 | 139 |
{
|
| 91 | 140 |
if( (!mCreated && !Distorted.isInitialized()) || m<=mMax[index] ) |
| 92 | 141 |
{
|
| 93 |
if( m<0 ) m = 0; |
|
| 94 |
else if( m>Byte.MAX_VALUE ) m = Byte.MAX_VALUE; |
|
| 95 |
|
|
| 96 |
mMax[index] = m; |
|
| 142 |
mMax[index] = m<0 ? 0:m; |
|
| 97 | 143 |
return true; |
| 98 | 144 |
} |
| 99 | 145 |
|
| ... | ... | |
| 111 | 157 |
|
| 112 | 158 |
void registerForMessages(EffectListener el) |
| 113 | 159 |
{
|
| 114 |
if( mListeners==null ) mListeners = new Vector<>(2,2);
|
|
| 160 |
if( mListeners==null ) mListeners = new ArrayList<>();
|
|
| 115 | 161 |
|
| 116 | 162 |
if( !mListeners.contains(el) ) |
| 117 | 163 |
{
|
| ... | ... | |
| 139 | 185 |
} |
| 140 | 186 |
|
| 141 | 187 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 188 |
// this assumes 0<=effect<mNumEffects |
|
| 142 | 189 |
|
| 143 |
synchronized int removeByName(EffectName name)
|
|
| 190 |
protected void remove(int effect)
|
|
| 144 | 191 |
{
|
| 145 |
int ret = 0; |
|
| 192 |
mNumEffects--; |
|
| 193 |
|
|
| 194 |
long removedID = mEffects[effect].getID(); |
|
| 195 |
|
|
| 196 |
for(int j=effect; j<mNumEffects; j++ ) |
|
| 197 |
{
|
|
| 198 |
mEffects[j] = mEffects[j+1]; |
|
| 199 |
mCurrentDuration[j] = mCurrentDuration[j+1]; |
|
| 200 |
mName[j] = mName[j+1]; |
|
| 201 |
|
|
| 202 |
for(int k=0; k<mNumUniforms; k++) |
|
| 203 |
mUniforms[mNumUniforms*j+k] = mUniforms[mNumUniforms*(j+1)+k]; |
|
| 204 |
} |
|
| 205 |
|
|
| 206 |
mEffects[mNumEffects] = null; |
|
| 207 |
|
|
| 208 |
for(int i=0; i<mNumListeners; i++) |
|
| 209 |
EffectMessageSender.newMessage( mListeners.get(i), EffectMessage.EFFECT_REMOVED, removedID, mDistortedEffectsID); |
|
| 210 |
} |
|
| 146 | 211 |
|
| 212 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
| 213 |
|
|
| 214 |
synchronized int removeByName(EffectName name) |
|
| 215 |
{
|
|
| 147 | 216 |
for(int i=0; i<mNumEffects; i++) |
| 148 | 217 |
{
|
| 149 | 218 |
if( mEffects[i].getName() == name ) |
| 150 | 219 |
{
|
| 151 |
remove(i); |
|
| 152 |
i--; |
|
| 153 |
ret++; |
|
| 220 |
mJobs.add(new Job(DETACH,i,true,null)); |
|
| 221 |
DistortedMaster.newSlave(this); |
|
| 222 |
mNumEffectsToBe--; |
|
| 223 |
return 1; |
|
| 154 | 224 |
} |
| 155 | 225 |
} |
| 156 | 226 |
|
| 157 |
return ret;
|
|
| 227 |
return 0;
|
|
| 158 | 228 |
} |
| 159 | 229 |
|
| 160 | 230 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 161 | 231 |
|
| 162 | 232 |
synchronized int removeById(long id) |
| 163 | 233 |
{
|
| 164 |
int ret = 0; |
|
| 165 |
|
|
| 166 | 234 |
for(int i=0; i<mNumEffects; i++) |
| 167 | 235 |
{
|
| 168 | 236 |
if( mEffects[i].getID() == id ) |
| 169 | 237 |
{
|
| 170 |
remove(i); |
|
| 171 |
i--; |
|
| 172 |
ret++; |
|
| 238 |
mJobs.add(new Job(DETACH,i,true,null)); |
|
| 239 |
DistortedMaster.newSlave(this); |
|
| 240 |
mNumEffectsToBe--; |
|
| 241 |
return 1; |
|
| 173 | 242 |
} |
| 174 | 243 |
} |
| 175 | 244 |
|
| 176 |
return ret;
|
|
| 245 |
return 0;
|
|
| 177 | 246 |
} |
| 178 | 247 |
|
| 179 | 248 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 180 | 249 |
|
| 181 | 250 |
synchronized int removeEffect(Effect effect) |
| 182 | 251 |
{
|
| 183 |
int ret = 0; |
|
| 184 |
|
|
| 185 | 252 |
for(int i=0; i<mNumEffects; i++) |
| 186 | 253 |
{
|
| 187 | 254 |
if( mEffects[i]==effect ) |
| 188 | 255 |
{
|
| 189 |
remove(i); |
|
| 190 |
i--; |
|
| 191 |
ret++; |
|
| 256 |
mJobs.add(new Job(DETACH,i,true,null)); |
|
| 257 |
DistortedMaster.newSlave(this); |
|
| 258 |
mNumEffectsToBe--; |
|
| 259 |
return 1; |
|
| 192 | 260 |
} |
| 193 | 261 |
} |
| 194 | 262 |
|
| 195 |
return ret;
|
|
| 263 |
return 0;
|
|
| 196 | 264 |
} |
| 197 | 265 |
|
| 198 | 266 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| ... | ... | |
| 201 | 269 |
|
| 202 | 270 |
synchronized int abortAll(boolean notify) |
| 203 | 271 |
{
|
| 204 |
int ret = mNumEffects; |
|
| 272 |
mJobs.add(new Job(DETALL,0,notify,null)); |
|
| 273 |
DistortedMaster.newSlave(this); |
|
| 274 |
mNumEffectsToBe = 0; |
|
| 275 |
return mNumEffects; |
|
| 276 |
} |
|
| 205 | 277 |
|
| 206 |
for(int i=0; i<ret; i++ ) |
|
| 278 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
| 279 |
|
|
| 280 |
boolean add(Effect effect) |
|
| 281 |
{
|
|
| 282 |
if( mMax[mIndex]>mNumEffectsToBe ) |
|
| 207 | 283 |
{
|
| 208 |
if( notify ) |
|
| 209 |
{
|
|
| 210 |
for(int j=0; j<mNumListeners; j++) |
|
| 211 |
EffectMessageSender.newMessage( mListeners.elementAt(j), EffectMessage.EFFECT_REMOVED, mEffects[i].getID(), mDistortedEffectsID); |
|
| 212 |
} |
|
| 284 |
//android.util.Log.e("queue", "scheduling future add of "+effect.getName().name()+" to "+mNumEffectsToBe+" id="+effect.getID());
|
|
| 285 |
//android.util.Log.e("queue", "queue id="+mDistortedEffectsID);
|
|
| 213 | 286 |
|
| 214 |
mEffects[i] = null; |
|
| 287 |
mJobs.add(new Job(ATTACH,mNumEffectsToBe,false,effect)); |
|
| 288 |
DistortedMaster.newSlave(this); |
|
| 289 |
mNumEffectsToBe++; |
|
| 290 |
return true; |
|
| 215 | 291 |
} |
| 216 | 292 |
|
| 217 |
mNumEffects= 0; |
|
| 218 |
|
|
| 219 |
return ret; |
|
| 293 |
return false; |
|
| 220 | 294 |
} |
| 221 | 295 |
|
| 222 | 296 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 223 |
// this assumes 0<=effect<mNumEffects |
|
| 224 |
|
|
| 225 |
protected void remove(int effect) |
|
| 297 |
/** |
|
| 298 |
* This is not really part of the public API. Has to be public only because it is a part of the |
|
| 299 |
* DistortedSlave interface, which should really be a class that we extend here instead but |
|
| 300 |
* Java has no multiple inheritance. |
|
| 301 |
* |
|
| 302 |
* @y.exclude |
|
| 303 |
*/ |
|
| 304 |
public void doWork() |
|
| 226 | 305 |
{
|
| 227 |
mNumEffects--; |
|
| 306 |
int num = mJobs.size(); |
|
| 307 |
Job job; |
|
| 228 | 308 |
|
| 229 |
long removedID = mEffects[effect].getID(); |
|
| 230 |
|
|
| 231 |
for(int j=effect; j<mNumEffects; j++ ) |
|
| 309 |
for(int i=0; i<num; i++) |
|
| 232 | 310 |
{
|
| 233 |
mEffects[j] = mEffects[j+1]; |
|
| 234 |
mCurrentDuration[j] = mCurrentDuration[j+1]; |
|
| 235 |
mName[j] = mName[j+1]; |
|
| 311 |
job = mJobs.remove(0); |
|
| 236 | 312 |
|
| 237 |
for(int k=0; k<mNumUniforms; k++) |
|
| 238 |
mUniforms[mNumUniforms*j+k] = mUniforms[mNumUniforms*(j+1)+k]; |
|
| 313 |
switch(job.type) |
|
| 314 |
{
|
|
| 315 |
case ATTACH: android.util.Log.e("queue", "DistortedEffects ID: "+mDistortedEffectsID+" bank:"+job.index+
|
|
| 316 |
" attaching effectID="+job.effect.getID()+" ("+job.effect.getName().name()+")");
|
|
| 317 |
|
|
| 318 |
mCurrentDuration[job.index] = 0; |
|
| 319 |
mEffects[job.index] = job.effect; |
|
| 320 |
mName[job.index] = job.effect.getName().ordinal(); |
|
| 321 |
mNumEffects++; |
|
| 322 |
break; |
|
| 323 |
case DETACH: remove(job.index); |
|
| 324 |
break; |
|
| 325 |
case DETALL: for(int j=0; j<mNumEffects; j++ ) |
|
| 326 |
{
|
|
| 327 |
if( job.notify ) |
|
| 328 |
{
|
|
| 329 |
for(int k=0; k<mNumListeners; k++) |
|
| 330 |
EffectMessageSender.newMessage( mListeners.get(k), EffectMessage.EFFECT_REMOVED, mEffects[j].getID(), mDistortedEffectsID); |
|
| 331 |
} |
|
| 332 |
|
|
| 333 |
mEffects[j] = null; |
|
| 334 |
} |
|
| 335 |
|
|
| 336 |
mNumEffects= 0; |
|
| 337 |
break; |
|
| 338 |
} |
|
| 239 | 339 |
} |
| 240 |
|
|
| 241 |
mEffects[mNumEffects] = null; |
|
| 242 | 340 |
|
| 243 |
for(int i=0; i<mNumListeners; i++) |
|
| 244 |
EffectMessageSender.newMessage( mListeners.elementAt(i), EffectMessage.EFFECT_REMOVED, removedID, mDistortedEffectsID); |
|
| 245 |
} |
|
| 246 |
|
|
| 247 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
| 248 |
|
|
| 249 |
boolean add(Effect effect) |
|
| 250 |
{
|
|
| 251 |
if( mMax[mIndex]>mNumEffects ) |
|
| 341 |
if( num>0 ) |
|
| 252 | 342 |
{
|
| 253 |
mCurrentDuration[mNumEffects] = 0; |
|
| 254 |
mEffects[mNumEffects] = effect; |
|
| 255 |
mName[mNumEffects] = effect.getName().ordinal(); |
|
| 256 |
mNumEffects++; |
|
| 257 |
return true; |
|
| 258 |
} |
|
| 343 |
regenerateID(); |
|
| 259 | 344 |
|
| 260 |
return false; |
|
| 345 |
if( mIndex==EffectType.POSTPROCESS.ordinal() ) |
|
| 346 |
{
|
|
| 347 |
int numNodes = (mNodes==null ? 0: mNodes.size()); |
|
| 348 |
|
|
| 349 |
for(int i=0; i<numNodes; i++) |
|
| 350 |
{
|
|
| 351 |
mNodes.get(i).sort(); |
|
| 352 |
} |
|
| 353 |
} |
|
| 354 |
} |
|
| 261 | 355 |
} |
| 262 | 356 |
} |
Also available in: Unified diff
Reorganize the way we add and remove all Effects (do it through DistortedMaster and is POSTPROCES - adjust Bucket and SORT Nodes).
Buggy: removing effects does not work.