aboutsummaryrefslogtreecommitdiff
path: root/tools/compile_assets/loaders.odin
diff options
context:
space:
mode:
authoriamcheeseman <[hidden email]>2026-02-27 23:23:16 -0500
committeriamcheeseman <[hidden email]>2026-02-27 23:23:16 -0500
commit97e7909e4d730524b3ea319fa86520ed3bb3df5c (patch)
treea95a7fc3fe27e3391814b4c06ae04affdb2818ed /tools/compile_assets/loaders.odin
parentf45cafdf46455768985e3d3a118bbca1839e937f (diff)
use odin's new handle maps rather than my own
Diffstat (limited to 'tools/compile_assets/loaders.odin')
-rw-r--r--tools/compile_assets/loaders.odin13
1 files changed, 7 insertions, 6 deletions
diff --git a/tools/compile_assets/loaders.odin b/tools/compile_assets/loaders.odin
index eadbc44..88ddd08 100644
--- a/tools/compile_assets/loaders.odin
+++ b/tools/compile_assets/loaders.odin
@@ -1,6 +1,6 @@
package assets_gen
-import os "core:os/os2"
+import "core:os"
import "core:fmt"
import "core:strings"
import "core:path/filepath"
@@ -78,11 +78,11 @@ load_png :: proc(path: string, png_file: ^os.File, output: ^os.File) {
die("Could not convert PNG to QOI (%v)", qoi_err)
}
- abs_path, found_abs := filepath.abs(
+ abs_path, abs_err := filepath.abs(
compiled_path,
context.temp_allocator
)
- if !found_abs {
+ if abs_err != nil {
die("Could not find absolute path for %v", compiled_path)
}
@@ -159,11 +159,11 @@ _load_sprite_sheet :: proc(
die("Could not save spritesheet %v (%v)", path, qoi_err)
}
- abs_path, found_abs := filepath.abs(
+ abs_path, abs_err := filepath.abs(
compiled_path,
context.temp_allocator
)
- if !found_abs {
+ if abs_err != nil {
die("Could not find absolute path for %v", compiled_path)
}
@@ -240,7 +240,8 @@ load_ase :: proc(path: string, ase_file: ^os.File, output: ^os.File) {
unmarshal_err := ase.unmarshal(&doc, path, alloc = context.temp_allocator)
if unmarshal_err != nil {
- die("Could not unmarshal aseprite file %v (%v)", path, unmarshal_err)
+ // FIXME: Odin bug? Had to not die here because the condition above is borked
+ fmt.eprintfln("Could not unmarshal aseprite file %v (%v)", path, unmarshal_err)
}
// Load animation