Project

General

Profile

« Previous | Next » 

Revision 26a4e5f6

Added by Leszek Koltunski almost 7 years ago

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.

View differences:

src/main/java/org/distorted/library/main/DistortedEffects.java
284 284

  
285 285
  long getBucket()
286 286
    {
287
    return mP.getBucket();
287
    return mP.getID();
288 288
    }
289 289

  
290 290
///////////////////////////////////////////////////////////////////////////////////////////////////
......
301 301
    return mP.getHalo();
302 302
    }
303 303

  
304
///////////////////////////////////////////////////////////////////////////////////////////////////
305

  
306
  void newNode(DistortedNode node)
307
    {
308
    mM.newNode(node);
309
    mF.newNode(node);
310
    mV.newNode(node);
311
    mP.newNode(node);
312
    }
313

  
304 314
///////////////////////////////////////////////////////////////////////////////////////////////////
305 315
/**
306 316
 * This is not really part of the public API. Has to be public only because it is a part of the
......
454 464
 */
455 465
  public DistortedEffects()
456 466
    {
467
    android.util.Log.e("distEffects", "constr1");
457 468
    mID = ++mNextID;
458 469
    initializeEffectLists(this,0);
459 470
    }
......
470 481
 */
471 482
  public DistortedEffects(DistortedEffects dc, int flags)
472 483
    {
484
    android.util.Log.e("distEffects", "constr2");
473 485
    mID = ++mNextID;
474 486
    initializeEffectLists(dc,flags);
475 487
    }
......
505 517
  @SuppressWarnings("unused")
506 518
  public void registerForMessages(EffectListener el)
507 519
    {
520
    mM.registerForMessages(el);
508 521
    mV.registerForMessages(el);
509 522
    mF.registerForMessages(el);
510
    mM.registerForMessages(el);
511 523
    mP.registerForMessages(el);
512 524
    }
513 525

  
......
520 532
  @SuppressWarnings("unused")
521 533
  public void deregisterForMessages(EffectListener el)
522 534
    {
535
    mM.deregisterForMessages(el);
523 536
    mV.deregisterForMessages(el);
524 537
    mF.deregisterForMessages(el);
525
    mM.deregisterForMessages(el);
526 538
    mP.deregisterForMessages(el);
527 539
    }
528 540

  
......
690 702
    {
691 703
    switch(effect.getType())
692 704
      {
705
      case MATRIX      : return mM.add(effect);
693 706
      case VERTEX      : return mV.add(effect);
694 707
      case FRAGMENT    : return mF.add(effect);
695
      case MATRIX      : return mM.add(effect);
696 708
      case POSTPROCESS : return mP.add(effect);
697 709
      }
698 710

  

Also available in: Unified diff