Revision e6519ac8
Added by Leszek Koltunski about 6 years ago
| src/main/java/org/distorted/library/main/EffectQueueMatrix.java | ||
|---|---|---|
| 19 | 19 |
|
| 20 | 20 |
package org.distorted.library.main; |
| 21 | 21 |
|
| 22 |
import android.opengl.GLES30;
|
|
| 22 |
import android.opengl.GLES31;
|
|
| 23 | 23 |
import android.opengl.Matrix; |
| 24 | 24 |
|
| 25 | 25 |
import org.distorted.library.effect.EffectType; |
| ... | ... | |
| 103 | 103 |
|
| 104 | 104 |
static void getUniforms(int mProgramH) |
| 105 | 105 |
{
|
| 106 |
mObjDH = GLES30.glGetUniformLocation(mProgramH, "u_objD");
|
|
| 107 |
mMVPMatrixH= GLES30.glGetUniformLocation(mProgramH, "u_MVPMatrix");
|
|
| 108 |
mMVMatrixH = GLES30.glGetUniformLocation(mProgramH, "u_MVMatrix");
|
|
| 106 |
mObjDH = GLES31.glGetUniformLocation(mProgramH, "u_objD");
|
|
| 107 |
mMVPMatrixH= GLES31.glGetUniformLocation(mProgramH, "u_MVPMatrix");
|
|
| 108 |
mMVMatrixH = GLES31.glGetUniformLocation(mProgramH, "u_MVMatrix");
|
|
| 109 | 109 |
} |
| 110 | 110 |
|
| 111 | 111 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| ... | ... | |
| 158 | 158 |
if( marginInPixels!=0 ) magnify(projection,halfX,halfY,halfZ, marginInPixels); |
| 159 | 159 |
Matrix.multiplyMM(mMVPMatrix, 0, projection.mProjectionMatrix, 0, mViewMatrix, 0); |
| 160 | 160 |
|
| 161 |
GLES30.glUniform3f( mObjDH , halfX, halfY, halfZ);
|
|
| 162 |
GLES30.glUniformMatrix4fv(mMVMatrixH , 1, false, mViewMatrix, 0);
|
|
| 163 |
GLES30.glUniformMatrix4fv(mMVPMatrixH, 1, false, mMVPMatrix , 0);
|
|
| 161 |
GLES31.glUniform3f( mObjDH , halfX, halfY, halfZ);
|
|
| 162 |
GLES31.glUniformMatrix4fv(mMVMatrixH , 1, false, mViewMatrix, 0);
|
|
| 163 |
GLES31.glUniformMatrix4fv(mMVPMatrixH, 1, false, mMVPMatrix , 0);
|
|
| 164 | 164 |
} |
| 165 | 165 |
} |
Also available in: Unified diff
Up library requirements to OpenGL ES 3.1 (needed for the upcoming GL_SHADER_STORAGE_BUFFER)