History

wip hud layering and fix crashes

SamGondelman committed 9 years ago

Commit 477dfdf1 parent fa838e413 files · +112 −48Browse files

Showing the changes to libraries/render-utils/src/Model.cpp (1 of 13 files). Show all

Unified · Split

libraries/render-utils/src/Model.cpp+15−0
@@ -598,6 +598,21 @@ void Model::setLayeredInFront(bool layered, const render::ScenePointer& scene) { · 597 unmodified lines
598 }598 }
599}599}
600 600
601void Model::setLayeredInHUD(bool layered, const render::ScenePointer& scene) {
602 if (_isLayeredInHUD != layered) {
603 _isLayeredInHUD = layered;
604
605 render::Transaction transaction;
606 foreach(auto item, _modelMeshRenderItemsMap.keys()) {
607 transaction.resetItem(item, _modelMeshRenderItemsMap[item]);
608 }
609 foreach(auto item, _collisionRenderItemsMap.keys()) {
610 transaction.resetItem(item, _collisionRenderItemsMap[item]);
611 }
612 scene->enqueueTransaction(transaction);
613 }
614}
615
601bool Model::addToScene(const render::ScenePointer& scene,616bool Model::addToScene(const render::ScenePointer& scene,
602 render::Transaction& transaction,617 render::Transaction& transaction,
603 render::Item::Status::Getters& statusGetters) {618 render::Item::Status::Getters& statusGetters) {