Skip to content

Commit

Permalink
update files
Browse files Browse the repository at this point in the history
  • Loading branch information
myin142 committed Oct 7, 2023
1 parent 7d4e174 commit 4711a47
Show file tree
Hide file tree
Showing 8 changed files with 92 additions and 226 deletions.
130 changes: 0 additions & 130 deletions godot/addons/debug/Debug.gd

This file was deleted.

47 changes: 0 additions & 47 deletions godot/addons/debug/Debug.tscn

This file was deleted.

31 changes: 15 additions & 16 deletions godot/addons/debug/Logger.gd
Original file line number Diff line number Diff line change
@@ -1,38 +1,38 @@
class_name Logger

var name = ""
enum Level {
OFF,
ERROR,
WARN,
INFO,
DEBUG,
TRACE,
}

var name = ""

func _init(n: String):
name = n


func info(msg: String):
_log_for_level(Debug.Level.INFO, msg)

_log_for_level(Level.INFO, msg)

func warn(msg: String):
_log_for_level(Debug.Level.WARN, msg)

_log_for_level(Level.WARN, msg)

func error(msg: String):
_log_for_level(Debug.Level.ERROR, msg)

_log_for_level(Level.ERROR, msg)

func debug(msg: String):
_log_for_level(Debug.Level.DEBUG, msg)

_log_for_level(Level.DEBUG, msg)

func trace(msg: String):
_log_for_level(Debug.Level.TRACE, msg)

_log_for_level(Level.TRACE, msg)

func _log_for_level(level: int, msg: String):
if level <= Debug.log_level:
if level <= Env.log_level:
var text = "[%s - %s]: %s" % [_now(), name, msg]
print(text)
Debug.print_line(text)


func _now() -> String:
var dt = Time.get_datetime_dict_from_system()
Expand All @@ -44,7 +44,6 @@ func _now() -> String:
var second = _leading_zero(dt["second"])
return "%s-%s-%s %s:%s:%s" % [year, month, day, hour, minute, second]


func _leading_zero(num: int) -> String:
if num < 10:
return "0" + str(num)
Expand Down
8 changes: 0 additions & 8 deletions godot/addons/debug/README.md

This file was deleted.

28 changes: 28 additions & 0 deletions godot/addons/save-system/settings/AudioSettings.gd
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
class_name AudioSettings
extends Control

signal loaded()

const AUDIO_SECTION = "audio"

var _logger = Logger.new("AudioSettings")

func load_settings(config: ConfigFile):
for i in range(0, AudioServer.bus_count):
var name = AudioServer.get_bus_name(i)
var value = config.get_value(AUDIO_SECTION, name)
if value != null:
var split = str(value).split(";")
_logger.debug("Loading audio setting for %s: %s" % [name, value])
AudioServer.set_bus_volume_db(i, float(split[0]))
AudioServer.set_bus_mute(i, split.size() > 1 and split[1] == "true")

loaded.emit()

func save_settings(config: ConfigFile):
for i in range(0, AudioServer.bus_count):
var name = AudioServer.get_bus_name(i)
var value = AudioServer.get_bus_volume_db(i)
var muted = AudioServer.is_bus_mute(i)
_logger.debug("Saving audio setting for %s: %s, %s" % [name, value, muted])
config.set_value(AUDIO_SECTION, name, "%s;%s" % [value, muted])
30 changes: 30 additions & 0 deletions godot/addons/save-system/settings/Settings.gd
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
class_name Settings
extends Control

const CONFIG_FILE = "user://settings.cfg"

@onready var _audio := $Audio

var _logger = Logger.new("Settings")
var _config = ConfigFile.new()

func _ready():
_load_settings()

func _load_settings():
var error = _config.load(CONFIG_FILE)
if error != OK:
_logger.error("Failed to load settings: %s" % error)

_logger.debug("Loading settings")
_audio.load_settings(_config)

func _exit_tree():
_save_config()

func _save_config():
if Env.is_web(): return

