Revision cdd6333d
Added by Leszek Koltunski almost 8 years ago
| src/main/java/org/distorted/library/DistortedObject.java | ||
|---|---|---|
| 49 | 49 |
protected EffectQueueMatrix mM; |
| 50 | 50 |
protected EffectQueueFragment mF; |
| 51 | 51 |
protected EffectQueueVertex mV; |
| 52 |
protected EffectQueueOther mO; |
|
| 53 | 52 |
|
| 54 | 53 |
protected boolean matrixCloned, vertexCloned, fragmentCloned; |
| 55 | 54 |
|
| ... | ... | |
| 119 | 118 |
mF = new EffectQueueFragment(d); |
| 120 | 119 |
fragmentCloned = false; |
| 121 | 120 |
} |
| 122 |
|
|
| 123 |
mO= new EffectQueueOther(d); // Other effects are never cloned. |
|
| 124 | 121 |
} |
| 125 | 122 |
|
| 126 | 123 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| ... | ... | |
| 165 | 162 |
mF.send(); |
| 166 | 163 |
|
| 167 | 164 |
mGrid.draw(); |
| 168 |
|
|
| 169 |
mO.send(); |
|
| 170 | 165 |
} |
| 171 | 166 |
|
| 172 | 167 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| ... | ... | |
| 188 | 183 |
if( vertexCloned ==false) mV.abortAll(); |
| 189 | 184 |
if( fragmentCloned==false) mF.abortAll(); |
| 190 | 185 |
|
| 191 |
mO.abortAll(); |
|
| 192 |
|
|
| 193 | 186 |
mBmp = null; |
| 194 | 187 |
mGrid = null; |
| 195 | 188 |
mM = null; |
| 196 | 189 |
mV = null; |
| 197 | 190 |
mF = null; |
| 198 |
mO = null; |
|
| 199 | 191 |
mTextureDataH = null; |
| 200 | 192 |
} |
| 201 | 193 |
|
| ... | ... | |
| 325 | 317 |
mV.addListener(el); |
| 326 | 318 |
mF.addListener(el); |
| 327 | 319 |
mM.addListener(el); |
| 328 |
mO.addListener(el); |
|
| 329 | 320 |
} |
| 330 | 321 |
|
| 331 | 322 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| ... | ... | |
| 339 | 330 |
mV.removeListener(el); |
| 340 | 331 |
mF.removeListener(el); |
| 341 | 332 |
mM.removeListener(el); |
| 342 |
mO.removeListener(el); |
|
| 343 | 333 |
} |
| 344 | 334 |
|
| 345 | 335 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| ... | ... | |
| 393 | 383 |
*/ |
| 394 | 384 |
public int abortAllEffects() |
| 395 | 385 |
{
|
| 396 |
return mM.abortAll() + mV.abortAll() + mF.abortAll() + mO.abortAll();
|
|
| 386 |
return mM.abortAll() + mV.abortAll() + mF.abortAll(); |
|
| 397 | 387 |
} |
| 398 | 388 |
|
| 399 | 389 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| ... | ... | |
| 410 | 400 |
case MATRIX : return mM.abortAll(); |
| 411 | 401 |
case VERTEX : return mV.abortAll(); |
| 412 | 402 |
case FRAGMENT: return mF.abortAll(); |
| 413 |
case OTHER : return mO.abortAll(); |
|
| 414 | 403 |
default : return 0; |
| 415 | 404 |
} |
| 416 | 405 |
} |
| ... | ... | |
| 429 | 418 |
if( type==EffectTypes.MATRIX.type ) return mM.removeByID(id>>EffectTypes.LENGTH); |
| 430 | 419 |
if( type==EffectTypes.VERTEX.type ) return mV.removeByID(id>>EffectTypes.LENGTH); |
| 431 | 420 |
if( type==EffectTypes.FRAGMENT.type ) return mF.removeByID(id>>EffectTypes.LENGTH); |
| 432 |
if( type==EffectTypes.OTHER.type ) return mO.removeByID(id>>EffectTypes.LENGTH); |
|
| 433 | 421 |
|
| 434 | 422 |
return 0; |
| 435 | 423 |
} |
| ... | ... | |
| 448 | 436 |
case MATRIX : return mM.removeByType(name); |
| 449 | 437 |
case VERTEX : return mV.removeByType(name); |
| 450 | 438 |
case FRAGMENT: return mF.removeByType(name); |
| 451 |
case OTHER : return mO.removeByType(name); |
|
| 452 | 439 |
default : return 0; |
| 453 | 440 |
} |
| 454 | 441 |
} |
| ... | ... | |
| 468 | 455 |
if( type==EffectTypes.MATRIX.type ) return mM.printByID(id>>EffectTypes.LENGTH); |
| 469 | 456 |
if( type==EffectTypes.VERTEX.type ) return mV.printByID(id>>EffectTypes.LENGTH); |
| 470 | 457 |
if( type==EffectTypes.FRAGMENT.type ) return mF.printByID(id>>EffectTypes.LENGTH); |
| 471 |
if( type==EffectTypes.OTHER.type ) return mO.printByID(id>>EffectTypes.LENGTH); |
|
| 472 | 458 |
|
| 473 | 459 |
return false; |
| 474 | 460 |
} |
| ... | ... | |
| 2552 | 2538 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 2553 | 2539 |
// WAVE |
| 2554 | 2540 |
|
| 2555 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
| 2556 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
| 2557 |
// Other-based effects |
|
| 2558 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
| 2559 |
// SAVE_PNG |
|
| 2560 |
/** |
|
| 2561 |
* Save the current state of the Object that's backing up our DistortedObject to a PNG file. |
|
| 2562 |
* |
|
| 2563 |
* @param filename Full path to the file. |
|
| 2564 |
* @return ID of the effect added, or -1 if we failed to add one. |
|
| 2565 |
*/ |
|
| 2566 |
public long savePNG(String filename, int left, int top, int width, int height) |
|
| 2567 |
{
|
|
| 2568 |
return mO.add(EffectNames.SAVE_PNG, filename, left, top, width, height); |
|
| 2569 |
} |
|
| 2570 | 2541 |
} |
Also available in: Unified diff
Move the 'Save' effect to the Application and remove the 'OTHER' effect queue