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

fix camera update issue in previous commit

Browse Source 
fix Mac OSX build issue
This commit is contained in:
Erwin Coumans
2016-07-14 09:49:49 -07:00
parent 4a705d1e03
commit 34187fba1c
4 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/ExampleBrowser/OpenGLExampleBrowser.cpp
View File

@@ -223,7 +223,7 @@ void MyKeyboardCallback(int key, int state)
b3MouseMoveCallback prevMouseMoveCallback = 0;
static void MyMouseMoveCallback( float x, float y)
{
bool handled = false;
bool handled = false;
if (sCurrentDemo)
handled = sCurrentDemo->mouseMoveCallback(x,y);
if (!handled && gui)

2
examples/OpenGLWindow/GLInstancingRenderer.cpp
View File

@@ -956,6 +956,8 @@ void GLInstancingRenderer::updateCamera(int upAxis)
m_data->m_activeCamera->setCameraUpAxis(upAxis);
m_data->m_activeCamera->setAspectRatio((float)m_screenWidth/(float)m_screenHeight);
m_data->m_defaultCamera1.update();
m_data->m_activeCamera->getCameraProjectionMatrix(m_data->m_projectionMatrix);
m_data->m_activeCamera->getCameraViewMatrix(m_data->m_viewMatrix);
}

3
examples/RoboticsLearning/R2D2GraspExample.cpp
View File

@@ -99,7 +99,8 @@ public:
args.m_forceOverrideFixedBase = true;
args.m_fileType = B3_SDF_FILE;
//args.m_startOrientation = b3Quaternion()
m_robotSim.loadFile(args);
b3RobotSimLoadFileResults results;
m_robotSim.loadFile(args,results);
}
{
b3RobotSimLoadFileArgs args("");

2
examples/RoboticsLearning/b3RobotSimAPI.h
View File

@@ -81,7 +81,7 @@ public:
bool connect(struct GUIHelperInterface* guiHelper);
void disconnect();
bool loadFile(const struct b3RobotSimLoadFileArgs& args, b3RobotSimLoadFileResults& results=b3RobotSimLoadFileResults());
bool loadFile(const struct b3RobotSimLoadFileArgs& args, b3RobotSimLoadFileResults& results);
int getNumJoints(int bodyUniqueId) const;