Skip to content
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

Type Dynamic callbacks in Assets #1477

Merged
merged 2 commits into from
Nov 9, 2023
Merged

Type Dynamic callbacks in Assets #1477

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b078c23
Type Dynamic callbacks in Assets
RblSb Nov 4, 2023
2b8b640
Move to abstract
RblSb Nov 9, 2023
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
31 changes: 29 additions & 2 deletions Sources/kha/Assets.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,33 @@ import haxe.Unserializer;

using StringTools;

private typedef AssetDataObject = {
/** File name, given by khamake, used as identifier in `Assets.someList.get()` function **/
var name: String;

/** List of file paths, unified by khamake to single file with `name`. **/
var files: Array<String>;

/** File sizes in bytes **/
var file_sizes: Array<Int>;

/** Can be `image`, `sound`, `blob`, `font` and `video` **/
var type: String;

/** Original file width (only for images) **/
var ?original_width: Int;

/** Original file height (only for images) **/
var ?original_height: Int;
}

@:forward(name, files, file_sizes, type, original_width, original_height)
private abstract AssetData(AssetDataObject) from AssetDataObject {
@:op(a.b) function _get(key: String): Dynamic {
return Reflect.getProperty(this, key);
}
}

@:build(kha.internal.AssetsBuilder.build("image"))
private class ImageList {
public function new() {}
Expand Down Expand Up @@ -76,8 +103,8 @@ class Assets {
Additionally by default all sounds are decompressed. The uncompressSoundsFilter can be used to avoid that.
Uncompressed sounds can still be played using Audio.stream which is recommended for music.
*/
public static function loadEverything(callback: Void->Void, filter: Dynamic->Bool = null, uncompressSoundsFilter: Dynamic->Bool = null,
?failed: AssetError->Void): Void {
public static function loadEverything(callback: () -> Void, ?filter: (item: AssetData) -> Bool, ?uncompressSoundsFilter: (soundItem: AssetData) -> Bool,
?failed: (err: AssetError) -> Void): Void {
final lists: Array<Dynamic> = [ImageList, SoundList, BlobList, FontList, VideoList];
final listInstances: Array<Dynamic> = [images, sounds, blobs, fonts, videos];
var fileCount = 0;
Expand Down
Loading