diff options
author | Hop311 <Hop3114@gmail.com> | 2023-12-04 10:47:51 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-12-04 10:47:51 +0100 |
commit | e01d332f407420db84fbfd207f18c3fec1c1b6a3 (patch) | |
tree | b963c671239ecd693d4162afe4b1b9d3b064554e /extension/src/openvic-extension/singletons/AssetManager.hpp | |
parent | 9165f5980c5cfe75b3bad4303a5822340f6adcfc (diff) | |
parent | 6e350a3dc0b596b1f76fab3b943b67b7713ea4fa (diff) |
Merge pull request #168 from OpenVicProject/update-sim
Sim submodule update + compatibility fixes
Diffstat (limited to 'extension/src/openvic-extension/singletons/AssetManager.hpp')
-rw-r--r-- | extension/src/openvic-extension/singletons/AssetManager.hpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/extension/src/openvic-extension/singletons/AssetManager.hpp b/extension/src/openvic-extension/singletons/AssetManager.hpp index 7cfc31b..625944d 100644 --- a/extension/src/openvic-extension/singletons/AssetManager.hpp +++ b/extension/src/openvic-extension/singletons/AssetManager.hpp @@ -23,6 +23,7 @@ namespace OpenVic { image_asset_map_t image_assets; font_map_t fonts; + static godot::Ref<godot::Image> _load_image(godot::StringName path); image_asset_map_t::iterator _get_image_asset(godot::StringName path); protected: @@ -35,8 +36,8 @@ namespace OpenVic { ~AssetManager(); /* Search for and load an image at the specified path relative to the game defines, first checking the AssetManager's - * image cache in case it has already been loaded, and returning nullptr if image loading fails. */ - godot::Ref<godot::Image> get_image(godot::StringName path); + * image cache (if cache is true) in case it has already been loaded, and returning nullptr if image loading fails. */ + godot::Ref<godot::Image> get_image(godot::StringName path, bool cache = true); /* Create a texture from an image found at the specified path relative to the game defines, fist checking * AssetManager's texture cache in case it has already been loaded, and returning nullptr if image loading |