cyberarm/i-mic-fps
1
0
Fork 0
mirror of https://github.com/cyberarm/i-mic-fps.git synced 2025-12-15 15:42:35 +00:00
Code Issues Projects Releases Wiki Activity

Fixed progressbar jumping back due to needing to load additional assets detected in manifests

Browse Source
This commit is contained in:
Cyberarm
2019-09-30 09:14:35 -05:00
parent c1ec292570
commit 2ae97aa993
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/states/game_states/loading_state.rb
View File

@@ -53,9 +53,7 @@ class IMICFPS
hash = @assets[@asset_index]
case hash[:type]
when :model
manifest = Manifest.new(manifest_file: IMICFPS.assets_path + "/#{hash[:package]}/#{hash[:name]}/manifest.yaml")
add_required_assets(manifest)
ModelLoader.new(manifest: manifest, entity: @dummy_entity)
ModelLoader.new(manifest: hash[:manifest], entity: @dummy_entity)
when :shader
Shader.new(name: hash[:name], vertex: "shaders/vertex/#{hash[:name]}.glsl", fragment: "shaders/fragment/#{hash[:name]}.glsl")
else
@@ -81,7 +79,9 @@ class IMICFPS
end
def add_asset(type, package, name)
@assets << {type: type, package: package, name: name}
manifest = Manifest.new(manifest_file: IMICFPS.assets_path + "/#{package}/#{name}/manifest.yaml")
add_required_assets(manifest)
@assets << {type: type, manifest: manifest, package: package, name: name}
end
def add_required_assets(manifest)