stef_buwalda/pism
1
0
Fork 0
mirror of https://github.com/2OOP/pism.git synced 2026-02-04 10:54:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/assetManager' into assetManager

Browse Source
This commit is contained in:
Stef
2025-10-01 00:08:01 +02:00
parent 7ff65de1ca 21763851e8
commit aba8f682ec
2 changed files with 23 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
framework/src/main/java/org/toop/framework/asset/AssetManager.java
View File

@@ -2,15 +2,12 @@ package org.toop.framework.asset;
import org.toop.framework.asset.resources.*;
import javax.sound.sampled.LineUnavailableException;
import javax.sound.sampled.UnsupportedAudioFileException;
import java.io.File;
import java.io.IOException;
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
public class AssetManager {
private static final AssetManager INSTANCE = new AssetManager();
private static final Map<String, Asset<? extends BaseResource>> assets = new HashMap<>();
private static final Map<String, Asset<? extends BaseResource>> assets = new ConcurrentHashMap<>();
private AssetManager() {}
@@ -18,13 +15,13 @@ public class AssetManager {
return INSTANCE;
}
public static void loadAssets(AssetLoader loader) {
public synchronized static void loadAssets(AssetLoader loader) {
for (var asset : loader.getAssets()) {
assets.put(asset.getName(), asset);
}
}
public <T extends BaseResource> ArrayList<Asset<T>> getAllOfType(Class<T> type) {
public static <T extends BaseResource> ArrayList<Asset<T>> getAllOfType(Class<T> type) {
ArrayList<Asset<T>> list = new ArrayList<>();
for (Asset<? extends BaseResource> asset : assets.values()) { // <-- use .values()
if (type.isInstance(asset.getResource())) {
@@ -36,13 +33,25 @@ public class AssetManager {
return list;
}
public static Asset<? extends BaseResource> getById(String guid) {
return assets.get(guid);
public Asset<? extends BaseResource> getById(String id) {
for (Asset<? extends BaseResource> asset : assets.values()) {
if (asset.getId().toString().equals(id)) {
return asset;
}
}
return null;
}
public static Optional<Asset<? extends BaseResource>> findByName(String name) {
return assets.values().stream()
.filter(a -> a.getName().equals(name))
.findFirst();
public Asset<? extends BaseResource> getByName(String name) {
return assets.get(name);
}
public Optional<Asset<? extends BaseResource>> findByName(String name) {
return Optional.ofNullable(assets.get(name));
}
public void addAsset(Asset<? extends BaseResource> asset) {
assets.put(asset.getName(), asset);
}
}

3
framework/src/main/java/org/toop/framework/audio/SoundManager.java
View File

@@ -12,14 +12,13 @@ import java.util.*;
import javax.sound.sampled.*;
public class SoundManager {
private final AssetManager asm = AssetManager.getInstance();
private final Map<Long, Clip> activeClips = new HashMap<>();
private final HashMap<String, AudioAsset> audioResources = new HashMap<>();
private final SnowflakeGenerator idGenerator = new SnowflakeGenerator(); // TODO: Don't create a new generator
public SoundManager() {
// Get all Audio Resources and add them to a list.
for (Asset<AudioAsset> asset : asm.getAllOfType(AudioAsset.class)) {
for (Asset<AudioAsset> asset : AssetManager.getAllOfType(AudioAsset.class)) {
try {
this.addAudioResource(asset);
} catch (IOException | LineUnavailableException | UnsupportedAudioFileException e) {