From c2eb058e1fccff19b3073953fe8b6a77d5611a99 Mon Sep 17 00:00:00 2001
From: erwin coumans <erwin.coumans@gmail.com>
Date: Wed, 3 Apr 2013 09:19:39 -0700
Subject: [PATCH] minor fixes

---
 btgui/OpenGLWindow/GLInstancingRenderer.cpp | 12 +++++++++++-
 btgui/OpenGLWindow/GLInstancingRenderer.h   |  4 ++++
 demo/ObjLoader/obj_parser.cpp               |  2 +-
 demo/gpudemo/rigidbody/ConcaveScene.cpp     |  3 ++-
 4 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/btgui/OpenGLWindow/GLInstancingRenderer.cpp b/btgui/OpenGLWindow/GLInstancingRenderer.cpp
index 36f1a3ffd..f20b4d04b 100644
--- a/btgui/OpenGLWindow/GLInstancingRenderer.cpp
+++ b/btgui/OpenGLWindow/GLInstancingRenderer.cpp
@@ -111,6 +111,7 @@ struct InternalDataRenderer : public GLInstanceRendererInternalData
 		m_cameraDistance(150),
 		m_cameraUp(0,1,0),
 		m_azi(100.f),//135.f),
+		//m_ele(25.f),
 		m_ele(25.f),
 		m_mouseInitialized(false),
 		m_mouseButton(0)
@@ -208,7 +209,7 @@ void btDefaultMouseMoveCallback( float x, float y)
 
 void btDefaultKeyboardCallback(int key, int state)
 {
-	printf("world2\n");
+	//printf("world2\n");
 }
 
 
@@ -1074,6 +1075,15 @@ void	GLInstancingRenderer::setCameraDistance(float dist)
 	m_data->m_cameraDistance = dist;
 }
 
+void	GLInstancingRenderer::setCameraYaw(float yaw)
+{
+	m_data->m_ele = yaw;
+}
+void	GLInstancingRenderer::setCameraPitch(float pitch)
+{
+	m_data->m_azi = pitch;
+}
+
 void	GLInstancingRenderer::setCameraTargetPosition(float cameraPos[4])
 {
 		m_data->m_cameraTargetPosition = btVector3(cameraPos[0],cameraPos[1],cameraPos[2]);
diff --git a/btgui/OpenGLWindow/GLInstancingRenderer.h b/btgui/OpenGLWindow/GLInstancingRenderer.h
index 2fd7bbe63..d26145d08 100644
--- a/btgui/OpenGLWindow/GLInstancingRenderer.h
+++ b/btgui/OpenGLWindow/GLInstancingRenderer.h
@@ -80,6 +80,10 @@ public:
 	//set the camera 'target'
 	void	setCameraTargetPosition(float cameraPos[4]);
 	void	getCameraTargetPosition(float cameraPos[4]) const;
+	
+	void	setCameraYaw(float yaw);
+	void	setCameraPitch(float pitch);
+
 
 	void	resize(int width, int height);
 
diff --git a/demo/ObjLoader/obj_parser.cpp b/demo/ObjLoader/obj_parser.cpp
index baef41bc6..e39ddd41d 100644
--- a/demo/ObjLoader/obj_parser.cpp
+++ b/demo/ObjLoader/obj_parser.cpp
@@ -199,7 +199,7 @@ int obj_parse_mtl_file(char *filename, list *material_list)
 	mtl_file_stream = fopen( filename, "r");
 	if(mtl_file_stream == 0)
 	{
-		fprintf(stderr, "Error reading file: %s\n", filename);
+		fprintf(stderr, "Warning: cannot find material file: %s (skipping)\n", filename);
 		return 0;
 	}
 		
diff --git a/demo/gpudemo/rigidbody/ConcaveScene.cpp b/demo/gpudemo/rigidbody/ConcaveScene.cpp
index a53c8339a..49e9bf198 100644
--- a/demo/gpudemo/rigidbody/ConcaveScene.cpp
+++ b/demo/gpudemo/rigidbody/ConcaveScene.cpp
@@ -169,7 +169,7 @@ void ConcaveScene::setupScene(const ConstructionInfo& ci)
 
 	char relativeFileName[1024];
 	{
-		const char* prefix[]={"../","../../","../../../","../../../../"};
+		const char* prefix[]={"./","../","../../","../../../","../../../../"};
 		int numPrefixes = sizeof(prefix)/sizeof(char*);
 
 		for (int i=0;i<numPrefixes;i++)
@@ -289,6 +289,7 @@ void ConcaveScene::setupScene(const ConstructionInfo& ci)
 	}
 	float camPos[4]={0,0,0,0};//65.5,4.5,65.5,0};
 	//float camPos[4]={1,12.5,1.5,0};
+	m_instancingRenderer->setCameraPitch(45);
 	m_instancingRenderer->setCameraTargetPosition(camPos);
 	m_instancingRenderer->setCameraDistance(370);