Project

General

Profile

« Previous | Next » 

Revision d2337a3a

Added by Leszek Koltunski almost 8 years ago

Progress with Vertex3D

View differences:

src/main/java/org/distorted/examples/vertex3d/Vertex3DActivity.java
221 221
    sinkA =  50;
222 222
    swirlA = 50;
223 223

  
224
    centerX = 25;
225
    centerY = 25;
224
    centerX = 50;
225
    centerY = 50;
226 226

  
227 227
    textCenter = (TextView)findViewById(R.id.vertex3dcenterText);
228
    computeCenter();
228 229
    setCenterText();
229 230

  
230 231
    setBar(R.id.vertex3dcenterX, centerX);
......
279 280

  
280 281
    setBar(R.id.vertex3dswirlBar1, swirlA);
281 282

  
282
    Vertex3DRenderer.setOrder(effects);
283
    Vertex3DSurfaceView view = (Vertex3DSurfaceView)findViewById(R.id.vertex3dSurfaceView);
284
    view.getRenderer().setOrder(effects);
283 285
    }
284 286

  
285 287
///////////////////////////////////////////////////////////////////////////////////////////////////
......
355 357

  
356 358
  private void computeDeform()
357 359
    {
358
    fdeformX = (deformX-50)*Vertex3DRenderer.mScreenMin/50.0f;
359
    fdeformY = (deformY-50)*Vertex3DRenderer.mScreenMin/50.0f;
360
    fdeformZ = (deformZ-50)*Vertex3DRenderer.mScreenMin/50.0f;
360
    Vertex3DSurfaceView view = (Vertex3DSurfaceView)findViewById(R.id.vertex3dSurfaceView);
361
    Vertex3DRenderer renderer = view.getRenderer();
361 362

  
362
    Vertex3DRenderer.setDeform( fdeformX, fdeformY, fdeformZ );
363
    fdeformX = (deformX-50)*renderer.mScreenMin/200.0f;
364
    fdeformY = (deformY-50)*renderer.mScreenMin/200.0f;
365
    fdeformZ = (deformZ-50)*renderer.mScreenMin/200.0f;
366

  
367
    renderer.setDeform( fdeformX, fdeformY, fdeformZ );
363 368
    }
364 369

  
365 370
///////////////////////////////////////////////////////////////////////////////////////////////////
......
377 382

  
378 383
  private void computeDistort()
379 384
    {
380
    fdistortX = (distortX-50)*Vertex3DRenderer.mScreenMin/50.0f;
381
    fdistortY = (distortY-50)*Vertex3DRenderer.mScreenMin/50.0f;
382
    fdistortZ = (distortZ-50)*Vertex3DRenderer.mScreenMin/50.0f;
385
    Vertex3DSurfaceView view = (Vertex3DSurfaceView)findViewById(R.id.vertex3dSurfaceView);
386
    Vertex3DRenderer renderer = view.getRenderer();
387

  
388
    fdistortX = (distortX-50)*renderer.mScreenMin/200.0f;
389
    fdistortY = (distortY-50)*renderer.mScreenMin/200.0f;
390
    fdistortZ = (distortZ-50)*renderer.mScreenMin/200.0f;
383 391

  
384
    Vertex3DRenderer.setDistort(fdistortX, fdistortY, fdistortZ);
392
    renderer.setDistort(fdistortX, fdistortY, fdistortZ);
385 393
    }
386 394

  
387 395
///////////////////////////////////////////////////////////////////////////////////////////////////
......
399 407

  
400 408
  private void computeSink()
401 409
    {
410
    Vertex3DSurfaceView view = (Vertex3DSurfaceView)findViewById(R.id.vertex3dSurfaceView);
411

  
402 412
    fsinkA = (sinkA>= 50 ? 0.18f*sinkA-8.0f : 0.018f*sinkA + 0.1f);
403 413

  
404
    Vertex3DRenderer.setSink( fsinkA );
414
    view.getRenderer().setSink( fsinkA );
405 415
    }
406 416

  
407 417
///////////////////////////////////////////////////////////////////////////////////////////////////
......
417 427

  
418 428
  private void computeSwirl()
419 429
    {
430
    Vertex3DSurfaceView view = (Vertex3DSurfaceView)findViewById(R.id.vertex3dSurfaceView);
431

  
420 432
    fswirlA = (swirlA-50)*3.6f;
421 433

  
422
    Vertex3DRenderer.setSwirl( fswirlA );
434
    view.getRenderer().setSwirl( fswirlA );
423 435
    }
424 436
    
425 437
///////////////////////////////////////////////////////////////////////////////////////////////////
......
435 447

  
436 448
  private void computeCenter()
437 449
    {
438
    fcenterX = (centerX*0.02f - 0.5f)*Vertex3DRenderer.SIZE;
439
    fcenterY = (centerY*0.02f - 0.5f)*Vertex3DRenderer.SIZE;
450
    Vertex3DSurfaceView view = (Vertex3DSurfaceView)findViewById(R.id.vertex3dSurfaceView);
440 451

  
441
    Vertex3DRenderer.setCenter( fcenterX, fcenterY );
452
    fcenterX = centerX;
453
    fcenterY = centerY;
454

  
455
    view.getRenderer().setCenter( fcenterX, fcenterY );
442 456
    }
443 457

  
444 458
///////////////////////////////////////////////////////////////////////////////////////////////////
......
451 465
    textCenter.setText("center("+fcenterX+","+fcenterY+")");
452 466
    }
453 467

  
468
///////////////////////////////////////////////////////////////////////////////////////////////////
469

  
470
  public float getCenterX()
471
    {
472
    return fcenterX;
473
    }
474

  
475
///////////////////////////////////////////////////////////////////////////////////////////////////
476

  
477
  public float getCenterY()
478
    {
479
    return fcenterY;
480
    }
481

  
454 482
///////////////////////////////////////////////////////////////////////////////////////////////////
455 483
// Overrides
456 484

  

Also available in: Unified diff