testing work
	
		
			
	
		
	
	
		
	
		
			Some checks failed
		
		
	
	
		
			
				
	
				studiorailgun/Renderer/pipeline/head There was a failure building this commit
				
			
		
		
	
	
				
					
				
			
		
			Some checks failed
		
		
	
	studiorailgun/Renderer/pipeline/head There was a failure building this commit
				
			This commit is contained in:
		
							parent
							
								
									52354e59ee
								
							
						
					
					
						commit
						73942b1fa0
					
				| @ -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,10 +105,12 @@ public class AssetManager { | |||||||
|             texturesLoadedIntoMemory.put(currentPath, new Texture(currentPath)); |             texturesLoadedIntoMemory.put(currentPath, new Texture(currentPath)); | ||||||
|         } |         } | ||||||
|         //audio from disk |         //audio from disk | ||||||
|  |         if(Globals.audioEngine != null && Globals.audioEngine.initialized()){ | ||||||
|             for(String currentPath : audioInQueue){ |             for(String currentPath : audioInQueue){ | ||||||
|                 audioInQueue.remove(currentPath); |                 audioInQueue.remove(currentPath); | ||||||
|                 audioLoadedIntoMemory.put(currentPath, new AudioBuffer(currentPath)); |                 audioLoadedIntoMemory.put(currentPath, new AudioBuffer(currentPath)); | ||||||
|             } |             } | ||||||
|  |         } | ||||||
|         //shaders |         //shaders | ||||||
|         for(ActorShaderMask currentShader : shadersInQueue){ |         for(ActorShaderMask currentShader : shadersInQueue){ | ||||||
|             shadersInQueue.remove(currentShader); |             shadersInQueue.remove(currentShader); | ||||||
|  | |||||||
		Loading…
	
		Reference in New Issue
	
	Block a user