Project

General

Profile

« Previous | Next » 

Revision 529054e9

Added by Leszek Koltunski about 4 years ago

Fixes for the merge. Everything works now!
Next step: make the center of Vertex & Fragment effects be in the center of the Object, rather than the lower-left corner.

View differences:

src/main/java/org/distorted/examples/generic/GenericEffect.java
324 324
    {
325 325
    GenericActivity2 act = mAct.get();
326 326

  
327
    float x = (mInterCenter[0]*0.012f - 0.1f)*act.getWidth();
328
    float y = (mInterCenter[1]*0.012f - 0.1f)*act.getHeight();
329
    float z = (mInterCenter[2]*0.012f - 0.1f)*act.getDepth();
327
    float x = (mInterCenter[0]*0.012f - 0.6f)*act.getWidth();
328
    float y = (mInterCenter[1]*0.012f - 0.6f)*act.getHeight();
329
    float z = (mInterCenter[2]*0.012f - 0.6f)*act.getDepth();
330 330

  
331 331
    mCenterSta.set(x,y,z);
332 332
    }
......
359 359

  
360 360
    float factorX = act.getWidth() / 100.0f;
361 361
    float factorY = act.getHeight()/ 100.0f;
362
   // float factorZ = act.getDepth() / 100.0f;
362
 // float factorZ = act.getDepth() / 100.0f;
363 363

  
364 364
    int deduct = (mName.getType() == EffectType.VERTEX ? 50:0);
365 365

  

Also available in: Unified diff