add Obj and STL import demo, work on URDF import

This commit is contained in:
Erwin Coumans
2014-08-03 13:45:05 -07:00
parent 35fa146f13
commit ae98ffe218
18 changed files with 1196 additions and 71 deletions

View File

@@ -379,7 +379,8 @@ GLInstancingRenderer::GLInstancingRenderer(int maxNumObjectCapacity, int maxShap
m_textureenabled(true),
m_textureinitialized(false),
m_screenWidth(0),
m_screenHeight(0)
m_screenHeight(0),
m_upAxis(1)
{
m_data = new InternalDataRenderer;
@@ -1068,6 +1069,7 @@ void GLInstancingRenderer::updateCamera(int upAxis)
b3Assert(glGetError() ==GL_NO_ERROR);
m_upAxis = upAxis;
int m_forwardAxis(-1);
switch (upAxis)
{