Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

minor fixes

Browse Source
This commit is contained in:
erwin coumans
2013-04-03 09:19:39 -07:00
parent a1aa281622
commit c2eb058e1f
4 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
btgui/OpenGLWindow/GLInstancingRenderer.cpp
View File

@@ -111,6 +111,7 @@ struct InternalDataRenderer : public GLInstanceRendererInternalData
m_cameraDistance(150), m_cameraDistance(150),
m_cameraUp(0,1,0), m_cameraUp(0,1,0),
m_azi(100.f),//135.f), m_azi(100.f),//135.f),
//m_ele(25.f),
m_ele(25.f), m_ele(25.f),
m_mouseInitialized(false), m_mouseInitialized(false),
m_mouseButton(0) m_mouseButton(0)
@@ -208,7 +209,7 @@ void btDefaultMouseMoveCallback( float x, float y)
void btDefaultKeyboardCallback(int key, int state) 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; 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]) void GLInstancingRenderer::setCameraTargetPosition(float cameraPos[4])
{ {
m_data->m_cameraTargetPosition = btVector3(cameraPos[0],cameraPos[1],cameraPos[2]); m_data->m_cameraTargetPosition = btVector3(cameraPos[0],cameraPos[1],cameraPos[2]);

4
btgui/OpenGLWindow/GLInstancingRenderer.h
View File

@@ -81,6 +81,10 @@ public:
void setCameraTargetPosition(float cameraPos[4]); void setCameraTargetPosition(float cameraPos[4]);
void getCameraTargetPosition(float cameraPos[4]) const; void getCameraTargetPosition(float cameraPos[4]) const;
void setCameraYaw(float yaw);
void setCameraPitch(float pitch);
void resize(int width, int height); void resize(int width, int height);
int getMaxShapeCapacity() const int getMaxShapeCapacity() const

2
demo/ObjLoader/obj_parser.cpp
View File

@@ -199,7 +199,7 @@ int obj_parse_mtl_file(char *filename, list *material_list)
mtl_file_stream = fopen( filename, "r"); mtl_file_stream = fopen( filename, "r");
if(mtl_file_stream == 0) 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; return 0;
} }

3
demo/gpudemo/rigidbody/ConcaveScene.cpp
View File

@@ -169,7 +169,7 @@ void ConcaveScene::setupScene(const ConstructionInfo& ci)
char relativeFileName[1024]; char relativeFileName[1024];
{ {
const char* prefix[]={"../","../../","../../../","../../../../"}; const char* prefix[]={"./","../","../../","../../../","../../../../"};
int numPrefixes = sizeof(prefix)/sizeof(char*); int numPrefixes = sizeof(prefix)/sizeof(char*);
for (int i=0;i<numPrefixes;i++) 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]={0,0,0,0};//65.5,4.5,65.5,0};
//float camPos[4]={1,12.5,1.5,0}; //float camPos[4]={1,12.5,1.5,0};
m_instancingRenderer->setCameraPitch(45);
m_instancingRenderer->setCameraTargetPosition(camPos); m_instancingRenderer->setCameraTargetPosition(camPos);
m_instancingRenderer->setCameraDistance(370); m_instancingRenderer->setCameraDistance(370);