Revision 715e7726
Added by Leszek Koltunski over 5 years ago
src/main/java/org/distorted/library/main/DistortedEffects.java | ||
---|---|---|
29 | 29 |
import org.distorted.library.effect.EffectType; |
30 | 30 |
import org.distorted.library.effect.FragmentEffect; |
31 | 31 |
import org.distorted.library.effect.VertexEffect; |
32 |
import org.distorted.library.mesh.MeshObject;
|
|
32 |
import org.distorted.library.mesh.MeshBase;
|
|
33 | 33 |
import org.distorted.library.message.EffectListener; |
34 | 34 |
import org.distorted.library.program.DistortedProgram; |
35 | 35 |
|
... | ... | |
43 | 43 |
/** |
44 | 44 |
* Class containing Matrix, Vertex, Fragment and Postprocessing effect queues. |
45 | 45 |
* <p> |
46 |
* The queues hold actual effects to be applied to a given (InputSurface,MeshObject) combo.
|
|
46 |
* The queues hold actual effects to be applied to a given (InputSurface,MeshBase) combo.
|
|
47 | 47 |
*/ |
48 | 48 |
public class DistortedEffects |
49 | 49 |
{ |
... | ... | |
423 | 423 |
|
424 | 424 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
425 | 425 |
|
426 |
private void displayNormals(MeshObject mesh)
|
|
426 |
private void displayNormals(MeshBase mesh)
|
|
427 | 427 |
{ |
428 | 428 |
int num = mesh.getNumVertices(); |
429 | 429 |
|
... | ... | |
438 | 438 |
mNormalProgram.useProgram(); |
439 | 439 |
GLES31.glUniformMatrix4fv(mNormalMVPMatrixH, 1, false, mM.getMVP() , 0); |
440 | 440 |
GLES31.glBindBuffer(GLES31.GL_ARRAY_BUFFER, mesh.getTFO() ); |
441 |
GLES31.glVertexAttribPointer(mNormalProgram.mAttribute[0], MeshObject.POS_DATA_SIZE, GLES31.GL_FLOAT, false, 0, 0);
|
|
441 |
GLES31.glVertexAttribPointer(mNormalProgram.mAttribute[0], MeshBase.POS_DATA_SIZE, GLES31.GL_FLOAT, false, 0, 0);
|
|
442 | 442 |
GLES31.glBindBuffer(GLES31.GL_ARRAY_BUFFER, 0); |
443 | 443 |
GLES31.glLineWidth(8.0f); |
444 | 444 |
GLES31.glDrawArrays(GLES31.GL_LINES, 0, 2*num); |
... | ... | |
454 | 454 |
|
455 | 455 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
456 | 456 |
|
457 |
void drawPrivOIT(float halfW, float halfH, MeshObject mesh, DistortedOutputSurface surface, long currTime)
|
|
457 |
void drawPrivOIT(float halfW, float halfH, MeshBase mesh, DistortedOutputSurface surface, long currTime)
|
|
458 | 458 |
{ |
459 | 459 |
float halfZ = halfW*mesh.getZFactor(); |
460 | 460 |
|
... | ... | |
471 | 471 |
GLES31.glUniform1ui(mMainOITNumRecordsH, (int)(mBufferSize*surface.mWidth*surface.mHeight) ); |
472 | 472 |
|
473 | 473 |
GLES31.glBindBuffer(GLES31.GL_ARRAY_BUFFER, mesh.getVBO() ); |
474 |
GLES31.glVertexAttribPointer(mMainOITProgram.mAttribute[0], MeshObject.POS_DATA_SIZE, GLES31.GL_FLOAT, false, MeshObject.VERTSIZE, MeshObject.OFFSET0);
|
|
475 |
GLES31.glVertexAttribPointer(mMainOITProgram.mAttribute[1], MeshObject.NOR_DATA_SIZE, GLES31.GL_FLOAT, false, MeshObject.VERTSIZE, MeshObject.OFFSET1);
|
|
476 |
GLES31.glVertexAttribPointer(mMainOITProgram.mAttribute[2], MeshObject.TEX_DATA_SIZE, GLES31.GL_FLOAT, false, MeshObject.VERTSIZE, MeshObject.OFFSET2);
|
|
474 |
GLES31.glVertexAttribPointer(mMainOITProgram.mAttribute[0], MeshBase.POS_DATA_SIZE, GLES31.GL_FLOAT, false, MeshBase.VERTSIZE, MeshBase.OFFSET0);
|
|
475 |
GLES31.glVertexAttribPointer(mMainOITProgram.mAttribute[1], MeshBase.NOR_DATA_SIZE, GLES31.GL_FLOAT, false, MeshBase.VERTSIZE, MeshBase.OFFSET1);
|
|
476 |
GLES31.glVertexAttribPointer(mMainOITProgram.mAttribute[2], MeshBase.TEX_DATA_SIZE, GLES31.GL_FLOAT, false, MeshBase.VERTSIZE, MeshBase.OFFSET2);
|
|
477 | 477 |
GLES31.glBindBuffer(GLES31.GL_ARRAY_BUFFER, 0); |
478 | 478 |
|
479 | 479 |
mM.send(surface,halfW,halfH,halfZ,0,1); |
... | ... | |
494 | 494 |
|
495 | 495 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
496 | 496 |
|
497 |
void drawPriv(float halfW, float halfH, MeshObject mesh, DistortedOutputSurface surface, long currTime)
|
|
497 |
void drawPriv(float halfW, float halfH, MeshBase mesh, DistortedOutputSurface surface, long currTime)
|
|
498 | 498 |
{ |
499 | 499 |
float halfZ = halfW*mesh.getZFactor(); |
500 | 500 |
|
... | ... | |
509 | 509 |
GLES31.glUniform1i(mMainTextureH, 0); |
510 | 510 |
|
511 | 511 |
GLES31.glBindBuffer(GLES31.GL_ARRAY_BUFFER, mesh.getVBO() ); |
512 |
GLES31.glVertexAttribPointer(mMainProgram.mAttribute[0], MeshObject.POS_DATA_SIZE, GLES31.GL_FLOAT, false, MeshObject.VERTSIZE, MeshObject.OFFSET0);
|
|
513 |
GLES31.glVertexAttribPointer(mMainProgram.mAttribute[1], MeshObject.NOR_DATA_SIZE, GLES31.GL_FLOAT, false, MeshObject.VERTSIZE, MeshObject.OFFSET1);
|
|
514 |
GLES31.glVertexAttribPointer(mMainProgram.mAttribute[2], MeshObject.TEX_DATA_SIZE, GLES31.GL_FLOAT, false, MeshObject.VERTSIZE, MeshObject.OFFSET2);
|
|
512 |
GLES31.glVertexAttribPointer(mMainProgram.mAttribute[0], MeshBase.POS_DATA_SIZE, GLES31.GL_FLOAT, false, MeshBase.VERTSIZE, MeshBase.OFFSET0);
|
|
513 |
GLES31.glVertexAttribPointer(mMainProgram.mAttribute[1], MeshBase.NOR_DATA_SIZE, GLES31.GL_FLOAT, false, MeshBase.VERTSIZE, MeshBase.OFFSET1);
|
|
514 |
GLES31.glVertexAttribPointer(mMainProgram.mAttribute[2], MeshBase.TEX_DATA_SIZE, GLES31.GL_FLOAT, false, MeshBase.VERTSIZE, MeshBase.OFFSET2);
|
|
515 | 515 |
GLES31.glBindBuffer(GLES31.GL_ARRAY_BUFFER, 0); |
516 | 516 |
|
517 | 517 |
mM.send(surface,halfW,halfH,halfZ,0,0); |
... | ... | |
931 | 931 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
932 | 932 |
/** |
933 | 933 |
* Returns the maximum number of effects of a given type that can be simultaneously applied to a |
934 |
* single (InputSurface,MeshObject) combo.
|
|
934 |
* single (InputSurface,MeshBase) combo.
|
|
935 | 935 |
* |
936 | 936 |
* @param type {@link EffectType} |
937 | 937 |
* @return The maximum number of effects of a given type. |
Also available in: Unified diff
Rename MeshObject to MeshBase.