Cleanup, moved Map lifecycle into Director, added renderer_info command

This commit is contained in:
2020-12-02 11:38:10 -06:00
parent c7590366a6
commit 9aa5dc7174
15 changed files with 188 additions and 252 deletions

View File

@@ -1,16 +1,13 @@
class IMICFPS
class Game < GameState
attr_reader :map
def setup
@map = Map.new(map_parser: @options[:map_parser])
@map.setup
@player = @map.find_entity_by(name: "character")
def setup
window.director.load_map(map_parser: @options[:map_parser])
@player = window.director.map.find_entity_by(name: "character")
@camera = PerspectiveCamera.new( position: @player.position.clone, aspect_ratio: window.aspect_ratio )
@camera_controller = CameraController.new(mode: :fpv, camera: @camera, entity: @player)
# @director = Networking::Director.new
# @director.load_map(map_parser: @options[:map_parser])
# @connection = Networking::Connection.new(address: "localhost", port: Networking::DEFAULT_SERVER_PORT)
# @connection.connect
@@ -26,32 +23,20 @@ class IMICFPS
end
def draw
@map.render(@camera)
window.director.map.render(@camera)
@hud.draw
end
def update
update_text
control_player
@hud.update
@camera_controller.update
# @connection.update
# @director.tick(window.dt)
@map.update
window.director.tick(window.dt)
@demo.update if @demo
end
def update_text
string = <<-eos
OpenGL Vendor: #{glGetString(GL_VENDOR)}
OpenGL Renderer: #{glGetString(GL_RENDERER)}
OpenGL Version: #{glGetString(GL_VERSION)}
OpenGL Shader Language Version: #{glGetString(GL_SHADING_LANGUAGE_VERSION)}
eos
@demo&.update
end
def control_player
@@ -73,25 +58,25 @@ eos
return
end
@demo.button_down(id) if @demo
@demo&.button_down(id)
@camera_controller.button_down(id)
InputMapper.keydown(id)
Publisher.instance.publish(:button_down, nil, id)
@map.entities.each do |entity|
window.director.map.entities.each do |entity|
entity.button_down(id) if defined?(entity.button_down)
end
end
def button_up(id)
@demo.button_up(id) if @demo
@demo&.button_up(id)
@camera_controller.button_up(id)
InputMapper.keyup(id)
Publisher.instance.publish(:button_up, nil, id)
@map.entities.each do |entity|
window.director.map.entities.each do |entity|
entity.button_up(id) if defined?(entity.button_up)
end
end