testing work
Some checks failed
studiorailgun/Renderer/pipeline/head There was a failure building this commit

This commit is contained in:
austin 2024-08-01 17:40:52 -04:00
parent 52354e59ee
commit 73942b1fa0

View File

@ -4,6 +4,7 @@ import electrosphere.audio.AudioBuffer;
import electrosphere.collision.CollisionBodyCreation; import electrosphere.collision.CollisionBodyCreation;
import electrosphere.collision.CollisionEngine; import electrosphere.collision.CollisionEngine;
import electrosphere.collision.collidable.Collidable; import electrosphere.collision.collidable.Collidable;
import electrosphere.engine.Globals;
import electrosphere.engine.assetmanager.queue.QueuedAsset; import electrosphere.engine.assetmanager.queue.QueuedAsset;
import electrosphere.logger.LoggerInterface; import electrosphere.logger.LoggerInterface;
import electrosphere.renderer.actor.ActorShaderMask; import electrosphere.renderer.actor.ActorShaderMask;
@ -104,9 +105,11 @@ public class AssetManager {
texturesLoadedIntoMemory.put(currentPath, new Texture(currentPath)); texturesLoadedIntoMemory.put(currentPath, new Texture(currentPath));
} }
//audio from disk //audio from disk
for(String currentPath : audioInQueue){ if(Globals.audioEngine != null && Globals.audioEngine.initialized()){
audioInQueue.remove(currentPath); for(String currentPath : audioInQueue){
audioLoadedIntoMemory.put(currentPath, new AudioBuffer(currentPath)); audioInQueue.remove(currentPath);
audioLoadedIntoMemory.put(currentPath, new AudioBuffer(currentPath));
}
} }
//shaders //shaders
for(ActorShaderMask currentShader : shadersInQueue){ for(ActorShaderMask currentShader : shadersInQueue){