Revision 194ab46f
Added by Leszek Koltunski over 7 years ago
| src/main/java/org/distorted/library/EffectQueueMatrix.java | ||
|---|---|---|
| 19 | 19 |
|
| 20 | 20 |
package org.distorted.library; |
| 21 | 21 |
|
| 22 |
import android.opengl.GLES20;
|
|
| 22 |
import android.opengl.GLES30;
|
|
| 23 | 23 |
import android.opengl.Matrix; |
| 24 | 24 |
|
| 25 | 25 |
import org.distorted.library.message.EffectMessage; |
| ... | ... | |
| 191 | 191 |
|
| 192 | 192 |
static void getUniforms(int mProgramH) |
| 193 | 193 |
{
|
| 194 |
mObjDH = GLES20.glGetUniformLocation(mProgramH, "u_objD");
|
|
| 195 |
mDepthH = GLES20.glGetUniformLocation(mProgramH, "u_Depth");
|
|
| 196 |
mMVPMatrixH= GLES20.glGetUniformLocation(mProgramH, "u_MVPMatrix");
|
|
| 197 |
mMVMatrixH = GLES20.glGetUniformLocation(mProgramH, "u_MVMatrix");
|
|
| 194 |
mObjDH = GLES30.glGetUniformLocation(mProgramH, "u_objD");
|
|
| 195 |
mDepthH = GLES30.glGetUniformLocation(mProgramH, "u_Depth");
|
|
| 196 |
mMVPMatrixH= GLES30.glGetUniformLocation(mProgramH, "u_MVPMatrix");
|
|
| 197 |
mMVMatrixH = GLES30.glGetUniformLocation(mProgramH, "u_MVMatrix");
|
|
| 198 | 198 |
} |
| 199 | 199 |
|
| 200 | 200 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| ... | ... | |
| 288 | 288 |
{
|
| 289 | 289 |
constructMatrices(df,halfX,halfY); |
| 290 | 290 |
|
| 291 |
GLES20.glUniform3f( mObjDH , halfX, halfY, halfZ);
|
|
| 292 |
GLES20.glUniform1f( mDepthH, df.mDepth);
|
|
| 293 |
GLES20.glUniformMatrix4fv(mMVMatrixH , 1, false, mViewMatrix, 0);
|
|
| 294 |
GLES20.glUniformMatrix4fv(mMVPMatrixH, 1, false, mMVPMatrix , 0);
|
|
| 291 |
GLES30.glUniform3f( mObjDH , halfX, halfY, halfZ);
|
|
| 292 |
GLES30.glUniform1f( mDepthH, df.mDepth);
|
|
| 293 |
GLES30.glUniformMatrix4fv(mMVMatrixH , 1, false, mViewMatrix, 0);
|
|
| 294 |
GLES30.glUniformMatrix4fv(mMVPMatrixH, 1, false, mMVPMatrix , 0);
|
|
| 295 | 295 |
} |
| 296 | 296 |
|
| 297 | 297 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| ... | ... | |
| 303 | 303 |
Matrix.translateM(mTmpMatrix, 0, halfX-df.mWidth/2, df.mHeight/2-halfY, -df.mDistance); |
| 304 | 304 |
Matrix.multiplyMM(mMVPMatrix, 0, df.mProjectionMatrix, 0, mTmpMatrix, 0); |
| 305 | 305 |
|
| 306 |
GLES20.glUniform3f( mObjDH , halfX, halfY, halfZ);
|
|
| 307 |
GLES20.glUniform1f( mDepthH, df.mDepth);
|
|
| 308 |
GLES20.glUniformMatrix4fv(mMVMatrixH , 1, false, mTmpMatrix, 0);
|
|
| 309 |
GLES20.glUniformMatrix4fv(mMVPMatrixH, 1, false, mMVPMatrix, 0);
|
|
| 306 |
GLES30.glUniform3f( mObjDH , halfX, halfY, halfZ);
|
|
| 307 |
GLES30.glUniform1f( mDepthH, df.mDepth);
|
|
| 308 |
GLES30.glUniformMatrix4fv(mMVMatrixH , 1, false, mTmpMatrix, 0);
|
|
| 309 |
GLES30.glUniformMatrix4fv(mMVPMatrixH, 1, false, mMVPMatrix, 0);
|
|
| 310 | 310 |
} |
| 311 | 311 |
|
| 312 | 312 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
Also available in: Unified diff
Try using OpenGL ES 3.0 everywhere (but if device does not support it, try creating 2.0 context - this is important because of the emulator!)