From f43a0ef3270737d2b526480ecb0f1337ece9e041 Mon Sep 17 00:00:00 2001 From: David Saltares Date: Mon, 4 Sep 2017 21:52:44 +0100 Subject: Setting visibility on GridMap now works. Closes #907. Basically, `GridMap` wasn't reacting to the `NOTIFICATION_VISIBILITY_CHANGED` event. This reacts to such events and walks over the set of `Octants` and all of their `MultiMeshInstances` to set their visibility on the `VisualServer`. --- modules/gridmap/grid_map.cpp | 19 +++++++++++++++++++ modules/gridmap/grid_map.h | 1 + 2 files changed, 20 insertions(+) (limited to 'modules/gridmap') diff --git a/modules/gridmap/grid_map.cpp b/modules/gridmap/grid_map.cpp index 1b932f040e..1b7a9e4061 100644 --- a/modules/gridmap/grid_map.cpp +++ b/modules/gridmap/grid_map.cpp @@ -655,6 +655,24 @@ void GridMap::_notification(int p_what) { //_update_area_instances(); } break; + case NOTIFICATION_VISIBILITY_CHANGED: { + _update_visibility(); + } break; + } +} + +void GridMap::_update_visibility() { + if (!is_inside_tree()) + return; + + _change_notify("visible"); + + for (Map::Element *e = octant_map.front(); e; e = e->next()) { + Octant *octant = e->value(); + for (int i = 0; i < octant->multimesh_instances.size(); i++) { + Octant::MultimeshInstance &mi = octant->multimesh_instances[i]; + VS::get_singleton()->instance_set_visible(mi.instance, is_visible()); + } } } @@ -720,6 +738,7 @@ void GridMap::_update_octants_callback() { to_delete.pop_back(); } + _update_visibility(); awaiting_update = false; } diff --git a/modules/gridmap/grid_map.h b/modules/gridmap/grid_map.h index 9e1d250680..eb1b215696 100644 --- a/modules/gridmap/grid_map.h +++ b/modules/gridmap/grid_map.h @@ -190,6 +190,7 @@ protected: void _get_property_list(List *p_list) const; void _notification(int p_what); + void _update_visibility(); static void _bind_methods(); public: -- cgit v1.2.3