oier/gymkhana-actions
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

fix: adds control node to ESCGame for UI that must be populated, along with Escoria-only UI methods; this helps to avoid display issues on startup

Browse Source
This commit is contained in:
Duncan Brown
2022-04-23 16:25:16 -04:00
committed by Julian Murgia
parent 6afff99e7c
commit eeb7042d11
4 changed files with 30 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
addons/escoria-core/game/core-scripts/esc/esc_room_manager.gd
View File

@@ -113,7 +113,6 @@ func change_scene(room_path: String, enable_automatic_transitions: bool) -> void
var game_parent = escoria.game_scene.get_parent()
game_parent.remove_child(escoria.game_scene)
#escoria.game_scene.hide_ui()
room_scene.add_child(escoria.game_scene)
room_scene.move_child(escoria.game_scene, 0)
room_scene.game = escoria.game_scene

26
addons/escoria-core/game/core-scripts/esc_game.gd
View File

@@ -31,6 +31,9 @@ export(float) var mouse_tooltip_margin = 50.0
export(EDITOR_GAME_DEBUG_DISPLAY) var editor_debug_mode = \
EDITOR_GAME_DEBUG_DISPLAY.NONE setget _set_editor_debug_mode
# The Control node underneath which all UI must be placed.
# This should be a Control node and NOT a CanvasLayer (or any other type of) node.
export(NodePath) var ui_parent_control_node
# A reference to the node handling tooltips
var tooltip_node: Object
@@ -421,3 +424,26 @@ func show_crash_popup(files: Array = []) -> void:
yield(crash_popup, "confirmed")
emit_signal("crash_popup_confirmed")
# *** FOR USE BY ESCORIA CORE ONLY ***
# Hides everything under the UI Control node.
func escoria_hide_ui():
if ui_parent_control_node != null and not ui_parent_control_node.is_empty():
(get_node(ui_parent_control_node) as Control).visible = false
else:
escoria.logger.report_warnings(
"esc_game.gd#escoria_hide_ui",
["UI parent Control node not defined!"]
)
# *** FOR USE BY ESCORIA CORE ONLY ***
# Show everything under the UI Control node.
func escoria_show_ui():
if ui_parent_control_node != null and not ui_parent_control_node.is_empty():
(get_node(ui_parent_control_node) as Control).visible = true
else:
escoria.logger.report_warnings(
"esc_game.gd#escoria_show_ui",
["UI parent Control node not defined!"]
)