add upAxis option for Y or Z up

remove some warnings
2014-07-27 10:29:10 -07:00
parent 5e9102bf00
commit 0b40e1a899
10 changed files with 255 additions and 254 deletions
--- a/btgui/OpenGLWindow/ShapeData.h
+++ b/btgui/OpenGLWindow/ShapeData.h
@@ -1,6 +1,7 @@
 #ifndef SHAPE_DATA_H
 #define SHAPE_DATA_H

+#if USE_BARREL_VERTICES
 static float barrel_vertices[] = {
 0.0f,-0.5f,0.0f,				      1.0f,  0.0f,-1.0f,0.0f,                           				0.5f,	0.5f,
 0.282362f,-0.5f,-0.205148f,   1.0f,  0.0f,-1.0f,0.0f,                                   0.5f, 0.5f,
@@ -125,7 +126,7 @@ static int barrel_indices[] = {
 44,47,56,
 44,26,47,
 };
-
+#endif //USE_BARREL_VERTICES

 ///position xyz, unused w, normal, uv
 static const float cube_vertices[] =