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

allow obsolete OpenGL2 drawer to render with z-up axis.

Browse Source
This commit is contained in:
erwincoumans
2016-11-12 11:59:40 -08:00
parent 7577c6d893
commit 9bad64fed9
7 changed files with 33 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
examples/OpenGLWindow/SimpleOpenGL2App.cpp
View File

@@ -70,6 +70,11 @@ struct SimpleOpenGL2AppInternalData
{
GLuint m_fontTextureId;
GLuint m_largeFontTextureId;
int m_upAxis;
SimpleOpenGL2AppInternalData()
:m_upAxis(1)
{
}
};
static GLuint BindFont2(const CTexFont *_Font)
@@ -268,10 +273,11 @@ void SimpleOpenGL2App::drawGrid(DrawGridData data)
}
void SimpleOpenGL2App::setUpAxis(int axis)
{
this->m_data->m_upAxis = axis;
}
int SimpleOpenGL2App::getUpAxis() const
{
return 1;
return this->m_data->m_upAxis;
}
void SimpleOpenGL2App::swapBuffer()

1
examples/OpenGLWindow/SimpleOpenGL2Renderer.cpp
View File

@@ -33,6 +33,7 @@ void SimpleOpenGL2Renderer::updateCamera(int upAxis)
float projection[16];
float view[16];
m_camera.setAspectRatio((float)m_width/(float)m_height);
m_camera.setCameraUpAxis(upAxis);
m_camera.update();
m_camera.getCameraProjectionMatrix(projection);
m_camera.getCameraViewMatrix(view);