Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-22 00:44:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions2

use computed shape type

Browse source
This commit is contained in:
Andrew Meadows 2015-04-16 12:13:41 -07:00
parent 83d54eb46b
commit 21d669f2f1
1 changed files with 2 additions and 2 deletions

4
libraries/entities-renderer/src/RenderableModelEntityItem.cpp
View file

@ -308,7 +308,7 @@ void RenderableModelEntityItem::computeShapeInfo(ShapeInfo& info) {
ShapeType type = getShapeType();
if (type != SHAPE_TYPE_COMPOUND) {
ModelEntityItem::computeShapeInfo(info);
info.setParams(_shapeType, 0.5f * getDimensions());
info.setParams(type, 0.5f * getDimensions());
} else {
const QSharedPointer<NetworkGeometry> collisionNetworkGeometry = _model->getCollisionGeometry();
@ -410,7 +410,7 @@ void RenderableModelEntityItem::computeShapeInfo(ShapeInfo& info) {
}
glm::vec3 collisionModelDimensions = box.getDimensions();
info.setParams(_shapeType, collisionModelDimensions, _collisionModelURL);
info.setParams(type, collisionModelDimensions, _collisionModelURL);
info.setConvexHulls(_points);
}
}