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

handle transitions to/from STATIC_MESH

Browse source 
when rendering collision geometry
This commit is contained in:
Andrew Meadows 2016-07-28 10:30:28 -07:00
parent 68dd66daec
commit 83426fd5a8
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -438,13 +438,11 @@ void RenderableModelEntityItem::render(RenderArgs* args) {
remapTextures(); remapTextures();
// update whether the model should be showing collision mesh (this may flag for fixupInScene) // update whether the model should be showing collision mesh (this may flag for fixupInScene)
ShapeType type = getShapeType(); bool showingCollisionGeometry = (bool)(args->_debugFlags & (int)RenderArgs::RENDER_DEBUG_HULLS);
bool shouldShowCollisionGeometry = type != SHAPE_TYPE_STATIC_MESH && if (showingCollisionGeometry != _showCollisionGeometry) {
type != SHAPE_TYPE_NONE && ShapeType type = getShapeType();
(args->_debugFlags & (int)RenderArgs::RENDER_DEBUG_HULLS) > 0; _showCollisionGeometry = showingCollisionGeometry;
if (shouldShowCollisionGeometry != _showCollisionGeometry) { if (_showCollisionGeometry && type != SHAPE_TYPE_STATIC_MESH && type != SHAPE_TYPE_NONE) {
_showCollisionGeometry = shouldShowCollisionGeometry;
if (_showCollisionGeometry) {
// NOTE: it is OK if _collisionMeshKey is nullptr // NOTE: it is OK if _collisionMeshKey is nullptr
model::MeshPointer mesh = collisionMeshCache.getMesh(_collisionMeshKey); model::MeshPointer mesh = collisionMeshCache.getMesh(_collisionMeshKey);
// NOTE: the model will render the collisionGeometry if it has one // NOTE: the model will render the collisionGeometry if it has one