Project

General

Profile

« Previous | Next » 

Revision 348dbeea

Added by Leszek Koltunski almost 6 years ago

Split the Effects3D app into 2 activities

View differences:

src/main/java/org/distorted/examples/effects3d/Effects3DEffect.java
61 61

  
62 62
class Effects3DEffect implements SeekBar.OnSeekBarChangeListener
63 63
  {
64
  private WeakReference<Effects3DActivity> mAct;
64
  private WeakReference<Effects3DActivity2> mAct;
65 65

  
66 66
  private EffectName mName;
67 67
  private int[] mInter;
......
285 285

  
286 286
  private void fillCenterStatics()
287 287
    {
288
    Effects3DActivity act = mAct.get();
288
    Effects3DActivity2 act = mAct.get();
289 289

  
290 290
    float x = (mInterCenter[0]*0.012f - 0.1f)*act.getWidth();
291 291
    float y = (mInterCenter[1]*0.012f - 0.1f)*act.getHeight();
......
318 318

  
319 319
  private void fillRegionStatics()
320 320
    {
321
    Effects3DActivity act = mAct.get();
321
    Effects3DActivity2 act = mAct.get();
322 322

  
323 323
    float factorX = act.getWidth() / 100.0f;
324 324
    float factorY = act.getHeight()/ 100.0f;
......
357 357

  
358 358
///////////////////////////////////////////////////////////////////////////////////////////////////
359 359

  
360
  Effects3DEffect(EffectName name, Effects3DActivity act)
360
  Effects3DEffect(EffectName name, Effects3DActivity2 act)
361 361
    {
362 362
    mAct = new WeakReference<>(act);
363 363
    mName = name;
......
439 439
    {
440 440
    SeekBar[] seek = new SeekBar[mDimension];
441 441

  
442
    Effects3DActivity act = mAct.get();
442
    Effects3DActivity2 act = mAct.get();
443 443

  
444 444
    switch(mDimension)
445 445
      {
......
512 512

  
513 513
  View createRegion()
514 514
    {
515
    Effects3DActivity act = mAct.get();
515
    Effects3DActivity2 act = mAct.get();
516 516

  
517 517
    mRegion = act.getLayoutInflater().inflate(R.layout.effectregion, null);
518 518

  
......
547 547

  
548 548
  View createCenter()
549 549
    {
550
    Effects3DActivity act = mAct.get();
550
    Effects3DActivity2 act = mAct.get();
551 551

  
552 552
    mCenter = act.getLayoutInflater().inflate(R.layout.effectcenter, null);
553 553

  
......
657 657

  
658 658
    if( fromUser )
659 659
      {
660
      Effects3DActivity act = mAct.get();
660
      Effects3DActivity2 act = mAct.get();
661 661

  
662 662
      boolean show = (mName.getType()==EffectType.VERTEX);
663 663
      boolean showR= (show && act.getShowRegion());

Also available in: Unified diff