cyberarm_engine 0.25.0 → 0.30.0

data/lib/cyberarm_engine/window.rb

@@ -1,195 +1,234 @@
-module CyberarmEngine
-  class Window < Gosu::Window
-    include Common
-
-    IMAGES = {}
-    SAMPLES = {}
-    SONGS = {}
-
-    attr_accessor :show_cursor, :show_stats_plotter
-    attr_writer :exit_on_opengl_error
-    attr_reader :last_frame_time, :delta_time, :states
-
-    def self.now
-      Gosu.milliseconds
-    end
-
-    def self.dt
-      instance.dt
-    end
-
-    def self.instance=(window)
-      raise ArgumentError, "Expected window to be a subclass of CyberarmEngine::Window, got: #{window.class}" unless window.is_a?(CyberarmEngine::Window)
-
-      @@instance = window
-    end
-
-    def self.instance
-      @@instance
-    end
-
-    def initialize(width: 800, height: 600, fullscreen: false, update_interval: 1000.0 / 60, resizable: false, borderless: false)
-      @show_cursor = false
-      @has_focus = false
-      @show_stats_plotter = false
-
-      super(width, height, fullscreen: fullscreen, update_interval: update_interval, resizable: resizable, borderless: borderless)
-      Window.instance = self
-
-      @last_frame_time = Gosu.milliseconds - 1
-      @current_frame_time = Gosu.milliseconds
-      @delta_time = @last_frame_time
-      self.caption = "CyberarmEngine #{CyberarmEngine::VERSION} #{Gosu.user_languages.join(', ')}"
-
-      @states = []
-      @exit_on_opengl_error = false
-      preload_default_shaders if respond_to?(:preload_default_shaders)
-      @stats_plotter = Stats::StatsPlotter.new(2, 28) # FIXME: Make positioning easy
-
-      setup
-    end
-
-    def setup
-    end
-
-    def draw
-      Stats.frame.start_timing(:draw)
-
-      current_state&.draw
-      Stats.frame.start_timing(:engine_stats_renderer)
-      @stats_plotter&.draw if @show_stats_plotter
-      Stats.frame.end_timing(:engine_stats_renderer)
-
-      Stats.frame.end_timing(:draw)
-      Stats.frame.start_timing(:interframe_sleep)
-    end
-
-    def update
-      # Gosu calls update() then (optionally) draw(),
-      # so always end last frame and start next frame when update() is called.
-      Stats.frame&.end_timing(:interframe_sleep)
-      Stats.end_frame
-
-      Stats.new_frame
-
-      @delta_time = (Gosu.milliseconds - @current_frame_time) * 0.001
-
-      @last_frame_time = Gosu.milliseconds - @current_frame_time
-      @current_frame_time = Gosu.milliseconds
-
-      Stats.frame.start_timing(:update)
-      current_state&.update
-      Stats.frame.end_timing(:update)
-
-      Stats.frame.start_timing(:interframe_sleep) unless needs_redraw?
-    end
-
-    def needs_cursor?
-      @show_cursor
-    end
-
-    def needs_redraw?
-      current_state ? current_state.needs_redraw? : true
-    end
-
-    def drop(filename)
-      current_state&.drop(filename)
-    end
-
-    def gamepad_connected(index)
-      current_state&.gamepad_connected(index)
-    end
-
-    def gamepad_disconnected(index)
-      current_state&.gamepad_disconnected(index)
-    end
-
-    def gain_focus
-      @has_focus = true
-
-      current_state&.gain_focus
-    end
-
-    def lose_focus
-      @has_focus = false
-
-      current_state&.lose_focus
-    end
-
-    def button_down(id)
-      super
-      current_state&.button_down(id)
-    end
-
-    def button_up(id)
-      super
-      current_state&.button_up(id)
-    end
-
-    def close
-      current_state ? current_state.close : super
-    end
-
-    def dt
-      @last_frame_time / 1000.0
-    end
-
-    def aspect_ratio
-      width / height.to_f
-    end
-
-    def exit_on_opengl_error?
-      @exit_on_opengl_error
-    end
-
-    def push_state(klass, options = {})
-      options = { setup: true }.merge(options)
-
-      if klass.instance_of?(klass.class) && klass.respond_to?(:options)
-        @states << klass
-        klass.setup if options[:setup]
-        klass.post_setup if options[:setup]
-      else
-        @states << klass.new(options) if child_of?(klass, GameState)
-        @states << klass.new if child_of?(klass, Element::Container)
-        current_state.setup if current_state.instance_of?(klass) && options[:setup]
-        current_state.post_setup if current_state.instance_of?(klass) && options[:setup]
-      end
-    end
-
-    private def child_of?(input, klass)
-      return false unless input
-
-      input.ancestors.detect { |c| c == klass }
-    end
-
-    def current_state
-      @states.last
-    end
-
-    def pop_state
-      @states.pop
-
-      current_state.request_repaint if current_state&.is_a?(GuiState)
-    end
-
-    def shift_state
-      @states.shift
-
-      current_state.request_repaint if current_state&.is_a?(GuiState)
-    end
-
-    def has_focus?
-      @has_focus
-    end
-
-    # Sourced from https://gist.github.com/ippa/662583
-    def draw_circle(cx, cy, r, z = 9999, color = Gosu::Color::GREEN, step = 10)
-      0.step(360, step) do |a1|
-        a2 = a1 + step
-        draw_line(cx + Gosu.offset_x(a1, r), cy + Gosu.offset_y(a1, r), color, cx + Gosu.offset_x(a2, r),
-                  cy + Gosu.offset_y(a2, r), color, z)
-      end
-    end
-  end
-end
+module CyberarmEngine
+  class Window < Gosu::Window
+    include Common
+
+    IMAGES = {}
+    SAMPLES = {}
+    SONGS = {}
+
+    FixedUpdateProperties = Data.define(:fixed_timestep, :fixed_timestep_int_ms, :max_timestep)
+    FixedUpdate = Struct.new(:milliseconds, :accumulator, :interpolation, :alpha)
+
+    attr_accessor :show_cursor, :show_stats_plotter
+    attr_writer :exit_on_opengl_error
+    attr_reader :last_frame_time, :delta_time, :states
+
+    def self.now
+      Gosu.milliseconds
+    end
+
+    def self.dt
+      instance.dt
+    end
+
+    def self.instance=(window)
+      raise ArgumentError, "Expected window to be a subclass of CyberarmEngine::Window, got: #{window.class}" unless window.is_a?(CyberarmEngine::Window)
+
+      @@instance = window
+    end
+
+    def self.instance
+      @@instance
+    end
+
+    def initialize(width: 800, height: 600, fullscreen: false, update_interval: 1000.0 / 60, resizable: false, borderless: false, fixed_update_timestep: 1.0 / 125, fixed_update_timestep_int_ms: 8, fixed_max_timestep: 1.0 / 60)
+      @show_cursor = false
+      @has_focus = false
+      @show_stats_plotter = false
+
+      super(width, height, fullscreen: fullscreen, update_interval: update_interval, resizable: resizable, borderless: borderless)
+      Window.instance = self
+
+      @last_frame_time = Gosu.milliseconds - 1
+      @current_frame_time = Gosu.milliseconds
+      @delta_time = @last_frame_time
+      self.caption = "CyberarmEngine #{CyberarmEngine::VERSION} #{Gosu.user_languages.join(', ')}"
+
+      @states = []
+      @exit_on_opengl_error = false
+      preload_default_shaders if respond_to?(:preload_default_shaders)
+      @stats_plotter = Stats::StatsPlotter.new(2, 28) # FIXME: Make positioning easy
+
+      @fixed_timestep_data = FixedUpdateProperties.new(1.0 / 125, 8, 1.0 / 60)
+      @fixed_update = FixedUpdate.new(0, 0.0, 0.0, 1.0)
+
+      setup
+    end
+
+    def setup
+    end
+
+    def draw
+      Stats.frame.start_timing(:draw)
+
+      current_state&.draw
+      Stats.frame.start_timing(:engine_stats_renderer)
+      @stats_plotter&.draw if @show_stats_plotter
+      Stats.frame.end_timing(:engine_stats_renderer)
+
+      Stats.frame.end_timing(:draw)
+      Stats.frame.start_timing(:interframe_sleep)
+    end
+
+    def update
+      # Gosu calls update() then (optionally) draw(),
+      # so always end last frame and start next frame when update() is called.
+      Stats.frame&.end_timing(:interframe_sleep)
+      Stats.end_frame
+
+      Stats.new_frame
+
+      @delta_time = (Gosu.milliseconds - @current_frame_time) * 0.001
+
+      @last_frame_time = Gosu.milliseconds - @current_frame_time
+      @current_frame_time = Gosu.milliseconds
+
+      Stats.frame.start_timing(:update)
+      current_state&.update
+      Stats.frame.start_timing(:fixed_update)
+      fixed_update
+      Stats.frame.end_timing(:fixed_update)
+      Stats.frame.end_timing(:update)
+
+      Stats.frame.start_timing(:interframe_sleep) unless needs_redraw?
+    end
+
+    def fixed_update
+      @delta_time = @fixed_timestep_data.max_timestep if @delta_time > @fixed_timestep_data.max_timestep
+      @fixed_update.accumulator += @delta_time
+
+      while @fixed_update.accumulator >= @fixed_timestep_data.fixed_timestep
+        @fixed_update.accumulator -= @fixed_timestep_data.fixed_timestep
+
+        @fixed_update.alpha = @fixed_update.accumulator / @fixed_timestep_data.fixed_timestep
+
+        @fixed_update.milliseconds += @fixed_timestep_data.fixed_timestep_int_ms
+        current_state&.fixed_update(@fixed_timestep_data.fixed_timestep)
+      end
+    end
+
+    def fixed_update_milliseconds
+      @fixed_update.milliseconds
+    end
+
+    def fixed_update_accumulator
+      @fixed_update.accumulator
+    end
+
+    def fixed_update_interpolation
+      @fixed_update.interpolation
+    end
+
+    def fixed_update_alpha
+      @fixed_update.alpha
+    end
+
+    def needs_cursor?
+      @show_cursor
+    end
+
+    def needs_redraw?
+      current_state ? current_state.needs_redraw? : true
+    end
+
+    def drop(filename)
+      current_state&.drop(filename)
+    end
+
+    def gamepad_connected(index)
+      current_state&.gamepad_connected(index)
+    end
+
+    def gamepad_disconnected(index)
+      current_state&.gamepad_disconnected(index)
+    end
+
+    def gain_focus
+      @has_focus = true
+
+      current_state&.gain_focus
+    end
+
+    def lose_focus
+      @has_focus = false
+
+      current_state&.lose_focus
+    end
+
+    def button_down(id)
+      super
+      current_state&.button_down(id)
+    end
+
+    def button_up(id)
+      super
+      current_state&.button_up(id)
+    end
+
+    def close
+      current_state ? current_state.close : super
+    end
+
+    def dt
+      @last_frame_time / 1000.0
+    end
+
+    def aspect_ratio
+      width / height.to_f
+    end
+
+    def exit_on_opengl_error?
+      @exit_on_opengl_error
+    end
+
+    def push_state(klass, options = {})
+      options = { setup: true }.merge(options)
+
+      if klass.instance_of?(klass.class) && klass.respond_to?(:options)
+        @states << klass
+        klass.setup if options[:setup]
+        klass.post_setup if options[:setup]
+      else
+        @states << klass.new(options) if child_of?(klass, GameState)
+        @states << klass.new if child_of?(klass, Element::Container)
+        current_state.setup if current_state.instance_of?(klass) && options[:setup]
+        current_state.post_setup if current_state.instance_of?(klass) && options[:setup]
+      end
+    end
+
+    private def child_of?(input, klass)
+      return false unless input
+
+      input.ancestors.detect { |c| c == klass }
+    end
+
+    def current_state
+      @states.last
+    end
+
+    def pop_state
+      @states.pop
+
+      current_state.request_repaint if current_state&.is_a?(GuiState)
+    end
+
+    def shift_state
+      @states.shift
+
+      current_state.request_repaint if current_state&.is_a?(GuiState)
+    end
+
+    def has_focus?
+      @has_focus
+    end
+
+    # Sourced from https://gist.github.com/ippa/662583
+    def draw_circle(cx, cy, r, z = 9999, color = Gosu::Color::GREEN, step = 10)
+      0.step(360, step) do |a1|
+        a2 = a1 + step
+        draw_line(cx + Gosu.offset_x(a1, r), cy + Gosu.offset_y(a1, r), color, cx + Gosu.offset_x(a2, r),
+                  cy + Gosu.offset_y(a2, r), color, z)
+      end
+    end
+  end
+end

