Project

General

Profile

« Previous | Next » 

Revision fe7fe83e

Added by Leszek Koltunski almost 6 years ago

Overhaul of the Effects3D generic test app.

Still not perfect (the 'postprocess' tab does not work; things crash when we rotate)

View differences:

src/main/java/org/distorted/examples/effects3d/Effects3DEffect.java
444 444 
    switch(mDimension)
445 445 
      {
446 446 
      case 1 : mEffect    = act.getLayoutInflater().inflate(R.layout.effect1d, null);
447 
               mText      = (TextView)mEffect.findViewById(R.id.effect1dText);
448 
               seek[0]    = (SeekBar)mEffect.findViewById(R.id.effect1dbar1);
447 
               mText      = mEffect.findViewById(R.id.effect1dText);
448 
               seek[0]    = mEffect.findViewById(R.id.effect1dbar1);
449 449 
               mSeekID[0] = seek[0].getId();
450 450 
               mButton    = mEffect.findViewById(R.id.button1dRemove);
451 451 
               break;
452 452 
      case 2 : mEffect    = act.getLayoutInflater().inflate(R.layout.effect2d, null);
453 
               mText      = (TextView)mEffect.findViewById(R.id.effect2dText);
454 
               seek[0]    = (SeekBar)mEffect.findViewById(R.id.effect2dbar1);
455 
               seek[1]    = (SeekBar)mEffect.findViewById(R.id.effect2dbar2);
453 
               mText      = mEffect.findViewById(R.id.effect2dText);
454 
               seek[0]    = mEffect.findViewById(R.id.effect2dbar1);
455 
               seek[1]    = mEffect.findViewById(R.id.effect2dbar2);
456 456 
               mSeekID[0] = seek[0].getId();
457 457 
               mSeekID[1] = seek[1].getId();
458 458 
               mButton    = mEffect.findViewById(R.id.button2dRemove);
459 459 
               break;
460 460 
      case 3 : mEffect    = act.getLayoutInflater().inflate(R.layout.effect3d, null);
461 
               mText      = (TextView)mEffect.findViewById(R.id.effect3dText);
462 
               seek[0]    = (SeekBar)mEffect.findViewById(R.id.effect3dbar1);
463 
               seek[1]    = (SeekBar)mEffect.findViewById(R.id.effect3dbar2);
464 
               seek[2]    = (SeekBar)mEffect.findViewById(R.id.effect3dbar3);
461 
               mText      = mEffect.findViewById(R.id.effect3dText);
462 
               seek[0]    = mEffect.findViewById(R.id.effect3dbar1);
463 
               seek[1]    = mEffect.findViewById(R.id.effect3dbar2);
464 
               seek[2]    = mEffect.findViewById(R.id.effect3dbar3);
465 465 
               mSeekID[0] = seek[0].getId();
466 466 
               mSeekID[1] = seek[1].getId();
467 467 
               mSeekID[2] = seek[2].getId();
468 468 
               mButton    = mEffect.findViewById(R.id.button3dRemove);
469 469 
               break;
470 470 
      case 4 : mEffect    = act.getLayoutInflater().inflate(R.layout.effect4d, null);
471 
               mText      = (TextView)mEffect.findViewById(R.id.effect4dText);
472 
               seek[0]    = (SeekBar)mEffect.findViewById(R.id.effect4dbar1);
473 
               seek[1]    = (SeekBar)mEffect.findViewById(R.id.effect4dbar2);
474 
               seek[2]    = (SeekBar)mEffect.findViewById(R.id.effect4dbar3);
475 
               seek[3]    = (SeekBar)mEffect.findViewById(R.id.effect4dbar4);
471 
               mText      = mEffect.findViewById(R.id.effect4dText);
472 
               seek[0]    = mEffect.findViewById(R.id.effect4dbar1);
473 
               seek[1]    = mEffect.findViewById(R.id.effect4dbar2);
474 
               seek[2]    = mEffect.findViewById(R.id.effect4dbar3);
475 
               seek[3]    = mEffect.findViewById(R.id.effect4dbar4);
476 476 
               mSeekID[0] = seek[0].getId();
477 477 
               mSeekID[1] = seek[1].getId();
478 478 
               mSeekID[2] = seek[2].getId();
......
480 480 
               mButton    = mEffect.findViewById(R.id.button4dRemove);
481 481 
               break;
482 482 
      case 5 : mEffect    = act.getLayoutInflater().inflate(R.layout.effect5d, null);
483 
               mText      = (TextView)mEffect.findViewById(R.id.effect5dText);
484 
               seek[0]    = (SeekBar)mEffect.findViewById(R.id.effect5dbar1);
485 
               seek[1]    = (SeekBar)mEffect.findViewById(R.id.effect5dbar2);
486 
               seek[2]    = (SeekBar)mEffect.findViewById(R.id.effect5dbar3);
487 
               seek[3]    = (SeekBar)mEffect.findViewById(R.id.effect5dbar4);
488 
               seek[4]    = (SeekBar)mEffect.findViewById(R.id.effect5dbar5);
483 
               mText      = mEffect.findViewById(R.id.effect5dText);
484 
               seek[0]    = mEffect.findViewById(R.id.effect5dbar1);
485 
               seek[1]    = mEffect.findViewById(R.id.effect5dbar2);
486 
               seek[2]    = mEffect.findViewById(R.id.effect5dbar3);
487 
               seek[3]    = mEffect.findViewById(R.id.effect5dbar4);
488 
               seek[4]    = mEffect.findViewById(R.id.effect5dbar5);
489 489 
               mSeekID[0] = seek[0].getId();
490 490 
               mSeekID[1] = seek[1].getId();
491 491 
               mSeekID[2] = seek[2].getId();
......
505 505 
      seek[i].setProgress( mInter[i] );
506 506 
      }
