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

Merge remote-tracking branch 'bp/master'

Browse Source
This commit is contained in:
Erwin Coumans
2016-04-25 13:24:18 -07:00
parent 778ce5296d a080a568f2
commit 64cfbacf0a
2 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/SharedMemory/PhysicsClientC_API.cpp
View File

@@ -230,7 +230,7 @@ void b3GetLinkState(b3PhysicsClientHandle physClient, b3SharedMemoryStatusHandle
b3Assert(bodyIndex>=0); b3Assert(bodyIndex>=0);
if (bodyIndex>=0) if (bodyIndex>=0)
{ {
for (int i = 0; i < 7; ++i) for (int i = 0; i < 3; ++i)
{ {
state->m_worldPosition[i] = status->m_sendActualStateArgs.m_linkState[7 * linkIndex + i]; state->m_worldPosition[i] = status->m_sendActualStateArgs.m_linkState[7 * linkIndex + i];
} }

1
examples/SimpleOpenGL3/main.cpp
View File

@@ -85,7 +85,6 @@ int main(int argc, char* argv[])
myArgs.GetCmdLineArgument("png_file",gPngFileName); myArgs.GetCmdLineArgument("png_file",gPngFileName);
char fileName[1024]; char fileName[1024];
int textureIndex = -1;
int textureWidth = 128; int textureWidth = 128;
int textureHeight = 128; int textureHeight = 128;