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

compile fixes

Browse Source
This commit is contained in:
Erwin Coumans
2016-05-13 22:10:18 -07:00
parent f4a6b0cb9f
commit 578e4fc795
4 changed files with 5 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
examples/RenderingExamples/TinyRendererSetup.cpp
View File

@@ -207,7 +207,7 @@ void TinyRendererSetup::stepSimulation(float deltaTime)
}
ATTRIBUTE_ALIGNED16(float modelMat[16]);
ATTRIBUTE_ALIGNED16(btScalar modelMat2[16]);
ATTRIBUTE_ALIGNED16(float viewMat[16]);
CommonRenderInterface* render = this->m_app->m_renderer;
render->getActiveCamera()->getCameraViewMatrix(viewMat);
@@ -216,15 +216,16 @@ void TinyRendererSetup::stepSimulation(float deltaTime)
for (int o=0;o<this->m_internalData->m_renderObjects.size();o++)
{
const btTransform& tr = m_internalData->m_transforms[o];
tr.getOpenGLMatrix(modelMat);
tr.getOpenGLMatrix(modelMat2);
for (int i=0;i<4;i++)
{
for (int j=0;j<4;j++)
{
m_internalData->m_renderObjects[o]->m_modelMatrix[i][j] = modelMat[i+4*j];
m_internalData->m_renderObjects[o]->m_modelMatrix[i][j] = float(modelMat2[i+4*j]);
m_internalData->m_renderObjects[o]->m_viewMatrix[i][j] = viewMat[i+4*j];
}
}