Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-13 11:52:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Address Mac/Linux build warnings

Browse source
This commit is contained in:
sabrina-shanman 2018-08-08 08:56:35 -07:00
parent 69812d04ae
commit 4ffe164569
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libraries/physics/src/PhysicsEngine.cpp
View file

@ -845,8 +845,8 @@ struct AllContactsCallback : public btCollisionWorld::ContactResultCallback {
desiredObjectType(desiredObjectType),
collisionObject(),
contacts(),
btCollisionWorld::ContactResultCallback(),
myAvatarCollisionObject(myAvatarCollisionObject) {
myAvatarCollisionObject(myAvatarCollisionObject),
btCollisionWorld::ContactResultCallback() {
const btCollisionShape* collisionShape = ObjectMotionState::getShapeManager()->getShape(shapeInfo);
collisionObject.setCollisionShape(const_cast<btCollisionShape*>(collisionShape));

2
libraries/shared/src/ShapeInfo.cpp
View file

@ -75,7 +75,7 @@ QString ShapeInfo::getNameForShapeType(ShapeType type) {
}
ShapeType ShapeInfo::getShapeTypeForName(QString string) {
for (int i = 0; i < SHAPETYPE_NAME_COUNT; i++) {
for (int i = 0; i < (int)SHAPETYPE_NAME_COUNT; i++) {
auto name = shapeTypeNames[i];
if (name == string) {
return (ShapeType)i;