mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-01-31 18:04:21 +07:00
Code Issues Packages Projects Releases Wiki Activity

...and faster music loading

Browse Source
This commit is contained in:
Anuken 2022-06-26 09:33:26 -04:00
parent d84b981d24
commit 5b48faf13b
1 changed files with 34 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
core/src/mindustry/ClientLauncher.java
View File

@ -98,7 +98,40 @@ public abstract class ClientLauncher extends ApplicationCore implements Platform
}
}
});
assets.setLoader(Music.class, new MusicLoader(tree));
assets.setLoader(Music.class, new MusicLoader(tree){
@Override
public void loadAsync(AssetManager manager, String fileName, Fi file, MusicParameter parameter){
}
@Override
public Music loadSync(AssetManager manager, String fileName, Fi file, MusicParameter parameter){
if(parameter != null && parameter.music != null){
mainExecutor.submit(() -> {
try{
parameter.music.load(file);
}catch(Throwable t){
Log.err("Error loading music: " + file, t);
}
});
return parameter.music;
}else{
Music music = new Music();
mainExecutor.submit(() -> {
try{
music.load(file);
}catch(Throwable t){
Log.err("Error loading music: " + file, t);
}
});
return music;
}
}
});
assets.load("sprites/error.png", Texture.class);
atlas = TextureAtlas.blankAtlas();