Skip to content

Improve performance by only load textures up to once per tick #148

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
greenpixels wants to merge 10 commits into
base: master
Choose a base branch
from
Open

Improve performance by only load textures up to once per tick #148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
7456070
feat: add force_device variable to always use a specified device
greenpixels Feb 22, 2025
36dd46b
change: extend fallback logic to include all possible devices in an a…
greenpixels Feb 22, 2025
23aecda
change: use the given controller when resolving the joypad icon path …
greenpixels Feb 23, 2025
3a91968
change: use enum instead of integer
greenpixels Mar 2, 2025
2ee7745
feat: add option to force a specific controller icon style
greenpixels Mar 2, 2025
de4c94d
Merge branch 'master' of https://github.com/greenpixels/controller_icons
greenpixels Mar 2, 2025
20582c3
change: put NONE enum entry at the beginning
greenpixels Mar 3, 2025
3e8172a
style: remove comment and empty lines
greenpixels Mar 3, 2025
e7186ef
only load textures once per frame
greenpixels Jun 8, 2025
d059260
Merge remote-tracking branch 'upstream/master'
greenpixels Jun 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion addons/controller_icons/ControllerIcons.gd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,13 @@ enum PathType {
SPECIFIC_PATH ## The path is a specific path.
}

var _textures_to_update: Array[ControllerIconTexture] = []

var _cached_icons := {}
var _custom_input_actions := {}

var _cached_callables_lock := Mutex.new()
var _cached_callables : Array[Callable] = []
var _cached_callables: Array[Callable] = []

var _last_input_type : InputType
var _last_controller : int
Expand Down Expand Up @@ -170,6 +172,11 @@ func _test_mouse_velocity(relative_vec: Vector2):
func _process(delta: float) -> void:
_t += delta

for texture in _textures_to_update:
texture._load_texture_path()
texture._should_trigger_texture_load = false

_textures_to_update = []
if not _cached_callables.is_empty() and _cached_callables_lock.try_lock():
# UPGRADE: In Godot 4.2, for-loop variables can be
# statically typed:
Expand Down
21 changes: 14 additions & 7 deletions addons/controller_icons/objects/ControllerIconTexture.gd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ class_name ControllerIconTexture
@export var path: String = "":
set(_path):
path = _path
_load_texture_path()
_should_trigger_texture_load = true

enum ShowMode {
ANY, ## Icon will be display on any input method.
Expand All @@ -66,7 +66,7 @@ enum ShowMode {
@export var show_mode: ShowMode = ShowMode.ANY:
set(_show_mode):
show_mode = _show_mode
_load_texture_path()
_should_trigger_texture_load = true


## Forces the icon to show a specific controller style, regardless of the
Expand All @@ -80,7 +80,7 @@ enum ShowMode {
@export var force_controller_icon_style: ControllerSettings.Devices = ControllerSettings.Devices.NONE:
set(_force_controller_icon_style):
force_controller_icon_style = _force_controller_icon_style
_load_texture_path()
_should_trigger_texture_load = true

enum ForceType {
NONE, ## Icon will swap according to the used input method.
Expand All @@ -96,7 +96,7 @@ enum ForceType {
@export var force_type: ForceType = ForceType.NONE:
set(_force_type):
force_type = _force_type
_load_texture_path()
_should_trigger_texture_load = true

enum ForceDevice {
DEVICE_0,
Expand Down Expand Up @@ -124,14 +124,14 @@ enum ForceDevice {
@export var force_device: ForceDevice = ForceDevice.ANY:
set(_force_device):
force_device = _force_device
_load_texture_path()
_should_trigger_texture_load = true

@export_subgroup("Text Rendering")
## Custom LabelSettings. If set, overrides the addon's global label settings.
@export var custom_label_settings: LabelSettings:
set(_custom_label_settings):
custom_label_settings = _custom_label_settings
_load_texture_path()
_should_trigger_texture_load = true

# Call _textures setter, which handles signal connections for label settings
_textures = _textures
Expand Down Expand Up @@ -193,6 +193,13 @@ var _font: Font
var _label_settings: LabelSettings
var _text_size: Vector2

var _should_trigger_texture_load = false:
set(value):
if _should_trigger_texture_load == value: return
_should_trigger_texture_load = value
if _should_trigger_texture_load and ControllerIcons != null:
ControllerIcons._textures_to_update.append(self)

func _on_label_settings_changed():
_font = ThemeDB.fallback_font if not _label_settings.font else _label_settings.font
_text_size = _font.get_string_size("+", HORIZONTAL_ALIGNMENT_LEFT, -1, _label_settings.font_size)
Expand Down Expand Up @@ -230,7 +237,7 @@ func _init():
ControllerIcons.input_type_changed.connect(_on_input_type_changed)

func _on_input_type_changed(input_type: int, controller: int):
_load_texture_path()
_should_trigger_texture_load = true

#region "Draw functions"
const _NULL_SIZE := 2
Expand Down