Revision 7fe64077
Added by Leszek Koltunski over 2 years ago
| src/main/java/org/distorted/objectlib/main/ObjectControl.java | ||
|---|---|---|
| 60 | 60 |
private boolean mDragging, mBeginningRotation, mContinuingRotation; |
| 61 | 61 |
private int mScreenWidth, mScreenHeight, mScreenMin; |
| 62 | 62 |
private float mMoveX, mMoveY; |
| 63 |
private float mScale; |
|
| 64 | 63 |
|
| 65 | 64 |
private float mRotAngle, mInitDistance; |
| 66 | 65 |
private float mStartRotX, mStartRotY; |
| ... | ... | |
| 575 | 574 |
|
| 576 | 575 |
mLastCubitColor = -1; |
| 577 | 576 |
mCurrRotSpeed = 0.0f; |
| 578 |
mScale = 1.0f; |
|
| 579 | 577 |
|
| 580 | 578 |
mLastX = new float[NUM_SPEED_PROBES]; |
| 581 | 579 |
mLastY = new float[NUM_SPEED_PROBES]; |
| ... | ... | |
| 614 | 612 |
mScreenHeight= height; |
| 615 | 613 |
mScreenMin = Math.min(width,height); |
| 616 | 614 |
|
| 617 |
mPreRender.setScreenSize(); |
|
| 615 |
TwistyObject object = mPreRender.getObject(); |
|
| 616 |
if( object!=null ) object.setTexture(); |
|
| 617 |
|
|
| 618 | 618 |
if( mObjectNode!=null ) mObjectNode.setSize(width,height); |
| 619 | 619 |
} |
| 620 | 620 |
|
| ... | ... | |
| 632 | 632 |
|
| 633 | 633 |
public void setObjectScale(float scale) |
| 634 | 634 |
{
|
| 635 |
mScale = scale; |
|
| 636 | 635 |
mPreRender.setScale(scale); |
| 637 | 636 |
} |
| 638 | 637 |
|
| src/main/java/org/distorted/objectlib/main/ObjectPreRender.java | ||
|---|---|---|
| 391 | 391 |
|
| 392 | 392 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 393 | 393 |
// PUBLIC API |
| 394 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
| 395 |
|
|
| 396 |
public void setScreenSize() |
|
| 397 |
{
|
|
| 398 |
if( mNewObject!=null ) mNewObject.setTexture(); |
|
| 399 |
} |
|
| 400 |
|
|
| 401 | 394 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 402 | 395 |
|
| 403 | 396 |
public void savePreferences(SharedPreferences.Editor editor) |
| src/main/java/org/distorted/objectlib/main/TwistyObjectNode.java | ||
|---|---|---|
| 75 | 75 |
public void setFOV(float fov) |
| 76 | 76 |
{
|
| 77 | 77 |
double halfFOV = fov * (Math.PI/360); |
| 78 |
// mCameraDist = (0.5f*mHeight) / ((float)Math.tan(halfFOV)*mWidth); |
|
| 79 |
mCameraDist = 0.5f / ((float)Math.tan(halfFOV)); |
|
| 80 |
|
|
| 78 |
mCameraDist = (0.5f*mHeight) / ((float)Math.tan(halfFOV)*mWidth); |
|
| 81 | 79 |
setProjection( fov, 0.1f); |
| 82 | 80 |
} |
| 83 | 81 |
|
Also available in: Unified diff
Small things.