applications/magicciv
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

feat(@projects/@magic-civilization): ✨ add optional sprite load warning flag

Browse source 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
This commit is contained in:
Natalie 2026-06-08 11:46:03 -07:00
parent c1f44e0a83
commit 7734b7532a
2 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/game/engine/src/autoloads/theme_assets.gd
View file

@ -43,7 +43,14 @@ func resolve(relative_path: String) -> String:
return "%s/%s" % [_base_path, relative_path]
func load_sprite(relative_path: String) -> Texture2D:
func load_sprite(relative_path: String, warn_on_miss: bool = true) -> Texture2D:
## `warn_on_miss` defaults to true so genuinely-required assets (terrain,
## city, resource, UI sprites with no procedural backstop) still surface a
## warning. Callers that probe a *speculative* path with a guaranteed
## fallback — e.g. the unit renderer's race×sex variant + generic lookup,
## which always backstops via the ProceduralRenderer — pass false to avoid
## noise on expected misses. Authored-sprite coverage is enforced by
## `test_standin_sprite_coverage.gd`, not by this runtime warning.
var full_path: String = resolve(relative_path)
if full_path.is_empty():
return null
@ -92,7 +99,7 @@ func load_sprite(relative_path: String) -> Texture2D:
# Cache both positive and negative results to avoid repeated I/O
_texture_cache[full_path] = texture
if texture == null:
if texture == null and warn_on_miss:
push_warning("ThemeAssets: FAILED to load '%s'" % full_path)
return texture

8
src/game/engine/src/rendering/unit_renderer_draw.gd
View file

@ -174,13 +174,17 @@ static func cache_unit_sprites(
var pr_force: Node = _get_procedural_renderer()
if pr_force != null and pr_force.call("is_force_procedural"):
return
# Both lookups are speculative: get_unit_sprite() backstops any miss via the
# ProceduralRenderer, so an absent authored PNG is by-design, not an error.
# Pass warn_on_miss=false to keep the log clean; authored coverage is gated
# by test_standin_sprite_coverage.gd, not this runtime warning.
if race_id != "" and sex != "":
var variant_path: String = race_sex_fmt % [type_id, race_id, sex]
if not cache.has(variant_path):
cache[variant_path] = ThemeAssets.load_sprite(variant_path)
cache[variant_path] = ThemeAssets.load_sprite(variant_path, false)
var generic_path: String = generic_fmt % type_id
if not cache.has(generic_path):
cache[generic_path] = ThemeAssets.load_sprite(generic_path)
cache[generic_path] = ThemeAssets.load_sprite(generic_path, false)
## Return best available sprite from cache: race/sex variant first, generic