Project

General

Profile

« Previous | Next » 

Revision 98c04ab8

Added by Leszek Koltunski about 7 years ago

Fix the Effects3D regression.

View differences:

src/main/java/org/distorted/examples/effects3d/Effects3DActivity.java
246 246

  
247 247
  public void setSupportsRegion(boolean supports)
248 248
    {
249
    if( mSupportsRegion != supports )
250
      {
251
      mSupportsRegion = supports;
252
      Effects3DSurfaceView view = (Effects3DSurfaceView) findViewById(R.id.effects3dSurfaceView);
253
      view.getRenderer().attachRegion(supports);
254
      }
249
    mSupportsRegion = supports;
255 250
    }
256 251

  
257 252
///////////////////////////////////////////////////////////////////////////////////////////////////
258 253

  
259 254
  public void setSupportsCenter(boolean supports)
260 255
    {
261
    if( mSupportsCenter != supports )
262
      {
263
      mSupportsCenter = supports;
264
      Effects3DSurfaceView view = (Effects3DSurfaceView) findViewById(R.id.effects3dSurfaceView);
265
      view.getRenderer().attachCenter(supports);
266
      }
256
    mSupportsCenter = supports;
267 257
    }
268 258

  
269 259
///////////////////////////////////////////////////////////////////////////////////////////////////
......
358 348
    mRegionR = r;
359 349

  
360 350
    Effects3DSurfaceView view = (Effects3DSurfaceView)findViewById(R.id.effects3dSurfaceView);
361

  
362 351
    view.getRenderer().setRegion(mRegionX, mRegionY, mRegionR);
363 352
    }
364 353

  
......
371 360
    mCenterZ = z;
372 361

  
373 362
    Effects3DSurfaceView view = (Effects3DSurfaceView)findViewById(R.id.effects3dSurfaceView);
374

  
375 363
    view.getRenderer().setCenter( mCenterX, mCenterY, mCenterZ );
376 364
    }
377 365

  
......
441 429
    mEffects= new DistortedEffects();
442 430
    mTexture= new DistortedTexture(mNumCols,mNumRows);
443 431

  
444
    resetData();
445

  
446 432
    final View view = getLayoutInflater().inflate(R.layout.effects3dlayout, null);
447 433

  
448 434
    setContentView(view);
......
458 444
    adapterEffect.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
459 445
    effectSpinner.setAdapter(adapterEffect);
460 446

  
447
    resetData();
448

  
461 449
    mEffectAdd = 0;
462 450
    }
463 451

  
......
535 523

  
536 524
    mSupportsRegion =false;
537 525
    mSupportsCenter =false;
538
/*
539
    Effects3DSurfaceView view = (Effects3DSurfaceView) findViewById(R.id.effects3dSurfaceView);
540
    view.getRenderer().attachRegion(false);
541
    view.getRenderer().attachCenter(false);
542
*/
526

  
527
    Effects3DSurfaceView view = (Effects3DSurfaceView)findViewById(R.id.effects3dSurfaceView);
528
    view.getRenderer().showRegionAndCenter(false);
543 529
    }
544 530

  
545 531
///////////////////////////////////////////////////////////////////////////////////////////////////
......
567 553
      }
568 554

  
569 555
    eff.apply(mEffects);
556

  
557
    Effects3DSurfaceView sv = (Effects3DSurfaceView)findViewById(R.id.effects3dSurfaceView);
558
    sv.getRenderer().showRegionAndCenter(mEffectNames[mEffectAdd].getType()==EffectTypes.VERTEX);
570 559
    }
571 560

  
572 561
///////////////////////////////////////////////////////////////////////////////////////////////////

Also available in: Unified diff