507 507 

  		




  508
  
  
    
    act.setSupportsCenter(mName.supportsCenter());


  		




  509
  
  
    
    act.setSupportsRegion(mName.supportsRegion());


  		




  510
  
  
    

  		




  511
  508
  
    
    return mEffect;


  		




  512
  509
  
    
    }


  		




  513
  510
  
    

  		




  ......




  521
  518
  
    

  		




  522
  519
  
    
    SeekBar[] seek = new SeekBar[4];


  		




  523
  520
  
    

  		




  524
  
  
    
    seek[0] = (SeekBar)mRegion.findViewById(R.id.effectRegionBarX );


  		




  525
  
  
    
    seek[1] = (SeekBar)mRegion.findViewById(R.id.effectRegionBarY );


  		




  526
  
  
    
    seek[2] = (SeekBar)mRegion.findViewById(R.id.effectRegionBarRX);


  		




  527
  
  
    
    seek[3] = (SeekBar)mRegion.findViewById(R.id.effectRegionBarRY);


  		




  
  521
  
    
    seek[0] = mRegion.findViewById(R.id.effectRegionBarX );


  		




  
  522
  
    
    seek[1] = mRegion.findViewById(R.id.effectRegionBarY );


  		




  
  523
  
    
    seek[2] = mRegion.findViewById(R.id.effectRegionBarRX);


  		




  
  524
  
    
    seek[3] = mRegion.findViewById(R.id.effectRegionBarRY);


  		




  528
  525
  
    

  		




  529
  526
  
    
    mSeekRegionID[0] = seek[0].getId();


  		




  530
  527
  
    
    mSeekRegionID[1] = seek[1].getId();


  		




  531
  528
  
    
    mSeekRegionID[2] = seek[2].getId();


  		




  532
  529
  
    
    mSeekRegionID[3] = seek[3].getId();


  		




  533
  530
  
    

  		




  534
  
  
    
    mTextRegion = (TextView)mRegion.findViewById(R.id.effectRegionText);


  		




  
  531
  
    
    mTextRegion = mRegion.findViewById(R.id.effectRegionText);


  		




  535
  532
  
    

  		




  536
  533
  
    
    setDefaultRegionInter();


  		




  537
  534
  
    

  		




  ......




  556
  553
  
    

  		




  557
  554
  
    
    SeekBar[] seek = new SeekBar[3];


  		




  558
  555
  
    

  		




  559
  
  
    
    seek[0] = (SeekBar)mCenter.findViewById(R.id.effectCenterBarX );


  		




  560
  
  
    
    seek[1] = (SeekBar)mCenter.findViewById(R.id.effectCenterBarY );


  		




  561
  
  
    
    seek[2] = (SeekBar)mCenter.findViewById(R.id.effectCenterBarZ );


  		




  
  556
  
    
    seek[0] = mCenter.findViewById(R.id.effectCenterBarX );


  		




  
  557
  
    
    seek[1] = mCenter.findViewById(R.id.effectCenterBarY );


  		




  
  558
  
    
    seek[2] = mCenter.findViewById(R.id.effectCenterBarZ );


  		




  562
  559
  
    

  		




  563
  560
  
    
    mSeekCenterID[0] = seek[0].getId();


  		




  564
  561
  
    
    mSeekCenterID[1] = seek[1].getId();


  		




  565
  562
  
    
    mSeekCenterID[2] = seek[2].getId();


  		




  566
  563
  
    

  		




  567
  
  
    
    mTextCenter = (TextView)mCenter.findViewById(R.id.effectCenterText);


  		




  
  564
  
    
    mTextCenter = mCenter.findViewById(R.id.effectCenterText);


  		




  568
  565
  
    

  		




  569
  566
  
    
    setDefaultCenterInter();


  		




  570
  567
  
    

  		




  ......




  666
  663
  
    
      boolean showR= (show && act.getShowRegion());


  		




  667
  664
  
    
      boolean showC= (show && act.getShowCenter());


  		




  668
  665
  
    

  		




  669
  
  
    
      Effects3DSurfaceView view = (Effects3DSurfaceView)act.findViewById(R.id.effects3dSurfaceView);


  		




  
  666
  
    
      Effects3DSurfaceView view = act.findViewById(R.id.effects3dSurfaceView);


  		




  670
  667
  
    
      view.getRenderer().showRegionAndCenter( showR,showC );


  		




  671
  668
  
    

  		




  672
  
  
    
      act.setSupportsCenter(mName.supportsCenter());


  		




  673
  
  
    
      act.setSupportsRegion(mName.supportsRegion());


  		




  674
  669
  
    
      act.setCenter(mCenterSta.get1(),mCenterSta.get2(),mCenterSta.get3());


  		




  675
  670
  
    
      act.setRegion(mRegionSta.get1(),mRegionSta.get2(),mRegionSta.get3());


  		




  676
  671
  
    
      }


  		












Also available in:  Unified diff