Revision ba9ae2c8
Added by Leszek Koltunski about 4 years ago
src/main/java/org/distorted/examples/earth/EarthRenderer.java | ||
---|---|---|
50 | 50 |
import org.distorted.library.type.Dynamic3D; |
51 | 51 |
import org.distorted.library.type.DynamicQuat; |
52 | 52 |
import org.distorted.library.type.Static1D; |
53 |
import org.distorted.library.type.Static2D; |
|
54 | 53 |
import org.distorted.library.type.Static3D; |
55 | 54 |
import org.distorted.library.type.Static4D; |
56 | 55 |
import org.distorted.library.type.Static5D; |
... | ... | |
110 | 109 |
mMove = new Static3D(0,0,0); |
111 | 110 |
mScaleFactor= new Static3D(1,1,1); |
112 | 111 |
mPinch = new Static3D(0.5f,0.0f,0.0f); |
113 |
mPinch = new Static3D(0.5f,0.0f,0.0f); |
|
114 | 112 |
mSwirl = new Static1D(45.0f); |
115 | 113 |
|
116 | 114 |
Static3D center = new Static3D(0,0,0); |
... | ... | |
134 | 132 |
quatInt2.add(mQuat2); |
135 | 133 |
|
136 | 134 |
mEffects = new DistortedEffects(); |
137 |
mEffects.apply( new MatrixEffectMove(mMove) ); |
|
138 |
mEffects.apply( new MatrixEffectScale(scale)); |
|
139 |
mEffects.apply( new MatrixEffectQuaternion(quatInt1, center) ); |
|
140 | 135 |
mEffects.apply( new MatrixEffectQuaternion(quatInt2, center) ); |
136 |
mEffects.apply( new MatrixEffectQuaternion(quatInt1, center) ); |
|
137 |
mEffects.apply( new MatrixEffectScale(scale)); |
|
138 |
mEffects.apply( new MatrixEffectMove(mMove) ); |
|
141 | 139 |
|
142 | 140 |
mScreen = new DistortedScreen(); |
143 | 141 |
mScreen.setProjection(FOV, NEAR); |
... | ... | |
167 | 165 |
|
168 | 166 |
void setLevel(int level) |
169 | 167 |
{ |
170 |
final float N=2.2f;
|
|
168 |
final float N=2.0f;
|
|
171 | 169 |
|
172 | 170 |
// MAP: 0--> SCALE/N 50-->SCALE 100->SCALE*N |
173 | 171 |
mLevel = SCALE* (1.0f+ (level>=50 ? N-1 : (N-1)/N) * (level-50)/50.0f); |
Also available in: Unified diff
Fixes for the merge.