CrispyPin/ovr-utils
1
0
Fork 0
mirror of https://github.com/CrispyPin/ovr-utils.git synced 2024-11-22 07:30:25 +01:00
Code Issues Projects Releases Packages Wiki Activity

overlay instances use defaults if a setting is missing

Browse source
This commit is contained in:
Crispy 2021-06-08 19:10:07 +02:00
parent dd28bdcb54
commit 9a5e58351f
2 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
ovr-utils/addons/openvr_overlay/overlay_instance.gd
View file

@ -69,17 +69,21 @@ func add_grab():
func load_settings(): func load_settings():
if Settings.s.overlays.has(name): if Settings.s.overlays.has(name):
var loaded = Settings.s.overlays[name] var loaded = Settings.s.overlays[name]
if loaded.has("fallback"): if loaded.has("fallback"):
fallback = loaded.fallback fallback = loaded.fallback
set_target(loaded.target) if loaded.has("target"):
set_target(loaded.target)
set_width_in_meters(loaded.width) if loaded.has("offsets"):
for t_key in loaded.offsets:
for t_key in loaded.offsets: var t_offset = loaded.offsets[t_key]
var t_offset = loaded.offsets[t_key] _offsets[t_key].pos = t_offset.pos
_offsets[t_key].pos = t_offset.pos _offsets[t_key].rot = t_offset.rot
_offsets[t_key].rot = t_offset.rot
update_offset() update_offset()
if loaded.has("width"):
set_width_in_meters(loaded.width)
if loaded.has("visible"): if loaded.has("visible"):
set_overlay_visible(loaded.visible) set_overlay_visible(loaded.visible)
if loaded.has("alpha"): if loaded.has("alpha"):

4
ovr-utils/ui/overlay_list_item.gd
View file

@ -7,11 +7,11 @@ func _ready() -> void:
overlay = OverlayManager.get_node(overlay_name) overlay = OverlayManager.get_node(overlay_name)
$MoreOptions/Container/List/SetSize/PanelContainer.visible = false $MoreOptions/Container/List/SetSize/PanelContainer.visible = false
$MoreOptions/Container/List/SetAlpha/PanelContainer.visible = false $MoreOptions/Container/List/SetAlpha/PanelContainer.visible = false
$MoreOptions/Container/List/SetSize/PanelContainer/SizeSlider.value = Settings.s.overlays[overlay_name].width $MoreOptions/Container/List/SetSize/PanelContainer/SizeSlider.value = overlay.width_meters
$MoreOptions.visible = false $MoreOptions.visible = false
$BasicOptions/Label.text = overlay_name $BasicOptions/Label.text = overlay_name
name = overlay_name name = overlay_name
$MoreOptions/Container/List/Target.selected = overlay.TARGETS.find(Settings.s.overlays[overlay_name].target) $MoreOptions/Container/List/Target.selected = overlay.TARGETS.find(overlay.target)
overlay.connect("overlay_visibility_changed", self, "_overlay_visibility_changed") overlay.connect("overlay_visibility_changed", self, "_overlay_visibility_changed")