Nokorpo/LibreAim
1
0
Fork 0
mirror of https://github.com/Nokorpo/LibreAim.git synced 2025-06-11 10:18:28 +09:00
Code Issues Projects Releases Packages Wiki Activity Actions

Refactor crosshair data names

Browse source
This commit is contained in:
Antimundo 2023-12-02 11:52:09 +01:00
parent d1986520cd
commit d3516b6f45
No known key found for this signature in database
GPG key ID: F83F260F8F88F0BC
3 changed files with 80 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

4
scenes/autoload/data_manager.gd
View file

@ -65,7 +65,9 @@ func save_all_data(file_directory = FILE_PATH) :
func get_data(category: categories, key):
var result = null
if game_data != null:
if game_data != null \
and game_data.has(CATEGORIES_ROUTES[category]) \
and game_data.get(CATEGORIES_ROUTES[category]).has(key):
result = game_data.get(CATEGORIES_ROUTES[category]).get(key)
return result

95
scenes/game_world/crosshair.gd
View file

@ -1,16 +1,16 @@
extends Control
var global_color := Color(0, 255, 255, 1)
var global_outline_color := Color(0,0,0)
var color := Color(0, 255, 255, 1)
var outline_color := Color(0,0,0)
var enable_outline := true
var dot_enable := false
var dot_size := 6.0
var global_outline_width := 1.0
var global_crosshair_thickness := 2.0
var global_crosshair_length := 12.0
var global_crosshair_gap := 5.0
var outline_width := 1.0
var crosshair_thickness := 2.0
var crosshair_length := 12.0
var crosshair_gap := 5.0
var current_crosshair = {
"top": [],
@ -23,36 +23,28 @@ var current_crosshair = {
func _draw():
load_save()
draw_part(current_crosshair["top"], global_color, global_outline_width, global_outline_color)
draw_part(current_crosshair["right"], global_color, global_outline_width, global_outline_color)
draw_part(current_crosshair["bottom"], global_color, global_outline_width, global_outline_color)
draw_part(current_crosshair["left"], global_color, global_outline_width, global_outline_color)
draw_part(current_crosshair["top"], color, outline_width, outline_color)
draw_part(current_crosshair["right"], color, outline_width, outline_color)
draw_part(current_crosshair["bottom"], color, outline_width, outline_color)
draw_part(current_crosshair["left"], color, outline_width, outline_color)
if dot_enable:
draw_part(current_crosshair["dot"], global_color, global_outline_width, global_outline_color)
draw_part(current_crosshair["dot"], color, outline_width, outline_color)
func _on_options_refresh_crosshair():
queue_redraw()
func load_save():
var category = DataManager.categories.CROSSHAIR
if DataManager.get_data(category, "Dot") != null:
dot_enable = DataManager.get_data(category, "Dot")
if DataManager.get_data(category, "DotSize") != null:
dot_size = DataManager.get_data(category, "DotSize")
if DataManager.get_data(category, "CrosshairLength") != null:
global_crosshair_length = DataManager.get_data(category, "CrosshairLength")
if DataManager.get_data(category, "CrosshairThickness") != null:
global_crosshair_thickness = DataManager.get_data(category, "CrosshairThickness")
if DataManager.get_data(category, "CrosshairGap") != null:
global_crosshair_gap = DataManager.get_data(category, "CrosshairGap")
if DataManager.get_data(category, "Outline") != null:
enable_outline = DataManager.get_data(category, "Outline")
if DataManager.get_data(category, "OutlineSize") != null:
global_outline_width = DataManager.get_data(category, "OutlineSize")
if DataManager.get_data(category, "CrosshairColor") != null:
global_color = Global.string_to_color(DataManager.get_data(category, "CrosshairColor"))
if DataManager.get_data(category, "OutlineColor") != null:
global_outline_color = Global.string_to_color(DataManager.get_data(category, "OutlineColor"))
dot_enable = set_parameter_if_exists(dot_enable, "dot")
dot_size = set_parameter_if_exists(dot_size, "dot_size")
crosshair_length = set_parameter_if_exists(crosshair_length, "crosshair_length")
crosshair_thickness = set_parameter_if_exists(crosshair_thickness, "crosshair_thickness")
crosshair_gap = set_parameter_if_exists(crosshair_gap, "crosshair_gap")
enable_outline = set_parameter_if_exists(enable_outline, "outline_enable")
outline_width = set_parameter_if_exists(outline_width, "outline_width")
color = set_color_if_exists(color, "color")
outline_color = set_color_if_exists(outline_color, "outline_color")
current_crosshair["dot"] = [
Vector2(-dot_size,-dot_size), #top left
Vector2(dot_size,-dot_size), #top right
@ -60,30 +52,43 @@ func load_save():
Vector2(-dot_size,dot_size) #bottom left
]
current_crosshair["left"] = [
Vector2(-global_crosshair_length-global_crosshair_gap,-global_crosshair_thickness), #top left
Vector2(-global_crosshair_gap,-global_crosshair_thickness), #top right
Vector2(-global_crosshair_gap,global_crosshair_thickness), #bottom right
Vector2(-global_crosshair_length-global_crosshair_gap,global_crosshair_thickness) #bottom left
Vector2(-crosshair_length-crosshair_gap,-crosshair_thickness), #top left
Vector2(-crosshair_gap,-crosshair_thickness), #top right
Vector2(-crosshair_gap,crosshair_thickness), #bottom right
Vector2(-crosshair_length-crosshair_gap,crosshair_thickness) #bottom left
]
current_crosshair["top"] = [
Vector2(-global_crosshair_thickness,-global_crosshair_length-global_crosshair_gap), #top left
Vector2(global_crosshair_thickness,-global_crosshair_length-global_crosshair_gap), #top right
Vector2(global_crosshair_thickness,-global_crosshair_gap), #bottom right
Vector2(-global_crosshair_thickness,-global_crosshair_gap) #bottom left
Vector2(-crosshair_thickness,-crosshair_length-crosshair_gap), #top left
Vector2(crosshair_thickness,-crosshair_length-crosshair_gap), #top right
Vector2(crosshair_thickness,-crosshair_gap), #bottom right
Vector2(-crosshair_thickness,-crosshair_gap) #bottom left
]
current_crosshair["right"] = [
Vector2(global_crosshair_gap,-global_crosshair_thickness), #top left
Vector2(global_crosshair_length+global_crosshair_gap,-global_crosshair_thickness), #top right
Vector2(global_crosshair_length+global_crosshair_gap,global_crosshair_thickness), #bottom right
Vector2(global_crosshair_gap,global_crosshair_thickness) #bottom left
Vector2(crosshair_gap,-crosshair_thickness), #top left
Vector2(crosshair_length+crosshair_gap,-crosshair_thickness), #top right
Vector2(crosshair_length+crosshair_gap,crosshair_thickness), #bottom right
Vector2(crosshair_gap,crosshair_thickness) #bottom left
]
current_crosshair["bottom"] = [
Vector2(-global_crosshair_thickness, global_crosshair_gap), #top left
Vector2(global_crosshair_thickness,global_crosshair_gap), #top right
Vector2(global_crosshair_thickness,global_crosshair_gap+global_crosshair_length), #bottom right
Vector2(-global_crosshair_thickness,global_crosshair_gap+global_crosshair_length) #bottom left
Vector2(-crosshair_thickness, crosshair_gap), #top left
Vector2(crosshair_thickness,crosshair_gap), #top right
Vector2(crosshair_thickness,crosshair_gap+crosshair_length), #bottom right
Vector2(-crosshair_thickness,crosshair_gap+crosshair_length) #bottom left
]
func set_parameter_if_exists(parameter, key: String):
var category = DataManager.categories.CROSSHAIR
var new_value = DataManager.get_data(category, key)
if new_value != null:
return new_value
return parameter
func set_color_if_exists(parameter, key: String):
var color = set_parameter_if_exists(parameter, key)
if color != null and color is String:
color = Global.string_to_color(color)
return color
func draw_part(points: PackedVector2Array, color: Color, outline_width: float, outline_color: Color):
draw_polygon(points, [color])
var polygon := Polygon2D.new()

54
scenes/main_menu/settings_crosshair.gd
View file

@ -41,31 +41,31 @@ func _on_import_file_dialog_file_selected(path):
emit_signal("refresh_crosshair")
func _on_dot_change_value(value):
change_value("DotSize", float(value))
change_value("dot_size", float(value))
func _on_dot_toggle_checkbox(value):
change_value("Dot", value)
change_value("dot", value)
func _on_length_change_value(value):
change_value("CrosshairLength", float(value))
change_value("crosshair_length", float(value))
func _on_thickness_change_value(value):
change_value("CrosshairThickness", float(value))
change_value("crosshair_thickness", float(value))
func _on_outline_toggle_checkbox(value):
change_value("Outline", value)
change_value("outline_enable", value)
func _on_outline_change_value(value):
change_value("OutlineSize", float(value))
change_value("outline_width", float(value))
func _on_gap_change_value(value):
change_value("CrosshairGap", float(value))
change_value("crosshair_gap", float(value))
func _on_crosshair_color_color_changed(color):
change_value("CrosshairColor", str(color))
change_value("color", str(color))
func _on_outline_color_color_changed(color):
change_value("OutlineColor", str(color))
change_value("outline_color", str(color))
func change_value(key, value):
DataManager.save_data(key, value, DataManager.categories.CROSSHAIR)
@ -81,30 +81,30 @@ func file_parser(args):
func load_saved():
var categories = DataManager.categories.CROSSHAIR
if DataManager.get_data(categories, "Dot") != null:
if DataManager.get_data(categories, "dot") != null:
$MarginContainer/VBoxContainer/CrosshairSettings/Dot.checkbox_value \
= DataManager.get_data(categories, "Dot")
if DataManager.get_data(categories, "DotSize") != null:
= DataManager.get_data(categories, "dot")
if DataManager.get_data(categories, "dot_size") != null:
$MarginContainer/VBoxContainer/CrosshairSettings/Dot.value \
= DataManager.get_data(categories, "DotSize")
if DataManager.get_data(categories, "CrosshairLength") != null:
= DataManager.get_data(categories, "dot_size")
if DataManager.get_data(categories, "crosshair_length") != null:
$MarginContainer/VBoxContainer/CrosshairSettings/Length.value \
= DataManager.get_data(categories, "CrosshairLength")
if DataManager.get_data(categories, "CrosshairThickness") != null:
= DataManager.get_data(categories, "crosshair_length")
if DataManager.get_data(categories, "crosshair_thickness") != null:
$MarginContainer/VBoxContainer/CrosshairSettings/Thickness.value \
= DataManager.get_data(categories, "CrosshairThickness")
if DataManager.get_data(categories, "CrosshairGap") != null:
= DataManager.get_data(categories, "crosshair_thickness")
if DataManager.get_data(categories, "crosshair_gap") != null:
$MarginContainer/VBoxContainer/CrosshairSettings/Gap.value \
= DataManager.get_data(categories, "CrosshairGap")
if DataManager.get_data(categories, "Outline") != null:
= DataManager.get_data(categories, "crosshair_gap")
if DataManager.get_data(categories, "outline_enable") != null:
$MarginContainer/VBoxContainer/CrosshairSettings/Outline.checkbox_value \
= DataManager.get_data(categories, "Outline")
if DataManager.get_data(categories, "OutlineSize") != null:
= DataManager.get_data(categories, "outline_enable")
if DataManager.get_data(categories, "outline_width") != null:
$MarginContainer/VBoxContainer/CrosshairSettings/Outline.value \
= DataManager.get_data(categories, "OutlineSize")
if DataManager.get_data(categories, "CrosshairColor") != null:
= DataManager.get_data(categories, "outline_width")
if DataManager.get_data(categories, "color") != null:
$MarginContainer/VBoxContainer/CrosshairSettings/Color/CrosshairColor.color \
= Global.string_to_color(DataManager.get_data(categories, "CrosshairColor"))
if DataManager.get_data(categories, "OutlineColor") != null:
= Global.string_to_color(DataManager.get_data(categories, "color"))
if DataManager.get_data(categories, "outline_color") != null:
$MarginContainer/VBoxContainer/CrosshairSettings/OutlineColor/OutlineColor.color \
= Global.string_to_color(DataManager.get_data(categories, "OutlineColor"))
= Global.string_to_color(DataManager.get_data(categories, "outline_color"))