martin
/
protot
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Using Vector4fs for debug draw calls.

opengl3
Martin Felis 2019-04-23 11:43:57 +02:00
parent ffe4e3bec0
commit 4875e63950
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/modules/RenderUtils.cc
View File

@ -1350,14 +1350,14 @@ void DebugDrawFrame(RenderProgram &program, const Matrix44f& mat) {
sCoordinateFrameMesh.Draw(GL_LINES); sCoordinateFrameMesh.Draw(GL_LINES);
} }
void DebugDrawSphere(RenderProgram &program, const Matrix44f& mat, const Vector3f& color) { void DebugDrawSphere(RenderProgram &program, const Matrix44f& mat, const Vector4f& color) {
sVertexArray.Bind(); sVertexArray.Bind();
program.SetMat44("uModelMatrix", mat); program.SetMat44("uModelMatrix", mat);
program.SetVec4("uColor", Vector4f (color[0], color[1], color[2], 1.0f)); program.SetVec4("uColor", Vector4f (color[0], color[1], color[2], color[3]));
sIcoSphere.Draw(GL_TRIANGLES); sIcoSphere.Draw(GL_TRIANGLES);
} }
void DebugDrawBone(RenderProgram &program, const Matrix44f& mat, const Vector3f& color) { void DebugDrawBone(RenderProgram &program, const Matrix44f& mat, const Vector4f& color) {
sVertexArray.Bind(); sVertexArray.Bind();
const float sphere_size = 0.035f; const float sphere_size = 0.035f;
@ -1370,7 +1370,7 @@ void DebugDrawBone(RenderProgram &program, const Matrix44f& mat, const Vector3f&
); );
program.SetMat44("uModelMatrix", mat); program.SetMat44("uModelMatrix", mat);
program.SetVec4("uColor", Vector4f (color[0], color[1], color[2], 1.0f)); program.SetVec4("uColor", Vector4f (color[0], color[1], color[2], color[3]));
sBoneBody.Draw(GL_TRIANGLES); sBoneBody.Draw(GL_TRIANGLES);
DebugDrawSphere( DebugDrawSphere(

4
src/modules/RenderUtils.h
View File

@ -614,7 +614,7 @@ void DebugDrawInitialize();
void DebugDrawShutdown(); void DebugDrawShutdown();
void DebugDrawCube(RenderProgram &program, const Matrix44f& mat); void DebugDrawCube(RenderProgram &program, const Matrix44f& mat);
void DebugDrawFrame(RenderProgram &program, const Matrix44f& mat); void DebugDrawFrame(RenderProgram &program, const Matrix44f& mat);
void DebugDrawSphere(RenderProgram &program, const Matrix44f& mat, const Vector3f& color = Vector3f (1.0f, 1.0f, 1.0f)); void DebugDrawSphere(RenderProgram &program, const Matrix44f& mat, const Vector4f& color = Vector4f (1.0f, 1.0f, 1.0f, 1.0f));
void DebugDrawBone(RenderProgram &program, const Matrix44f& mat, const Vector3f& color = Vector3f (0.1f, 0.8f, 0.4f)); void DebugDrawBone(RenderProgram &program, const Matrix44f& mat, const Vector4f& color = Vector4f (0.1f, 0.8f, 0.4f, 1.0f));
#endif #endif