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/Demos3/AllBullet2Demos/main.cpp
+++ b/Demos3/AllBullet2Demos/main.cpp
@@ -331,8 +331,8 @@ int main(int argc, char* argv[])
 		assert(err==GL_NO_ERROR);
 		app->m_instancingRenderer->init();
        DrawGridData dg;
-//        dg.upAxis = 2;
-        
+        dg.upAxis = app->getUpAxis();
+		
 		app->m_instancingRenderer->updateCamera(dg.upAxis);
        app->drawGrid(dg);