Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Split CommonGfxVertex3D into two different ones, GfxVertexFormat0 and GfxVertexFormat1

Browse Source 
Rewrite  GLInstancingRenderer::drawTexturedTriangleMesh
This commit is contained in:
Erwin Coumans
2017-05-24 13:05:16 -07:00
parent 344bb3f350
commit 84d09cc18f
6 changed files with 100 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
examples/CommonInterfaces/CommonRenderInterface.h
View File

@@ -17,7 +17,15 @@ enum
B3_USE_SHADOWMAP_RENDERMODE, B3_USE_SHADOWMAP_RENDERMODE,
}; };
struct CommonGfxVertex3D
struct GfxVertexFormat0
{
float x,y,z,w;
float unused0,unused1,unused2,unused3;
float u,v;
};
struct GfxVertexFormat1
{ {
float x,y,z,w; float x,y,z,w;
float nx,ny,nz; float nx,ny,nz;
@@ -54,7 +62,7 @@ struct CommonRenderInterface
virtual void drawLine(const double from[4], const double to[4], const double color[4], double lineWidth) = 0; virtual void drawLine(const double from[4], const double to[4], const double color[4], double lineWidth) = 0;
virtual void drawPoint(const float* position, const float color[4], float pointDrawSize)=0; virtual void drawPoint(const float* position, const float color[4], float pointDrawSize)=0;
virtual void drawPoint(const double* position, const double color[4], double pointDrawSize)=0; virtual void drawPoint(const double* position, const double color[4], double pointDrawSize)=0;
virtual void drawTexturedTriangleMesh(float worldPosition[3], float worldOrientation[4], const float* vertices, int numvertices, const unsigned int* indices, int numIndices, float color[4], int textureIndex=-1)=0; virtual void drawTexturedTriangleMesh(float worldPosition[3], float worldOrientation[4], const float* vertices, int numvertices, const unsigned int* indices, int numIndices, float color[4], int textureIndex=-1, int vertexLayout=0)=0;
virtual int registerShape(const float* vertices, int numvertices, const int* indices, int numIndices,int primitiveType=B3_GL_TRIANGLES, int textureIndex=-1)=0; virtual int registerShape(const float* vertices, int numvertices, const int* indices, int numIndices,int primitiveType=B3_GL_TRIANGLES, int textureIndex=-1)=0;
virtual void updateShape(int shapeIndex, const float* vertices)=0; virtual void updateShape(int shapeIndex, const float* vertices)=0;

150
examples/OpenGLWindow/GLInstancingRenderer.cpp
View File

@@ -23,7 +23,7 @@ float shadowMapWorldSize=10;
#define MAX_POINTS_IN_BATCH 1024 #define MAX_POINTS_IN_BATCH 1024
#define MAX_LINES_IN_BATCH 1024 #define MAX_LINES_IN_BATCH 1024
#define MAX_TRIANGLES_IN_BATCH 8192
#include "OpenGLInclude.h" #include "OpenGLInclude.h"
#include "../CommonInterfaces/CommonWindowInterface.h" #include "../CommonInterfaces/CommonWindowInterface.h"
@@ -75,18 +75,20 @@ float shadowMapWorldSize=10;
#include "GLRenderToTexture.h" #include "GLRenderToTexture.h"
static const char* triangleVertexShaderText = static const char* triangleVertexShaderText =
"#version 330\n" "#version 330\n"
"precision highp float;" "precision highp float;"
"uniform mat4 MVP;\n" "uniform mat4 MVP;\n"
"uniform vec3 vCol;\n" "uniform vec3 vCol;\n"
"in vec4 vPos;\n" "layout (location = 0) in vec3 vPos;\n"
"in vec2 vUV;\n" "layout (location = 1) in vec2 vUV;\n"
"out vec3 clr;\n" "out vec3 clr;\n"
"out vec2 uv0;\n" "out vec2 uv0;\n"
"void main()\n" "void main()\n"
"{\n" "{\n"
" gl_Position = MVP * vPos;\n" " gl_Position = MVP * vec4(vPos,1);\n"
" clr = vCol;\n" " clr = vCol;\n"
" uv0 = vUV;\n" " uv0 = vUV;\n"
"}\n"; "}\n";
@@ -244,12 +246,14 @@ struct GLInstanceRendererInternalData* GLInstancingRenderer::getInternalData()
} }
static GLuint triangleShaderProgram; static GLuint triangleShaderProgram;
static GLint triangle_mvp_location=-1; static GLint triangle_mvp_location=-1;
static GLint triangle_vpos_location=-1; static GLint triangle_vpos_location=-1;
static GLint triangle_vUV_location=-1; static GLint triangle_vUV_location=-1;
static GLint triangle_vcol_location=-1; static GLint triangle_vcol_location=-1;
static GLuint triangleIndexVbo=0; static GLuint triangleVertexBufferObject=0;
static GLuint triangleVertexArrayObject=0;
static GLuint triangleIndexVbo=0;
static GLuint linesShader; // The line renderer static GLuint linesShader; // The line renderer
@@ -1024,11 +1028,28 @@ void GLInstancingRenderer::InitShaders()
{ {
triangleShaderProgram = gltLoadShaderPair(triangleVertexShaderText,triangleFragmentShader); triangleShaderProgram = gltLoadShaderPair(triangleVertexShaderText,triangleFragmentShader);
//triangle_vpos_location = glGetAttribLocation(triangleShaderProgram, "vPos");
//triangle_vUV_location = glGetAttribLocation(triangleShaderProgram, "vUV");
triangle_mvp_location = glGetUniformLocation(triangleShaderProgram, "MVP"); triangle_mvp_location = glGetUniformLocation(triangleShaderProgram, "MVP");
triangle_vpos_location = glGetAttribLocation(triangleShaderProgram, "vPos");
triangle_vUV_location = glGetAttribLocation(triangleShaderProgram, "vUV");
triangle_vcol_location = glGetUniformLocation(triangleShaderProgram, "vCol"); triangle_vcol_location = glGetUniformLocation(triangleShaderProgram, "vCol");
glLinkProgram(triangleShaderProgram);
glUseProgram(triangleShaderProgram);
glGenVertexArrays(1, &triangleVertexArrayObject);
glBindVertexArray(triangleVertexArrayObject);
glGenBuffers(1, &triangleVertexBufferObject);
glGenBuffers(1, &triangleIndexVbo); glGenBuffers(1, &triangleIndexVbo);
int sz = MAX_TRIANGLES_IN_BATCH*sizeof(GfxVertexFormat0);
glBindVertexArray(triangleVertexArrayObject);
glBindBuffer(GL_ARRAY_BUFFER, triangleVertexBufferObject);
glBufferData(GL_ARRAY_BUFFER, sz, 0, GL_DYNAMIC_DRAW);
glBindVertexArray(0);
} }
linesShader = gltLoadShaderPair(linesVertexShader,linesFragmentShader); linesShader = gltLoadShaderPair(linesVertexShader,linesFragmentShader);
@@ -1500,19 +1521,24 @@ static void b3CreateLookAt(const b3Vector3& eye, const b3Vector3& center,cons
typedef struct
{
float position[4];
float colour[4];
float uv[2];
} MyVertex;
void GLInstancingRenderer::drawTexturedTriangleMesh(float worldPosition[3], float worldOrientation[4], const float* vertices, int numvertices, const unsigned int* indices, int numIndices, float colorRGBA[4], int textureIndex)
void GLInstancingRenderer::drawTexturedTriangleMesh(float worldPosition[3], float worldOrientation[4], const float* vertices, int numvertices, const unsigned int* indices, int numIndices, float colorRGBA[4], int textureIndex, int vertexLayout)
{ {
int sz = sizeof(GfxVertexFormat0);
glActiveTexture(GL_TEXTURE0);
activateTexture(textureIndex);
checkError("activateTexture");
glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
glUseProgram(triangleShaderProgram);
b3Quaternion orn(worldOrientation[0],worldOrientation[1],worldOrientation[2],worldOrientation[3]); b3Quaternion orn(worldOrientation[0],worldOrientation[1],worldOrientation[2],worldOrientation[3]);
b3Vector3 pos = b3MakeVector3(worldPosition[0],worldPosition[1],worldPosition[2]); b3Vector3 pos = b3MakeVector3(worldPosition[0],worldPosition[1],worldPosition[2]);
b3Transform worldTrans(orn,pos); b3Transform worldTrans(orn,pos);
b3Scalar worldMatUnk[16]; b3Scalar worldMatUnk[16];
worldTrans.getOpenGLMatrix(worldMatUnk); worldTrans.getOpenGLMatrix(worldMatUnk);
@@ -1521,66 +1547,59 @@ void GLInstancingRenderer::drawTexturedTriangleMesh(float worldPosition[3], floa
{ {
modelMat[i] = worldMatUnk[i]; modelMat[i] = worldMatUnk[i];
} }
glEnable(GL_TEXTURE_2D); float viewProjection[16];
b3Matrix4x4Mul16(m_data->m_projectionMatrix,m_data->m_viewMatrix,viewProjection);
activateTexture(textureIndex);
glUseProgram(triangleShaderProgram);
int err =GL_NO_ERROR;
err = glGetError();
b3Assert(err ==GL_NO_ERROR);
GLuint vertex_buffer=0;
glGenBuffers(1, &vertex_buffer);
glBindBuffer(GL_ARRAY_BUFFER, vertex_buffer);
glBufferData(GL_ARRAY_BUFFER, sizeof(MyVertex)*numvertices, vertices, GL_STATIC_DRAW);
err = glGetError();
b3Assert(err ==GL_NO_ERROR);
//glUniformMatrix4fv(useShadow_ProjectionMatrix, 1, false, &m_data->m_projectionMatrix[0]);
//glUniformMatrix4fv(useShadow_ModelViewMatrix, 1, false, &m_data->m_viewMatrix[0]);
float modelView[16];
b3Matrix4x4Mul16(m_data->m_projectionMatrix,m_data->m_viewMatrix,modelView);
float MVP[16]; float MVP[16];
b3Matrix4x4Mul16(modelView,modelMat,MVP); b3Matrix4x4Mul16(viewProjection,modelMat,MVP);
glUniformMatrix4fv(triangle_mvp_location, 1, GL_FALSE, (const GLfloat*) MVP); glUniformMatrix4fv(triangle_mvp_location, 1, GL_FALSE, (const GLfloat*) MVP);
err = glGetError(); checkError("glUniformMatrix4fv");
b3Assert(err ==GL_NO_ERROR);
glUniform3f(triangle_vcol_location,colorRGBA[0],colorRGBA[1],colorRGBA[2]); glUniform3f(triangle_vcol_location,colorRGBA[0],colorRGBA[1],colorRGBA[2]);
b3Assert(err ==GL_NO_ERROR); checkError("glUniform3f");
glEnableVertexAttribArray(triangle_vpos_location); glBindVertexArray(triangleVertexArrayObject);
glVertexAttribPointer(triangle_vpos_location, 4, GL_FLOAT, GL_FALSE, checkError("glBindVertexArray");
sizeof(MyVertex), (void*) 0);
err = glGetError();
b3Assert(err ==GL_NO_ERROR);
glEnableVertexAttribArray(triangle_vUV_location);
err = glGetError();
b3Assert(err ==GL_NO_ERROR);
glVertexAttribPointer(triangle_vUV_location, 2, GL_FLOAT, GL_FALSE,
sizeof(MyVertex), (void*) (sizeof(float) * 8));
err = glGetError(); glBindBuffer(GL_ARRAY_BUFFER, triangleVertexBufferObject);
b3Assert(err ==GL_NO_ERROR); checkError("glBindBuffer");
glBufferData(GL_ARRAY_BUFFER, sizeof(GfxVertexFormat0)*numvertices, 0, GL_DYNAMIC_DRAW);
glBufferSubData(GL_ARRAY_BUFFER, 0, sizeof(GfxVertexFormat0)*numvertices, vertices);
b3Assert(glGetError() ==GL_NO_ERROR); PointerCaster posCast;
posCast.m_baseIndex = 0;
PointerCaster uvCast;
uvCast.m_baseIndex = 8*sizeof(float);
glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, sizeof(GfxVertexFormat0), posCast.m_pointer);
glVertexAttribPointer(1, 2, GL_FLOAT, GL_FALSE, sizeof(GfxVertexFormat0), uvCast.m_pointer);
checkError("glVertexAttribPointer");
glEnableVertexAttribArray(0);
glEnableVertexAttribArray(1);
b3Assert(glGetError() ==GL_NO_ERROR); glVertexAttribDivisor(0,0);
glDrawElements(GL_TRIANGLES, numIndices, GL_UNSIGNED_INT,indices); glVertexAttribDivisor(1,0);
b3Assert(glGetError() ==GL_NO_ERROR); checkError("glVertexAttribDivisor");
glDeleteBuffers(1,&vertex_buffer);
b3Assert(glGetError() ==GL_NO_ERROR); glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, triangleIndexVbo);
int indexBufferSizeInBytes = numIndices*sizeof(int);
glBufferData(GL_ELEMENT_ARRAY_BUFFER, numIndices*sizeof(int), NULL, GL_DYNAMIC_DRAW);
glBufferSubData(GL_ELEMENT_ARRAY_BUFFER, 0, numIndices*sizeof(int), indices);
glDrawElements(GL_TRIANGLES, numIndices, GL_UNSIGNED_INT, 0);
//glDrawElements(GL_TRIANGLES, numIndices, GL_UNSIGNED_INT,indices);
checkError("glDrawElements");
glActiveTexture(GL_TEXTURE0); glActiveTexture(GL_TEXTURE0);
glBindTexture(GL_TEXTURE_2D,0); glBindTexture(GL_TEXTURE_2D,0);
glUseProgram(0); glUseProgram(0);
glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
glBindBuffer(GL_ARRAY_BUFFER,0);
glBindVertexArray(0);
checkError("glBindVertexArray");
} }
//virtual void drawTexturedTriangleMesh(const double* vertices, int numvertices, const int* indices, int numIndices, int primitiveType=B3_GL_TRIANGLES, int textureIndex=-1);
void GLInstancingRenderer::drawPoint(const double* position, const double color[4], double pointDrawSize) void GLInstancingRenderer::drawPoint(const double* position, const double color[4], double pointDrawSize)
@@ -1648,8 +1667,7 @@ void GLInstancingRenderer::drawLines(const float* positions, const float color[4
b3Clamp(lineWidth,(float)lineWidthRange[0],(float)lineWidthRange[1]); b3Clamp(lineWidth,(float)lineWidthRange[0],(float)lineWidthRange[1]);
glLineWidth(lineWidth); glLineWidth(lineWidth);
glBindBuffer(GL_ARRAY_BUFFER, m_data->m_vbo);
b3Assert(glGetError() ==GL_NO_ERROR);
glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0); glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
glActiveTexture(GL_TEXTURE0); glActiveTexture(GL_TEXTURE0);

2
examples/OpenGLWindow/GLInstancingRenderer.h
View File

@@ -114,7 +114,7 @@ public:
virtual void drawPoints(const float* positions, const float color[4], int numPoints, int pointStrideInBytes, float pointDrawSize); virtual void drawPoints(const float* positions, const float color[4], int numPoints, int pointStrideInBytes, float pointDrawSize);
virtual void drawPoint(const float* position, const float color[4], float pointSize=1); virtual void drawPoint(const float* position, const float color[4], float pointSize=1);
virtual void drawPoint(const double* position, const double color[4], double pointDrawSize=1); virtual void drawPoint(const double* position, const double color[4], double pointDrawSize=1);
virtual void drawTexturedTriangleMesh(float worldPosition[3], float worldOrientation[4], const float* vertices, int numvertices, const unsigned int* indices, int numIndices, float color[4], int textureIndex=-1); virtual void drawTexturedTriangleMesh(float worldPosition[3], float worldOrientation[4], const float* vertices, int numvertices, const unsigned int* indices, int numIndices, float color[4], int textureIndex=-1, int vertexLayout=0);
virtual void updateCamera(int upAxis=1); virtual void updateCamera(int upAxis=1);

2
examples/OpenGLWindow/SimpleOpenGL2Renderer.h
View File

@@ -41,7 +41,7 @@ public:
virtual void writeSingleInstanceScaleToCPU(const double* scale, int srcIndex); virtual void writeSingleInstanceScaleToCPU(const double* scale, int srcIndex);
virtual void getCameraViewMatrix(float viewMat[16]) const; virtual void getCameraViewMatrix(float viewMat[16]) const;
virtual void getCameraProjectionMatrix(float projMat[16]) const; virtual void getCameraProjectionMatrix(float projMat[16]) const;
virtual void drawTexturedTriangleMesh(float worldPosition[3], float worldOrientation[4], const float* vertices, int numvertices, const unsigned int* indices, int numIndices, float color[4], int textureIndex=-1) virtual void drawTexturedTriangleMesh(float worldPosition[3], float worldOrientation[4], const float* vertices, int numvertices, const unsigned int* indices, int numIndices, float color[4], int textureIndex=-1, int vertexLayout=0)
{ {
} }

4
examples/OpenGLWindow/SimpleOpenGL3App.cpp
View File

@@ -225,7 +225,7 @@ struct MyRenderCallbacks : public RenderCallbacks
float halfExtentsZ=1; float halfExtentsZ=1;
float textureScaling = 4; float textureScaling = 4;
b3AlignedObjectArray<CommonGfxVertex3D> verts; b3AlignedObjectArray<GfxVertexFormat1> verts;
verts.resize(numVertices); verts.resize(numVertices);
for (int i=0;i<numVertices;i++) for (int i=0;i<numVertices;i++)
{ {
@@ -682,7 +682,7 @@ int SimpleOpenGL3App::registerCubeShape(float halfExtentsX,float halfExtentsY, f
int numVertices = sizeof(cube_vertices_textured)/strideInBytes; int numVertices = sizeof(cube_vertices_textured)/strideInBytes;
int numIndices = sizeof(cube_indices)/sizeof(int); int numIndices = sizeof(cube_indices)/sizeof(int);
b3AlignedObjectArray<CommonGfxVertex3D> verts; b3AlignedObjectArray<GfxVertexFormat1> verts;
verts.resize(numVertices); verts.resize(numVertices);
for (int i=0;i<numVertices;i++) for (int i=0;i<numVertices;i++)
{ {

5
examples/SimpleOpenGL3/main.cpp
View File

@@ -157,7 +157,7 @@ int main(int argc, char* argv[])
float orientation[4] = {0,0,0,1}; float orientation[4] = {0,0,0,1};
//app->drawText3D(bla,0,0,1,1); app->drawText3D(bla,0,0,1,1);
sprintf(bla, "3d bitmap camera facing text:%d", frameCount); sprintf(bla, "3d bitmap camera facing text:%d", frameCount);
app->drawText3D(bla,position2,orientation,color,1,CommonGraphicsApp::eDrawText3D_OrtogonalFaceCamera); app->drawText3D(bla,position2,orientation,color,1,CommonGraphicsApp::eDrawText3D_OrtogonalFaceCamera);
@@ -178,9 +178,6 @@ int main(int argc, char* argv[])
app->drawText3D(bla,position2,orn,blue,1,CommonGraphicsApp::eDrawText3D_TrueType); app->drawText3D(bla,position2,orn,blue,1,CommonGraphicsApp::eDrawText3D_TrueType);
//app->drawText3D(bla,position, orientation,color,0.1,optionFlag);
app->swapBuffer(); app->swapBuffer();
} while (!app->m_window->requestedExit()); } while (!app->m_window->requestedExit());