asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix editor method calls to is_visible for Spatial and CanvasItem and is_visible itself for Spatial

Browse source
This commit is contained in:
Ray Koopa 2017-01-18 21:49:30 +01:00
parent ca14dd296a
commit faa13adad3
2 changed files with 19 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
scene/3d/spatial.cpp
View file

@ -620,7 +620,7 @@ void Spatial::set_visible(bool p_visible) {
bool Spatial::is_visible() const { bool Spatial::is_visible() const {
return !data.visible; return data.visible;
} }
void Spatial::rotate(const Vector3& p_normal,float p_radians) { void Spatial::rotate(const Vector3& p_normal,float p_radians) {

37
tools/editor/scene_tree_editor.cpp
View file

@ -208,14 +208,15 @@ void SceneTreeEditor::_cell_button_pressed(Object *p_item,int p_column,int p_id)
if (n->is_class("Spatial")) { if (n->is_class("Spatial")) {
bool v = !bool(n->call("is_hidden")); bool v = bool(n->call("is_visible"));
undo_redo->create_action(TTR("Toggle Spatial Visible")); undo_redo->create_action(TTR("Toggle Spatial Visible"));
undo_redo->add_do_method(n,"_set_visible_",!v); undo_redo->add_do_method(n,"set_visible",!v);
undo_redo->add_undo_method(n,"_set_visible_",v); undo_redo->add_undo_method(n,"set_visible",v);
undo_redo->commit_action(); undo_redo->commit_action();
} else if (n->is_class("CanvasItem")) { } else if (n->is_class("CanvasItem")) {
bool v = !bool(n->call("is_hidden")); bool v = bool(n->call("is_visible"));
undo_redo->create_action(TTR("Toggle CanvasItem Visible")); undo_redo->create_action(TTR("Toggle CanvasItem Visible"));
undo_redo->add_do_method(n,v?"hide":"show"); undo_redo->add_do_method(n,v?"hide":"show");
undo_redo->add_undo_method(n,v?"show":"hide"); undo_redo->add_undo_method(n,v?"show":"hide");
@ -393,11 +394,11 @@ bool SceneTreeEditor::_add_nodes(Node *p_node,TreeItem *p_parent) {
if (is_grouped) if (is_grouped)
item->add_button(0,get_icon("Group", "EditorIcons"), BUTTON_GROUP); item->add_button(0,get_icon("Group", "EditorIcons"), BUTTON_GROUP);
bool h = p_node->call("is_hidden"); bool v = p_node->call("is_visible");
if (h) if (v)
item->add_button(0,get_icon("Hidden","EditorIcons"),BUTTON_VISIBILITY);
else
item->add_button(0,get_icon("Visible","EditorIcons"),BUTTON_VISIBILITY); item->add_button(0,get_icon("Visible","EditorIcons"),BUTTON_VISIBILITY);
else
item->add_button(0,get_icon("Hidden","EditorIcons"),BUTTON_VISIBILITY);
if (!p_node->is_connected("visibility_changed",this,"_node_visibility_changed")) if (!p_node->is_connected("visibility_changed",this,"_node_visibility_changed"))
p_node->connect("visibility_changed",this,"_node_visibility_changed",varray(p_node)); p_node->connect("visibility_changed",this,"_node_visibility_changed",varray(p_node));
@ -405,11 +406,11 @@ bool SceneTreeEditor::_add_nodes(Node *p_node,TreeItem *p_parent) {
_update_visibility_color(p_node, item); _update_visibility_color(p_node, item);
} else if (p_node->is_class("Spatial")) { } else if (p_node->is_class("Spatial")) {
bool h = p_node->call("is_hidden"); bool v = p_node->call("is_visible");
if (h) if (v)
item->add_button(0,get_icon("Hidden","EditorIcons"),BUTTON_VISIBILITY);
else
item->add_button(0,get_icon("Visible","EditorIcons"),BUTTON_VISIBILITY); item->add_button(0,get_icon("Visible","EditorIcons"),BUTTON_VISIBILITY);
else
item->add_button(0,get_icon("Hidden","EditorIcons"),BUTTON_VISIBILITY);
if (!p_node->is_connected("visibility_changed",this,"_node_visibility_changed")) if (!p_node->is_connected("visibility_changed",this,"_node_visibility_changed"))
p_node->connect("visibility_changed",this,"_node_visibility_changed",varray(p_node)); p_node->connect("visibility_changed",this,"_node_visibility_changed",varray(p_node));
@ -469,16 +470,14 @@ void SceneTreeEditor::_node_visibility_changed(Node *p_node) {
bool visible=false; bool visible=false;
if (p_node->is_class("CanvasItem")) { if (p_node->is_class("CanvasItem") || p_node->is_class("Spatial")) {
visible = !p_node->call("is_hidden"); visible = p_node->call("is_visible");
} else if (p_node->is_class("Spatial")) {
visible = !p_node->call("is_hidden");
} }
if (!visible) if (visible)
item->set_button(0,idx,get_icon("Hidden","EditorIcons"));
else
item->set_button(0,idx,get_icon("Visible","EditorIcons")); item->set_button(0,idx,get_icon("Visible","EditorIcons"));
else
item->set_button(0,idx,get_icon("Hidden","EditorIcons"));
_update_visibility_color(p_node, item); _update_visibility_color(p_node, item);
} }