data/lib/cyberarm_engine.rb

@@ -1,76 +1,88 @@
-CYBERARM_ENGINE_ROOT_PATH = File.expand_path("..", __dir__)
-
-if ARGV.join.include?("--ffi-gosu")
-  require File.expand_path("../../ffi-gosu/lib/gosu", __dir__)
-else
-  require "gosu"
-end
-require "json"
-
-require_relative "cyberarm_engine/version"
-require_relative "cyberarm_engine/stats"
-
-require_relative "cyberarm_engine/common"
-
-require_relative "cyberarm_engine/gosu_ext/draw_arc"
-require_relative "cyberarm_engine/gosu_ext/draw_circle"
-require_relative "cyberarm_engine/gosu_ext/draw_path"
-
-require_relative "cyberarm_engine/notification"
-require_relative "cyberarm_engine/notification_manager"
-
-require_relative "cyberarm_engine/game_object"
-require_relative "cyberarm_engine/window"
-
-require_relative "cyberarm_engine/bounding_box"
-require_relative "cyberarm_engine/vector"
-require_relative "cyberarm_engine/transform"
-require_relative "cyberarm_engine/ray"
-require_relative "cyberarm_engine/background"
-require_relative "cyberarm_engine/background_nine_slice"
-require_relative "cyberarm_engine/background_image"
-require_relative "cyberarm_engine/animator"
-
-require_relative "cyberarm_engine/text"
-require_relative "cyberarm_engine/timer"
-require_relative "cyberarm_engine/config_file"
-
-require_relative "cyberarm_engine/console"
-require_relative "cyberarm_engine/console/command"
-require_relative "cyberarm_engine/console/subcommand"
-require_relative "cyberarm_engine/console/commands/help_command"
-
-require_relative "cyberarm_engine/ui/dsl"
-
-require_relative "cyberarm_engine/ui/theme"
-require_relative "cyberarm_engine/ui/event"
-require_relative "cyberarm_engine/ui/style"
-require_relative "cyberarm_engine/ui/border_canvas"
-require_relative "cyberarm_engine/ui/element"
-require_relative "cyberarm_engine/ui/elements/text_block"
-require_relative "cyberarm_engine/ui/elements/button"
-require_relative "cyberarm_engine/ui/elements/toggle_button"
-require_relative "cyberarm_engine/ui/elements/list_box"
-require_relative "cyberarm_engine/ui/elements/edit_line"
-require_relative "cyberarm_engine/ui/elements/edit_box"
-require_relative "cyberarm_engine/ui/elements/image"
-require_relative "cyberarm_engine/ui/elements/container"
-require_relative "cyberarm_engine/ui/elements/flow"
-require_relative "cyberarm_engine/ui/elements/stack"
-require_relative "cyberarm_engine/ui/elements/check_box"
-require_relative "cyberarm_engine/ui/elements/radio"
-require_relative "cyberarm_engine/ui/elements/progress"
-require_relative "cyberarm_engine/ui/elements/slider"
-require_relative "cyberarm_engine/ui/elements/menu"
-require_relative "cyberarm_engine/ui/elements/menu_item"
-
-require_relative "cyberarm_engine/game_state"
-require_relative "cyberarm_engine/ui/gui_state"
-
-require_relative "cyberarm_engine/builtin/intro_state"
-
-if RUBY_ENGINE != "mruby" && defined?(StackProf)
-  at_exit do
-    StackProf.results("./_stackprof.dmp")
-  end
-end
+CYBERARM_ENGINE_ROOT_PATH = File.expand_path("..", __dir__)
+
+if ARGV.join.include?("--ffi-gosu")
+  require File.expand_path("../../ffi-gosu/lib/gosu", __dir__)
+else
+  require "gosu"
+end
+require "json"
+
+require_relative "cyberarm_engine/version"
+require_relative "cyberarm_engine/stats"
+require_relative "cyberarm_engine/result"
+require_relative "cyberarm_engine/event_bus"
+
+require_relative "cyberarm_engine/common"
+
+require_relative "cyberarm_engine/gosu_ext/draw_arc"
+require_relative "cyberarm_engine/gosu_ext/draw_circle"
+require_relative "cyberarm_engine/gosu_ext/draw_path"
+
+require_relative "cyberarm_engine/notification"
+require_relative "cyberarm_engine/notification_manager"
+
+require_relative "cyberarm_engine/game_object"
+require_relative "cyberarm_engine/window"
+
+require_relative "cyberarm_engine/bounding_box"
+require_relative "cyberarm_engine/vector"
+require_relative "cyberarm_engine/transform"
+require_relative "cyberarm_engine/ray"
+require_relative "cyberarm_engine/background"
+require_relative "cyberarm_engine/background_nine_slice"
+require_relative "cyberarm_engine/background_image"
+require_relative "cyberarm_engine/animator"
+
+require_relative "cyberarm_engine/text"
+require_relative "cyberarm_engine/timer"
+require_relative "cyberarm_engine/config_file"
+
+require_relative "cyberarm_engine/console"
+require_relative "cyberarm_engine/console/command"
+require_relative "cyberarm_engine/console/subcommand"
+require_relative "cyberarm_engine/console/commands/help_command"
+
+require_relative "cyberarm_engine/pathfinding/graph"
+require_relative "cyberarm_engine/pathfinding/graphs/grid"
+require_relative "cyberarm_engine/pathfinding/graph_search"
+require_relative "cyberarm_engine/pathfinding/graph_searches/breadth_first_search"
+require_relative "cyberarm_engine/pathfinding/graph_searches/dijkstra_search"
+require_relative "cyberarm_engine/pathfinding/graph_searches/astar_search"
+
+require_relative "cyberarm_engine/ui/dsl"
+
+require_relative "cyberarm_engine/ui/theme"
+require_relative "cyberarm_engine/ui/event"
+require_relative "cyberarm_engine/ui/style"
+require_relative "cyberarm_engine/ui/border_canvas"
+require_relative "cyberarm_engine/ui/element"
+require_relative "cyberarm_engine/ui/elements/text_block"
+require_relative "cyberarm_engine/ui/elements/button"
+require_relative "cyberarm_engine/ui/elements/toggle_button"
+require_relative "cyberarm_engine/ui/elements/list_box"
+require_relative "cyberarm_engine/ui/elements/edit_line"
+require_relative "cyberarm_engine/ui/elements/edit_box"
+require_relative "cyberarm_engine/ui/elements/image"
+require_relative "cyberarm_engine/ui/elements/container"
+require_relative "cyberarm_engine/ui/elements/flow"
+require_relative "cyberarm_engine/ui/elements/stack"
+require_relative "cyberarm_engine/ui/elements/widget"
+require_relative "cyberarm_engine/ui/elements/check_box"
+require_relative "cyberarm_engine/ui/elements/radio"
+require_relative "cyberarm_engine/ui/elements/progress"
+require_relative "cyberarm_engine/ui/elements/slider"
+require_relative "cyberarm_engine/ui/elements/menu"
+require_relative "cyberarm_engine/ui/elements/menu_item"
+
+require_relative "cyberarm_engine/game_state"
+require_relative "cyberarm_engine/ui/gui_state"
+require_relative "cyberarm_engine/ui/dialog"
+require_relative "cyberarm_engine/ui/page"
+
+require_relative "cyberarm_engine/builtin/intro_state"
+
+if RUBY_ENGINE != "mruby" && defined?(StackProf)
+  at_exit do
+    StackProf.results("./_stackprof.dmp")
+  end
+end

