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

Merge pull request #857 from erwincoumans/master

Browse Source 
fix compile issues
This commit is contained in:
erwincoumans
2016-11-09 12:56:06 -08:00
committed by GitHub
parent f54cee55d5 6701947684
commit e65f9af230
3 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
examples/SharedMemory/PhysicsClientUDP.cpp
View File

@@ -187,6 +187,10 @@ struct UdpNetworkedInternalData
printf("%s disconected.\n", m_event.peer->data);
break;
default:
{
printf("unknown event type: %d.\n", m_event.type);
}
}
}
else if (serviceResult > 0)
@@ -258,6 +262,10 @@ struct UdpNetworkedInternalData
break;
}
default:
{
printf("unknown event type: %d.\n", m_event.type);
}
}
}
else if (serviceResult > 0)

10
examples/ThirdPartyLibs/BussIK/Tree.cpp
View File

@@ -98,10 +98,10 @@ Node* Tree::SearchJoint(Node* node, int index)
if (node->seqNumJoint == index) {
return node;
} else {
if (ret = SearchJoint(node->left, index)) {
if ((ret = SearchJoint(node->left, index))) {
return ret;
}
if (ret = SearchJoint(node->right, index)) {
if ((ret = SearchJoint(node->right, index))) {
return ret;
}
return NULL;
@@ -127,10 +127,10 @@ Node* Tree::SearchEffector(Node* node, int index)
if (node->seqNumEffector == index) {
return node;
} else {
if (ret = SearchEffector(node->left, index)) {
if ((ret = SearchEffector(node->left, index))) {
return ret;
}
if (ret = SearchEffector(node->right, index)) {
if ((ret = SearchEffector(node->right, index))) {
return ret;
}
return NULL;
@@ -214,4 +214,4 @@ void Tree::UnFreezeTree(Node* node)
void Tree::UnFreeze(void)
{
UnFreezeTree(root);
}
}

2
examples/pybullet/pybullet.c
View File

@@ -1482,7 +1482,7 @@ static PyObject* pybullet_resetVisualShapeData(PyObject* self, PyObject* args)
static PyObject* pybullet_loadTexture(PyObject* self, PyObject* args)
{
int size = PySequence_Size(args);
const char* filename = -1;
const char* filename = 0;
b3SharedMemoryCommandHandle commandHandle;
b3SharedMemoryStatusHandle statusHandle;
int statusType;