Revision f80337b5
Added by Leszek Koltunski about 7 years ago
| src/main/java/org/distorted/library/DistortedEffects.java | ||
|---|---|---|
| 52 | 52 |
*/ |
| 53 | 53 |
public class DistortedEffects |
| 54 | 54 |
{
|
| 55 |
static final int MAIN_PROGRAM = 0; |
|
| 56 |
static final int FEED_PROGRAM = 1; |
|
| 57 |
static final int NUM_PROGRAMS = 2; |
|
| 58 |
|
|
| 55 | 59 |
// THIS IS FOR MAIN AND FEEDBACK PROGRAMS /// |
| 56 | 60 |
private static boolean[] mEffectEnabled = new boolean[EffectNames.size()]; |
| 57 | 61 |
|
| ... | ... | |
| 88 | 92 |
private static int mDebugObjDH; |
| 89 | 93 |
private static int mDebugMVPMatrixH; |
| 90 | 94 |
|
| 95 |
/// FEEDBACK PROGRAM // |
|
| 96 |
private static DistortedProgram mFeedbackProgram; |
|
| 97 |
|
|
| 98 |
|
|
| 91 | 99 |
private static float[] mMVPMatrix = new float[16]; |
| 92 | 100 |
private static float[] mTmpMatrix = new float[16]; |
| 93 | 101 |
|
| ... | ... | |
| 146 | 154 |
final InputStream mainVertStream = resources.openRawResource(R.raw.main_vertex_shader); |
| 147 | 155 |
final InputStream mainFragStream = resources.openRawResource(R.raw.main_fragment_shader); |
| 148 | 156 |
|
| 149 |
String[] feedback = { "v_Position", "v_Normal" };
|
|
| 150 |
|
|
| 151 |
mMainProgram = new DistortedProgram(mainVertStream,mainFragStream, mainVertHeader, mainFragHeader, Distorted.GLSL, feedback); |
|
| 157 |
mMainProgram = new DistortedProgram(mainVertStream,mainFragStream, mainVertHeader, mainFragHeader, Distorted.GLSL); |
|
| 152 | 158 |
|
| 153 | 159 |
int mainProgramH = mMainProgram.getProgramHandle(); |
| 154 | 160 |
EffectQueueFragment.getUniforms(mainProgramH); |
| 155 |
EffectQueueVertex.getUniforms(mainProgramH); |
|
| 156 |
EffectQueueMatrix.getUniforms(mainProgramH); |
|
| 161 |
EffectQueueVertex.getUniforms(MAIN_PROGRAM,mainProgramH);
|
|
| 162 |
EffectQueueMatrix.getUniforms(MAIN_PROGRAM,mainProgramH);
|
|
| 157 | 163 |
mMainTextureH= GLES30.glGetUniformLocation( mainProgramH, "u_Texture"); |
| 158 | 164 |
|
| 165 |
////////////////////////////////////////////////////////////////////////////////////// |
|
| 166 |
////////// FEEDBACK PROGRAM ////////////////////////////////////////////////////////// |
|
| 167 |
////////////////////////////////////////////////////////////////////////////////////// |
|
| 168 |
final InputStream feedVertStream = resources.openRawResource(R.raw.main_vertex_shader); |
|
| 169 |
final InputStream feedFragStream = resources.openRawResource(R.raw.feedback_fragment_shader); |
|
| 170 |
|
|
| 171 |
String[] feedback = { "v_Position" };
|
|
| 172 |
|
|
| 173 |
mFeedbackProgram = new DistortedProgram(feedVertStream,feedFragStream, mainVertHeader, Distorted.GLSL_VERSION, Distorted.GLSL, feedback); |
|
| 174 |
|
|
| 175 |
int feedProgramH = mFeedbackProgram.getProgramHandle(); |
|
| 176 |
EffectQueueFragment.getUniforms(feedProgramH); |
|
| 177 |
EffectQueueVertex.getUniforms(FEED_PROGRAM,feedProgramH); |
|
| 178 |
EffectQueueMatrix.getUniforms(FEED_PROGRAM,feedProgramH); |
|
| 179 |
|
|
| 159 | 180 |
////////////////////////////////////////////////////////////////////////////////////// |
| 160 | 181 |
////////// BLIT PROGRAM ////////////////////////////////////////////////////////////// |
| 161 | 182 |
////////////////////////////////////////////////////////////////////////////////////// |
| ... | ... | |
| 305 | 326 |
mMainProgram.useProgram(); |
| 306 | 327 |
GLES30.glUniform1i(mMainTextureH, 0); |
| 307 | 328 |
surface.setAsOutput(currTime); |
| 308 |
mM.send(surface,halfW,halfH,halfZ); |
|
| 309 |
mV.send(halfW,halfH,halfZ); |
|
| 329 |
mM.send(MAIN_PROGRAM,surface,halfW,halfH,halfZ);
|
|
| 330 |
mV.send(MAIN_PROGRAM,halfW,halfH,halfZ);
|
|
| 310 | 331 |
mF.send(halfW,halfH); |
| 311 | 332 |
|
| 312 | 333 |
GLES30.glBindBuffer(GLES30.GL_ARRAY_BUFFER, mesh.mPosVBO[0]); |
| ... | ... | |
| 324 | 345 |
|
| 325 | 346 |
void drawPrivFeedback(float halfW, float halfH, MeshObject mesh, DistortedOutputSurface surface, long currTime) |
| 326 | 347 |
{
|
| 327 |
int error; |
|
| 328 |
|
|
| 329 | 348 |
mM.compute(currTime); |
| 330 | 349 |
mV.compute(currTime); |
| 331 | 350 |
mF.compute(currTime); |
| ... | ... | |
| 334 | 353 |
|
| 335 | 354 |
GLES30.glViewport(0, 0, surface.mWidth, surface.mHeight ); |
| 336 | 355 |
|
| 337 |
mMainProgram.useProgram();
|
|
| 338 |
|
|
| 339 |
mM.send(surface,halfW,halfH,halfZ); |
|
| 340 |
mV.send(halfW,halfH,halfZ); |
|
| 356 |
mFeedbackProgram.useProgram();
|
|
| 357 |
surface.setAsOutput(currTime); |
|
| 358 |
mM.send(FEED_PROGRAM,surface,halfW,halfH,halfZ);
|
|
| 359 |
mV.send(FEED_PROGRAM,halfW,halfH,halfZ);
|
|
| 341 | 360 |
|
| 342 | 361 |
GLES30.glBindBuffer(GLES30.GL_ARRAY_BUFFER, mesh.mPosVBO[0]); |
| 343 |
GLES30.glVertexAttribPointer(mMainProgram.mAttribute[0], MeshObject.POSITION_DATA_SIZE, GLES30.GL_FLOAT, false, 0, 0);
|
|
| 362 |
GLES30.glVertexAttribPointer(mFeedbackProgram.mAttribute[0], MeshObject.POSITION_DATA_SIZE, GLES30.GL_FLOAT, false, 0, 0);
|
|
| 344 | 363 |
GLES30.glBindBuffer(GLES30.GL_ARRAY_BUFFER, mesh.mNorVBO[0]); |
| 345 |
GLES30.glVertexAttribPointer(mMainProgram.mAttribute[1], MeshObject.NORMAL_DATA_SIZE , GLES30.GL_FLOAT, false, 0, 0);
|
|
| 364 |
GLES30.glVertexAttribPointer(mFeedbackProgram.mAttribute[1], MeshObject.NORMAL_DATA_SIZE , GLES30.GL_FLOAT, false, 0, 0);
|
|
| 346 | 365 |
GLES30.glBindBuffer(GLES30.GL_ARRAY_BUFFER, mesh.mTexVBO[0]); |
| 347 |
GLES30.glVertexAttribPointer(mMainProgram.mAttribute[2], MeshObject.TEX_DATA_SIZE , GLES30.GL_FLOAT, false, 0, 0);
|
|
| 366 |
GLES30.glVertexAttribPointer(mFeedbackProgram.mAttribute[2], MeshObject.TEX_DATA_SIZE , GLES30.GL_FLOAT, false, 0, 0);
|
|
| 348 | 367 |
|
| 349 | 368 |
GLES30.glBindBufferBase(GLES30.GL_TRANSFORM_FEEDBACK_BUFFER, 0, mesh.mPosTBO[0]); |
| 350 |
GLES30.glBindBufferBase(GLES30.GL_TRANSFORM_FEEDBACK_BUFFER, 1, mesh.mNorTBO[0]); |
|
| 351 | 369 |
GLES30.glEnable(GLES30.GL_RASTERIZER_DISCARD); |
| 352 | 370 |
GLES30.glBeginTransformFeedback(GLES30.GL_POINTS); |
| 353 | 371 |
GLES30.glDrawArrays(GLES30.GL_POINTS, 0, mesh.dataLength); |
| 354 | 372 |
|
| 355 |
error = GLES30.glGetError(); |
|
| 373 |
int error = GLES30.glGetError();
|
|
| 356 | 374 |
if (error != GLES30.GL_NO_ERROR) |
| 357 | 375 |
{
|
| 358 | 376 |
throw new RuntimeException("2 glError 0x" + Integer.toHexString(error));
|
| ... | ... | |
| 366 | 384 |
|
| 367 | 385 |
Buffer mappedBuffer = GLES30.glMapBufferRange(GLES30.GL_TRANSFORM_FEEDBACK_BUFFER, 0, len, GLES30.GL_MAP_READ_BIT); |
| 368 | 386 |
FloatBuffer fb = ((ByteBuffer) mappedBuffer).order(ByteOrder.nativeOrder()).asFloatBuffer(); |
| 369 |
FloatBuffer bb = mesh.mMeshNormals;
|
|
| 387 |
FloatBuffer bb = mesh.mMeshPositions;
|
|
| 370 | 388 |
|
| 371 | 389 |
String msgB = ""; |
| 372 | 390 |
for(int d=0; d<mesh.dataLength; d++) |
| 373 | 391 |
{
|
| 374 |
msgB+="("+(2*halfW*bb.get(3*d+0))+","+(2*halfH*bb.get(3*d+1))+","+(bb.get(3*d+2))+")";
|
|
| 392 |
msgB+="("+(2*halfW*bb.get(3*d+0))+","+(2*halfH*bb.get(3*d+1))+","+(2*halfZ*bb.get(3*d+2))+")";
|
|
| 375 | 393 |
} |
| 376 | 394 |
android.util.Log.d( "Feedback", msgB); |
| 377 | 395 |
|
| ... | ... | |
| 392 | 410 |
/// END DEBUG /////// |
| 393 | 411 |
|
| 394 | 412 |
GLES30.glBindBufferBase(GLES30.GL_TRANSFORM_FEEDBACK_BUFFER, 0, 0); |
| 395 |
GLES30.glBindBufferBase(GLES30.GL_TRANSFORM_FEEDBACK_BUFFER, 1, 0); |
|
| 396 | 413 |
|
| 397 |
surface.setAsOutput(currTime); |
|
| 414 |
|
|
| 415 |
|
|
| 416 |
|
|
| 417 |
mMainProgram.useProgram(); |
|
| 398 | 418 |
GLES30.glUniform1i(mMainTextureH, 0); |
| 399 |
mM.sendZero();
|
|
| 400 |
mV.sendZero(); |
|
| 419 |
mM.sendFeedback(MAIN_PROGRAM,surface,halfW,halfH,halfZ);
|
|
| 420 |
mV.sendZero(MAIN_PROGRAM);
|
|
| 401 | 421 |
mF.send(halfW,halfH); |
| 402 | 422 |
|
| 403 | 423 |
GLES30.glBindBuffer(GLES30.GL_ARRAY_BUFFER, mesh.mPosTBO[0]); |
Also available in: Unified diff
Revert "Some progress with Transform Feedback. Still many bugs all over."
This reverts commit 79921db22e4ff5a3b2e6e3466a39445f5607a695.