Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-04 06:23:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix Linux build warnings

Browse source
This commit is contained in:
sabrina-shanman 2018-07-30 14:51:04 -07:00
parent 6be5ac8dee
commit 41a8deb575
3 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/raypick/CollisionPick.cpp
View file

@ -135,7 +135,6 @@ void CollisionPick::computeShapeInfo(CollisionRegion& pick, ShapeInfo& shapeInfo
const FBXGeometry& fbxGeometry = resource->getFBXGeometry(); const FBXGeometry& fbxGeometry = resource->getFBXGeometry();
int numFbxMeshes = fbxGeometry.meshes.size(); int numFbxMeshes = fbxGeometry.meshes.size();
int totalNumVertices = 0; int totalNumVertices = 0;
glm::mat4 invRegistrationOffset = glm::translate(dimensions * (-ENTITY_ITEM_DEFAULT_REGISTRATION_POINT));
for (int i = 0; i < numFbxMeshes; i++) { for (int i = 0; i < numFbxMeshes; i++) {
const FBXMesh& mesh = fbxGeometry.meshes.at(i); const FBXMesh& mesh = fbxGeometry.meshes.at(i);
totalNumVertices += mesh.vertices.size(); totalNumVertices += mesh.vertices.size();
@ -191,7 +190,6 @@ void CollisionPick::computeShapeInfo(CollisionRegion& pick, ShapeInfo& shapeInfo
points.reserve(sizeToReserve); points.reserve(sizeToReserve);
// copy points // copy points
uint32_t meshIndexOffset = (uint32_t)points.size();
const glm::vec3* vertexItr = vertices.cbegin(); const glm::vec3* vertexItr = vertices.cbegin();
while (vertexItr != vertices.cend()) { while (vertexItr != vertices.cend()) {
glm::vec3 point = *vertexItr; glm::vec3 point = *vertexItr;

2
interface/src/raypick/CollisionPick.h
View file

@ -95,7 +95,7 @@ public:
} }
CollisionRegion getMathematicalPick() const override; CollisionRegion getMathematicalPick() const override;
PickResultPointer getDefaultResult(const QVariantMap& pickVariant) const { return std::make_shared<CollisionPickResult>(pickVariant); } PickResultPointer getDefaultResult(const QVariantMap& pickVariant) const override { return std::make_shared<CollisionPickResult>(pickVariant); }
PickResultPointer getEntityIntersection(const CollisionRegion& pick) override; PickResultPointer getEntityIntersection(const CollisionRegion& pick) override;
PickResultPointer getOverlayIntersection(const CollisionRegion& pick) override; PickResultPointer getOverlayIntersection(const CollisionRegion& pick) override;
PickResultPointer getAvatarIntersection(const CollisionRegion& pick) override; PickResultPointer getAvatarIntersection(const CollisionRegion& pick) override;

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

@ -843,8 +843,9 @@ void PhysicsEngine::setShowBulletConstraintLimits(bool value) {
struct AllContactsCallback : public btCollisionWorld::ContactResultCallback { struct AllContactsCallback : public btCollisionWorld::ContactResultCallback {
AllContactsCallback(MotionStateType desiredObjectType, const ShapeInfo& shapeInfo, const Transform& transform) : AllContactsCallback(MotionStateType desiredObjectType, const ShapeInfo& shapeInfo, const Transform& transform) :
desiredObjectType(desiredObjectType), desiredObjectType(desiredObjectType),
btCollisionWorld::ContactResultCallback(), collisionObject(),
collisionObject() { intersectingObjects(),
btCollisionWorld::ContactResultCallback() {
const btCollisionShape* collisionShape = ObjectMotionState::getShapeManager()->getShape(shapeInfo); const btCollisionShape* collisionShape = ObjectMotionState::getShapeManager()->getShape(shapeInfo);
collisionObject.setCollisionShape(const_cast<btCollisionShape*>(collisionShape)); collisionObject.setCollisionShape(const_cast<btCollisionShape*>(collisionShape));
@ -860,15 +861,11 @@ struct AllContactsCallback : public btCollisionWorld::ContactResultCallback {
ObjectMotionState::getShapeManager()->releaseShape(collisionObject.getCollisionShape()); ObjectMotionState::getShapeManager()->releaseShape(collisionObject.getCollisionShape());
} }
AllContactsCallback(btCollisionObject& testCollisionObject) :
btCollisionWorld::ContactResultCallback(), collisionObject(testCollisionObject) {
}
MotionStateType desiredObjectType; MotionStateType desiredObjectType;
btCollisionObject collisionObject; btCollisionObject collisionObject;
std::vector<EntityIntersection> intersectingObjects; std::vector<EntityIntersection> intersectingObjects;
virtual bool needsCollision(btBroadphaseProxy* proxy) const { bool needsCollision(btBroadphaseProxy* proxy) const override {
return true; return true;
} }