teatov/keebie
teatov/keebie
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

fix config loading

Browse Source
This commit is contained in:
Teatov 2025-07-29 19:40:36 +10:00
parent 7c7841c100
commit 442e44e8f0
3 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scenes/test.tscn
View File

@ -23,11 +23,11 @@ glow_strength = 1.5
[node name="OrthogonalCamera" type="Camera3D" parent="."]
transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 4.76838e-07, 4.90848, -0.212414)
projection = 1
current = true
size = 2.895
[node name="PerspectiveCamera" type="Camera3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 0.48725, 0.873262, 0, -0.873262, 0.48725, 2.38419e-07, 2.79306, 0.864002)
current = true
[node name="FloorMesh" type="MeshInstance3D" parent="."]
visible = false

8
scripts/game_key.gd
View File

@ -136,11 +136,9 @@ func _unhandled_input(event: InputEvent) -> void:
func load_props(_props: KeyProps, default_position: Vector3) -> void:
_default_position = default_position
if not props:
props = _props
else:
props.width_ratio = _props.width_ratio
props.width_ratio_init = _props.width_ratio_init
if props:
_props.from_dictionary(props.to_dictionary())
props = _props
_mesh.scale.x = props.width_ratio

28
scripts/globals/layout_config.gd
View File

@ -3,7 +3,7 @@ extends Node
const CONFIG_PATH := "user://layout.cfg"
const SECTION_INFO := "info"
const SECTION_KEYS := "keys"
const PARAM_NAME := "name"
const PARAM_TYPE := "type"
var layout_name: String
var layout_rows: Array[Array]
@ -11,12 +11,12 @@ var is_configuring: bool = false
func _ready() -> void:
# var err := load_config()
# if err != OK:
# print("config failed.....")
# set_defaults()
var err := load_config()
if err != OK:
print("config not loaded.....")
set_defaults()
is_configuring = true
set_defaults()
# set_defaults()
func _unhandled_input(event: InputEvent) -> void:
@ -26,10 +26,10 @@ func _unhandled_input(event: InputEvent) -> void:
func set_defaults() -> void:
# layout_name = LayoutANSI.NAME
# layout_rows = LayoutANSI.rows()
layout_name = LayoutISO.NAME
layout_rows = LayoutISO.rows()
layout_name = LayoutANSI.NAME
layout_rows = LayoutANSI.rows()
# layout_name = LayoutISO.NAME
# layout_rows = LayoutISO.rows()
func load_config() -> Error:
@ -43,15 +43,17 @@ func load_config() -> Error:
printerr("failed to load layout config file: %s" % err)
return FAILED
if not config.has_section_key(SECTION_INFO, PARAM_NAME):
if not config.has_section_key(SECTION_INFO, PARAM_TYPE):
return FAILED
layout_name = config.get_value(SECTION_INFO, PARAM_NAME)
layout_name = config.get_value(SECTION_INFO, PARAM_TYPE)
var rows: Array[Array] = []
if layout_name == LayoutANSI.NAME:
rows = LayoutANSI.rows()
elif layout_name == LayoutISO.NAME:
rows = LayoutISO.rows()
else:
return FAILED
@ -77,7 +79,7 @@ func load_config() -> Error:
func save_config() -> Error:
var config := ConfigFile.new()
config.set_value(SECTION_INFO, PARAM_NAME, layout_name)
config.set_value(SECTION_INFO, PARAM_TYPE, layout_name)
for row: Array[KeyProps] in layout_rows:
for key_props: KeyProps in row: