add Obj and STL import demo, work on URDF import

2014-08-03 13:45:05 -07:00
parent 35fa146f13
commit ae98ffe218
18 changed files with 1196 additions and 71 deletions
--- a/btgui/OpenGLWindow/GLInstancingRenderer.h
+++ b/btgui/OpenGLWindow/GLInstancingRenderer.h
@@ -52,6 +52,8 @@ class GLInstancingRenderer

 	int m_screenWidth;
 	int m_screenHeight;
+	
+	int m_upAxis;

 	void renderSceneInternal(int renderMode=B3_DEFAULT_RENDERMODE);