mirror of
https://github.com/cyberarm/i-mic-fps.git
synced 2025-12-15 15:42:35 +00:00
Made model/entity manifest a first class object
This commit is contained in:
@@ -6,17 +6,17 @@ class IMICFPS
|
||||
@collision_manager = CollisionManager.new(game_state: self)
|
||||
@renderer = Renderer.new(game_state: self)
|
||||
@map = @options[:map]
|
||||
add_entity(Terrain.new(map_entity: @map.terrain))
|
||||
add_entity(Terrain.new(map_entity: @map.terrain, manifest: Manifest.new(package: @map.terrain.package, model: @map.terrain.model)))
|
||||
|
||||
@draw_skydome = true
|
||||
@skydome = Skydome.new(map_entity: @map.skydome, backface_culling: false)
|
||||
@skydome = Skydome.new(map_entity: @map.skydome, manifest: Manifest.new(package: @map.skydome.package, model: @map.skydome.model), backface_culling: false)
|
||||
add_entity(@skydome)
|
||||
|
||||
@map.entities.each do |ent|
|
||||
add_entity(Entity.new(map_entity: ent))
|
||||
add_entity(Entity.new(map_entity: ent, manifest: Manifest.new(package: ent.package, model: ent.model)))
|
||||
end
|
||||
|
||||
@player = Player.new(spawnpoint: @map.spawnpoints.sample)
|
||||
@player = Player.new(spawnpoint: @map.spawnpoints.sample, manifest: Manifest.new(package: "base", model: "biped"))
|
||||
add_entity(@player)
|
||||
@camera = Camera.new(position: @player.position.clone)
|
||||
@camera.attach_to(@player)
|
||||
|
||||
@@ -52,7 +52,8 @@ class IMICFPS
|
||||
hash = @assets[@asset_index]
|
||||
case hash[:type]
|
||||
when :model
|
||||
ModelLoader.new(manifest_file: IMICFPS.assets_path + "/#{hash[:package]}/#{hash[:name]}/manifest.yaml", entity: @dummy_entity)
|
||||
manifest = Manifest.new(manifest_file: IMICFPS.assets_path + "/#{hash[:package]}/#{hash[:name]}/manifest.yaml")
|
||||
ModelLoader.new(manifest: manifest, entity: @dummy_entity)
|
||||
when :shader
|
||||
Shader.new(name: hash[:name], vertex: "shaders/vertex/#{hash[:name]}.glsl", fragment: "shaders/fragment/#{hash[:name]}.glsl")
|
||||
else
|
||||
|
||||
Reference in New Issue
Block a user