data/mrbgem.rake

@@ -1,29 +1,29 @@
-MRuby::Gem::Specification.new("mruby-cyberarm_engine") do |spec|
-  spec.license = "MIT"
-  spec.authors = "cyberarm"
-  spec.summary = " Yet another framework for building games with Gosu"
-
-  lib_rbfiles = []
-  # Dir.glob("#{File.expand_path("..", __FILE__)}/lib/**/*.rb").reject do |f|
-    # File.basename(f.downcase, ".rb") == "cyberarm_engine" ||
-    # File.basename(f.downcase, ".rb") == "opengl" ||
-    # f.downcase.include?("/opengl/")
-  # end.reverse!
-
-  local_path = File.expand_path("..", __FILE__)
-  File.read("#{local_path}/lib/cyberarm_engine.rb").each_line do |line|
-    line = line.strip
-
-    next unless line.start_with?("require_relative")
-
-    file = line.split("require_relative").last.strip.gsub("\"", "")
-
-    next if file.include?(" if ")
-
-    lib_rbfiles << "#{local_path}/lib/#{file}.rb"
-  end
-
-  pp lib_rbfiles
-
-  spec.rbfiles = lib_rbfiles
-end
+MRuby::Gem::Specification.new("mruby-cyberarm_engine") do |spec|
+  spec.license = "MIT"
+  spec.authors = "cyberarm"
+  spec.summary = " Yet another framework for building games with Gosu"
+
+  lib_rbfiles = []
+  # Dir.glob("#{File.expand_path("..", __FILE__)}/lib/**/*.rb").reject do |f|
+    # File.basename(f.downcase, ".rb") == "cyberarm_engine" ||
+    # File.basename(f.downcase, ".rb") == "opengl" ||
+    # f.downcase.include?("/opengl/")
+  # end.reverse!
+
+  local_path = File.expand_path("..", __FILE__)
+  File.read("#{local_path}/lib/cyberarm_engine.rb").each_line do |line|
+    line = line.strip
+
+    next unless line.start_with?("require_relative")
+
+    file = line.split("require_relative").last.strip.gsub("\"", "")
+
+    next if file.include?(" if ")
+
+    lib_rbfiles << "#{local_path}/lib/#{file}.rb"
+  end
+
+  pp lib_rbfiles
+
+  spec.rbfiles = lib_rbfiles
+end