_logger.debug("Saving settings")
_audio.save_settings(_config)
_config.save(CONFIG_FILE)
6 changes: 0 additions & 6 deletions godot/project.godot
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ config/icon="res://icon.svg"

Env="*res://addons/debug/Env.gd"
SceneManager="*res://addons/scene-manager/SceneManager.tscn"
Debug="*res://addons/debug/Debug.tscn"

[debug]

Expand Down Expand Up @@ -77,11 +76,6 @@ move_right={
, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":68,"key_label":0,"unicode":100,"echo":false,"script":null)
]
}
dev={
"deadzone": 0.5,
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":4194343,"physical_keycode":0,"key_label":0,"unicode":0,"echo":false,"script":null)
]
}

[layer_names]

Expand Down
38 changes: 19 additions & 19 deletions godot/shared/TweenCreator.gd
Original file line number Diff line number Diff line change
Expand Up @@ -28,28 +28,28 @@ func new_tween(on_finish = null):
tw.finished.connect(on_finish)
return true

func fade_out(node, duration = default_duration):
return tw.tween_property(node, "modulate", Color.TRANSPARENT, duration).from(Color.WHITE).set_ease(Tween.EASE_IN)
func fade_out(n, duration = default_duration):
return prop(n, "modulate", Color.WHITE, Color.TRANSPARENT, duration).set_ease(Tween.EASE_IN)

func fade_in(node, duration = default_duration):
return tw.tween_property(node, "modulate", Color.WHITE, duration).from(Color.TRANSPARENT).set_ease(Tween.EASE_OUT)
func fade_in(n, duration = default_duration):
return prop(n, "modulate", Color.TRANSPARENT, Color.WHITE, duration).set_ease(Tween.EASE_OUT)

func slide_in(node, dir: Vector2, pos = Vector2.ZERO, dist = node.size, duration = default_duration):
return move(node, pos - dir * dist, pos, duration).set_ease(Tween.EASE_OUT)
func slide_in(n, dir: Vector2, pos = Vector2.ZERO, dist = n.size, duration = default_duration):
return prop(n, "position", pos - dir * dist, pos, duration).set_ease(Tween.EASE_OUT)

func slide_out(node, dir: Vector2, dist = node.size, duration = default_duration):
return move(node, node.position, node.position + dir * dist, duration).set_ease(Tween.EASE_IN)
func slide_out(n, dir: Vector2, dist = n.size, duration = default_duration):
return prop(n, "position", n.position, n.position + dir * dist, duration).set_ease(Tween.EASE_IN)

func move(node, from: Vector2, to: Vector2, duration = default_duration):
return tw.tween_property(node, "position", to, duration).from(from)

func scale_in(node, target_scale = Vector2(1, 1), duration = default_duration):
return scale(node, Vector2.ZERO, target_scale, duration).set_ease(Tween.EASE_OUT)
func scale_in(n, target_scale = Vector2(1, 1), duration = default_duration):
return scale(n, Vector2.ZERO, target_scale, duration).set_ease(Tween.EASE_OUT)

func scale_out(node, init_scale = Vector2(1, 1), duration = default_duration):
return scale(node, init_scale, Vector2.ZERO, duration).set_ease(Tween.EASE_IN)
func scale_out(n, init_scale = Vector2(1, 1), duration = default_duration):
return scale(n, init_scale, Vector2.ZERO, duration).set_ease(Tween.EASE_IN)

func scale(node, from: Vector2, to: Vector2, duration = default_duration):
if node is Control:
node.pivot_offset = node.size / 2
return tw.tween_property(node, "scale", to, duration).from(from)
func scale(n, from: Vector2, to: Vector2, duration = default_duration):
if n is Control:
n.pivot_offset = n.size / 2
return prop(n, "scale", from, to, duration)

func prop(n, p: String, from, to, duration = default_duration):
return tw.tween_property(n, p, to, duration).from(from)

0 comments on commit 4711a47

Please sign in to comment.