Revision 78db8663
Added by Leszek Koltunski about 7 years ago
| src/main/java/org/distorted/library/EffectQueueMatrix.java | ||
|---|---|---|
| 112 | 112 |
Matrix.translateM(mViewMatrix, 0, -projection.mWidth/2, projection.mHeight/2, -projection.mDistance); |
| 113 | 113 |
|
| 114 | 114 |
float x,y,z, sx,sy,sz; |
| 115 |
float mipmap = projection.mMipmap; |
|
| 115 | 116 |
|
| 116 | 117 |
for(int i=0; i<mNumEffects; i++) |
| 117 | 118 |
{
|
| 118 | 119 |
if (mName[i] == EffectNames.ROTATE.ordinal() ) |
| 119 | 120 |
{
|
| 120 |
x = mUniforms[NUM_UNIFORMS*i+4]; |
|
| 121 |
y = mUniforms[NUM_UNIFORMS*i+5]; |
|
| 122 |
z = mUniforms[NUM_UNIFORMS*i+6]; |
|
| 121 |
x = mUniforms[NUM_UNIFORMS*i+4]*mipmap;
|
|
| 122 |
y = mUniforms[NUM_UNIFORMS*i+5]*mipmap;
|
|
| 123 |
z = mUniforms[NUM_UNIFORMS*i+6]*mipmap;
|
|
| 123 | 124 |
|
| 124 | 125 |
Matrix.translateM(mViewMatrix, 0, x,-y, z); |
| 125 | 126 |
Matrix.rotateM( mViewMatrix, 0, mUniforms[NUM_UNIFORMS*i], mUniforms[NUM_UNIFORMS*i+1], mUniforms[NUM_UNIFORMS*i+2], mUniforms[NUM_UNIFORMS*i+3]); |
| ... | ... | |
| 127 | 128 |
} |
| 128 | 129 |
else if(mName[i] == EffectNames.QUATERNION.ordinal() ) |
| 129 | 130 |
{
|
| 130 |
x = mUniforms[NUM_UNIFORMS*i+4]; |
|
| 131 |
y = mUniforms[NUM_UNIFORMS*i+5]; |
|
| 132 |
z = mUniforms[NUM_UNIFORMS*i+6]; |
|
| 131 |
x = mUniforms[NUM_UNIFORMS*i+4]*mipmap;
|
|
| 132 |
y = mUniforms[NUM_UNIFORMS*i+5]*mipmap;
|
|
| 133 |
z = mUniforms[NUM_UNIFORMS*i+6]*mipmap;
|
|
| 133 | 134 |
|
| 134 | 135 |
Matrix.translateM(mViewMatrix, 0, x,-y, z); |
| 135 | 136 |
multiplyByQuat(mViewMatrix, mUniforms[NUM_UNIFORMS*i], mUniforms[NUM_UNIFORMS*i+1], mUniforms[NUM_UNIFORMS*i+2], mUniforms[NUM_UNIFORMS*i+3]); |
| ... | ... | |
| 137 | 138 |
} |
| 138 | 139 |
else if(mName[i] == EffectNames.MOVE.ordinal() ) |
| 139 | 140 |
{
|
| 140 |
sx = mUniforms[NUM_UNIFORMS*i ]; |
|
| 141 |
sy = mUniforms[NUM_UNIFORMS*i+1]; |
|
| 142 |
sz = mUniforms[NUM_UNIFORMS*i+2]; |
|
| 141 |
sx = mUniforms[NUM_UNIFORMS*i ]*mipmap;
|
|
| 142 |
sy = mUniforms[NUM_UNIFORMS*i+1]*mipmap;
|
|
| 143 |
sz = mUniforms[NUM_UNIFORMS*i+2]*mipmap;
|
|
| 143 | 144 |
|
| 144 | 145 |
Matrix.translateM(mViewMatrix, 0, sx,-sy, sz); |
| 145 | 146 |
} |
| 146 | 147 |
else if(mName[i] == EffectNames.SCALE.ordinal() ) |
| 147 | 148 |
{
|
| 148 |
sx = mUniforms[NUM_UNIFORMS*i ]; |
|
| 149 |
sy = mUniforms[NUM_UNIFORMS*i+1]; |
|
| 150 |
sz = mUniforms[NUM_UNIFORMS*i+2]; |
|
| 149 |
sx = mUniforms[NUM_UNIFORMS*i ]*mipmap;
|
|
| 150 |
sy = mUniforms[NUM_UNIFORMS*i+1]*mipmap;
|
|
| 151 |
sz = mUniforms[NUM_UNIFORMS*i+2]*mipmap;
|
|
| 151 | 152 |
|
| 152 | 153 |
Matrix.scaleM(mViewMatrix, 0, sx, sy, sz); |
| 153 | 154 |
} |
| ... | ... | |
| 157 | 158 |
sy = mUniforms[NUM_UNIFORMS*i+1]; |
| 158 | 159 |
sz = mUniforms[NUM_UNIFORMS*i+2]; |
| 159 | 160 |
|
| 160 |
x = mUniforms[NUM_UNIFORMS*i+4]; |
|
| 161 |
y = mUniforms[NUM_UNIFORMS*i+5]; |
|
| 162 |
z = mUniforms[NUM_UNIFORMS*i+6]; |
|
| 161 |
x = mUniforms[NUM_UNIFORMS*i+4]*mipmap;
|
|
| 162 |
y = mUniforms[NUM_UNIFORMS*i+5]*mipmap;
|
|
| 163 |
z = mUniforms[NUM_UNIFORMS*i+6]*mipmap;
|
|
| 163 | 164 |
|
| 164 | 165 |
Matrix.translateM(mViewMatrix, 0, x,-y, z); |
| 165 | 166 |
|
Also available in: Unified diff
Beginning of work on Mipmap levels.