Revision 0e1437c1
Added by Leszek Koltunski over 2 years ago
| src/main/java/org/distorted/objectlib/main/TwistyObject.java | ||
|---|---|---|
| 220 | 220 |
mRotationAngleFinal = new Static1D(0); |
| 221 | 221 |
|
| 222 | 222 |
mObjectScale = new Static3D(1,1,1); |
| 223 |
setObjectRatioNow(1.0f,720); |
|
| 223 |
setObjectRatioNow(1.0f,1.0f,720);
|
|
| 224 | 224 |
|
| 225 | 225 |
MatrixEffectScale scaleEffect = new MatrixEffectScale(mObjectScale); |
| 226 | 226 |
MatrixEffectQuaternion quatEffect = new MatrixEffectQuaternion(mQuat, CENTER); |
| ... | ... | |
| 1118 | 1118 |
|
| 1119 | 1119 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 1120 | 1120 |
|
| 1121 |
void setObjectRatioNow(float sc, int nodeMinSize) |
|
| 1121 |
void setObjectRatioNow(float sc, float nodeScale, int nodeMinSize)
|
|
| 1122 | 1122 |
{
|
| 1123 |
mObjectScreenRatio = sc; |
|
| 1123 |
mObjectScreenRatio = sc*nodeScale;
|
|
| 1124 | 1124 |
float scale = mObjectScreenRatio*mInitScreenRatio*nodeMinSize/mSize; |
| 1125 | 1125 |
mObjectScale.set(scale,scale,scale); |
| 1126 | 1126 |
} |
| 1127 | 1127 |
|
| 1128 | 1128 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 1129 | 1129 |
|
| 1130 |
void setObjectRatio(float sizeChange, int nodeMinSize) |
|
| 1130 |
void setObjectRatio(float sizeChange, float nodeScale, int nodeMinSize)
|
|
| 1131 | 1131 |
{
|
| 1132 | 1132 |
mObjectScreenRatio *= (1.0f+sizeChange)/2; |
| 1133 | 1133 |
|
| 1134 | 1134 |
if( mObjectScreenRatio>MAX_SIZE_CHANGE) mObjectScreenRatio = MAX_SIZE_CHANGE; |
| 1135 | 1135 |
if( mObjectScreenRatio<MIN_SIZE_CHANGE) mObjectScreenRatio = MIN_SIZE_CHANGE; |
| 1136 | 1136 |
|
| 1137 |
setObjectRatioNow(mObjectScreenRatio, nodeMinSize); |
|
| 1137 |
setObjectRatioNow(mObjectScreenRatio, nodeScale, nodeMinSize);
|
|
| 1138 | 1138 |
} |
| 1139 | 1139 |
|
| 1140 | 1140 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
Also available in: Unified diff
Correct the way ObejctScale works in the TwistyObjectNode.