Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-21 04:03:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

finish hook alert for new entity collision shape

Browse source
This commit is contained in:
Andrew Meadows 2016-07-15 15:56:52 -07:00
parent b2dfa49a6f
commit 499150bbed
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -917,6 +917,10 @@ void RenderableModelEntityItem::computeShapeInfo(ShapeInfo& info) {
}
}
void RenderableModelEntityItem::setCollisionShape(const btCollisionShape* shape) {
// TODO: generate collision mesh and update _model
}
bool RenderableModelEntityItem::contains(const glm::vec3& point) const {
if (EntityItem::contains(point) && _model && _model->isCollisionLoaded()) {
return _model->getCollisionFBXGeometry().convexHullContains(worldToEntity(point));

2
libraries/entities-renderer/src/RenderableModelEntityItem.h
View file

@ -61,7 +61,7 @@ public:
virtual bool isReadyToComputeShape() override;
virtual void computeShapeInfo(ShapeInfo& info) override;
void setCollisionShape(const btCollisionShape* shape) override {}
void setCollisionShape(const btCollisionShape* shape) override;
virtual bool contains(const glm::vec3& point) const override;