cyberarm_engine 0.25.1 → 0.30.0

data/lib/cyberarm_engine/ui/event.rb

@@ -13,7 +13,7 @@ module CyberarmEngine
     def publish(event, *args)
       raise ArgumentError, "#{self.class} does not handle #{event.inspect}" unless @event_handler.include?(event)
 
-      return unless enabled?
+      return if !enabled? && event != :changed
 
       was_handled = false
 

data/lib/cyberarm_engine/ui/gui_state.rb

@@ -6,6 +6,7 @@ module CyberarmEngine
     def initialize(options = {})
       @options = options
       @game_objects = []
+      @timers = []
       @global_pause = false
 
       @down_keys = {}
@@ -17,6 +18,10 @@ module CyberarmEngine
       @active_width  = window.width
       @active_height = window.height
 
+      @pages = {}
+      @page_host = nil
+      @page = nil
+
       @menu = nil
       @focus = nil
       @mouse_over = nil
@@ -26,6 +31,7 @@ module CyberarmEngine
       @dragging_element = nil
       @pending_recalculate_request = false
       @pending_element_recalculate_requests = []
+      @hit_elements = []
 
       @needs_repaint = false
 
@@ -38,14 +44,45 @@ module CyberarmEngine
       @tip = Element::ToolTip.new("", parent: @root_container, z: Float::INFINITY, theme: current_theme)
     end
 
-    def menu
+    def active_menu
       @menu
     end
 
+    def page(klass, options = {})
+      @page&.blur
+
+      @pages[klass] = klass.new(parent: options[:parent] || self) unless @pages[klass]
+      @page = @pages[klass]
+
+      @page.options = options
+      page_host.clear do
+        @page.setup
+      end
+      @page.focus
+    end
+
+    def current_page
+      @page
+    end
+
+    def page_host
+      return @page.parent if @page.parent.is_a?(CyberarmEngine::Element::Container)
+      return @page_host if @page_host && @page_host.is_a?(CyberarmEngine::Element::Container)
+
+      @root_container
+    end
+
+    def page_host=(container)
+      raise "page host must be a CyberarmEngine::Element::Container" unless container.is_a?(Container)
+
+      @page_host = container
+    end
+
     # throws :blur event to focused element and sets GuiState focused element
     # Does NOT throw :focus event at element or set element as focused
     def focus=(element)
       @focus.publish(:blur) if @focus && element && @focus != element
+      @hit_elements.delete(@focus)
       @focus = element
     end
 
@@ -61,7 +98,15 @@ module CyberarmEngine
       Stats.frame.start_timing(:gui_element_recalculate_requests)
 
       # puts "PENDING REQUESTS: #{@pending_element_recalculate_requests.size}" if @pending_element_recalculate_requests.size.positive?
-      @pending_element_recalculate_requests.shift(&:recalculate)
+      while (e = @pending_element_recalculate_requests.shift)
+        # its pointless to recalculate individual elements when we've been asked to recalculate the whole gui
+        if @pending_recalculate_request
+          @pending_element_recalculate_requests.clear
+          break
+        end
+
+        e.recalculate
+      end
 
       Stats.frame.end_timing(:gui_element_recalculate_requests)
 
@@ -97,6 +142,8 @@ module CyberarmEngine
       end
 
       @needs_repaint = false
+
+      @page&.draw
     end
 
     def needs_repaint?
@@ -126,22 +173,37 @@ module CyberarmEngine
       return unless window.has_focus?
       return unless window.current_state == self
 
-      new_mouse_over = @menu.hit_element?(window.mouse_x, window.mouse_y) if @menu
-      new_mouse_over ||= @root_container.hit_element?(window.mouse_x, window.mouse_y)
+      # list of containers decending down to hit element
+      new_hit_elements = (@menu || @root_container).hit_element?(window.mouse_x, window.mouse_y)
+      # element the mouse is over, if any.
+      new_mouse_over = new_hit_elements&.find { |c| c.is_a?(CyberarmEngine::Element::Widget) } || new_hit_elements&.last
+
+      # is the currently hit element the same as last hit element?
+      same_element = @mouse_over && new_mouse_over == @mouse_over
+
+      unless @hit_elements == new_hit_elements
+        added_hit_elements = (new_hit_elements || []) - @hit_elements
+        removed_hit_elements = @hit_elements - (new_hit_elements || [])
+
+        added_hit_elements.each do |e|
+          e.publish(:enter)
+          e.publish(:hover)
+        end
 
-      if new_mouse_over
-        new_mouse_over.publish(:enter) if new_mouse_over != @mouse_over
-        new_mouse_over.publish(:hover)
-        # puts "#{new_mouse_over.class}[#{new_mouse_over.value}]: #{new_mouse_over.x}:#{new_mouse_over.y} #{new_mouse_over.width}:#{new_mouse_over.height}" if new_mouse_over != @mouse_over
+        removed_hit_elements.each do |e|
+          e.publish(:leave)
+        end
       end
-      @mouse_over.publish(:leave) if @mouse_over && new_mouse_over != @mouse_over
+
       @mouse_over = new_mouse_over
+      @hit_elements = new_hit_elements || []
 
       redirect_holding_mouse_button(:left) if @mouse_over && Gosu.button_down?(Gosu::MS_LEFT)
       redirect_holding_mouse_button(:middle) if @mouse_over && Gosu.button_down?(Gosu::MS_MIDDLE)
       redirect_holding_mouse_button(:right) if @mouse_over && Gosu.button_down?(Gosu::MS_RIGHT)
 
-      if Vector.new(window.mouse_x, window.mouse_y) == @last_mouse_pos
+      # handle tooltip
+      if same_element
         if @mouse_over && (Gosu.milliseconds - @mouse_moved_at) > tool_tip_delay
           @tip.value = @mouse_over.tip if @mouse_over
           @tip.x = window.mouse_x
@@ -161,6 +223,8 @@ module CyberarmEngine
 
       @last_mouse_pos = Vector.new(window.mouse_x, window.mouse_y)
       @mouse_pos = @last_mouse_pos.clone
+
+      @page&.update
     end
 
     def button_down(id)
@@ -175,9 +239,14 @@ module CyberarmEngine
         redirect_mouse_button(:right)
       when Gosu::KB_F5
         request_recalculate
+      when Gosu::KB_F12
+        CyberarmEngine.const_set(:GUI_DEBUG, !CyberarmEngine::GUI_DEBUG)
+        request_repaint
       end
 
       @focus.button_down(id) if @focus.respond_to?(:button_down)
+
+      @page&.button_down(id)
     end
 
     def button_up(id)
@@ -208,6 +277,8 @@ module CyberarmEngine
 
       # Prevents menu from popping back up if the listbox is clicked to hide it.
       @hid_menu_for = nil
+
+      @page&.button_up(id)
     end
 
     def tool_tip_delay
@@ -218,6 +289,7 @@ module CyberarmEngine
       hide_menu unless @menu && (@menu == @mouse_over) || (@mouse_over&.parent == @menu)
 
       if @focus && @mouse_over != @focus
+        @hit_elements.delete(@focus)
         @focus.publish(:blur)
         @focus = nil
       end
@@ -271,10 +343,14 @@ module CyberarmEngine
     end
 
     def redirect_scroll_jump_to(edge)
+      return if window.text_input
+
       @mouse_over.publish(:"scroll_jump_to_#{edge}", window.mouse_x, window.mouse_y) if (@mouse_over && !@menu) || (@mouse_over && @mouse_over == @menu)
     end
 
     def redirect_scroll_page(edge)
+      return if window.text_input
+
       @mouse_over.publish(:"scroll_page_#{edge}", window.mouse_x, window.mouse_y) if (@mouse_over && !@menu) || (@mouse_over && @mouse_over == @menu)
     end
 

data/lib/cyberarm_engine/ui/page.rb

@@ -0,0 +1,39 @@
+module CyberarmEngine
+  class Page
+    include CyberarmEngine::DSL
+    include CyberarmEngine::Common
+
+    attr_reader :parent
+
+    def initialize(parent:)
+      @parent = parent
+
+      @options = {}
+    end
+
+    def options=(options)
+      @options = options
+    end
+
+    def setup
+    end
+
+    def focus
+    end
+
+    def blur
+    end
+
+    def draw
+    end
+
+    def update
+    end
+
+    def button_down(id)
+    end
+
+    def button_up(id)
+    end
+  end
+end

data/lib/cyberarm_engine/ui/style.rb

@@ -16,11 +16,14 @@ module Gosu
 end
 
 module CyberarmEngine
-  class Style
-    attr_reader :hash
+  class StyleData
+    def initialize(hash = {})
+      @hash = hash
+      @dirty = false
+    end
 
     %i[
-      x y z width height min_width min_height max_width max_height color background
+      x y z design_width width height min_width min_height max_width max_height color background
       background_image background_image_mode background_image_color
       background_nine_slice background_nine_slice_mode background_nine_slice_color background_nine_slice_from_edge
       background_nine_slice_left background_nine_slice_top background_nine_slice_right background_nine_slice_bottom
@@ -28,34 +31,64 @@ module CyberarmEngine
       border_thickness border_thickness_left border_thickness_right border_thickness_top border_thickness_bottom
       padding padding_left padding_right padding_top padding_bottom
       margin margin_left margin_right margin_top margin_bottom
-      background_canvas background_nine_slice_canvas background_image_canvas border_canvas
+      aspect_ratio
 
-      fraction_background scroll fill text_wrap v_align h_align delay tag
+      fraction_background scroll fill text_wrap v_align h_align delay tag font
+      text_align text_static text_size
+      text_shadow text_shadow_size text_shadow_alpha text_shadow_color
+      text_border text_border_size text_border_alpha text_border_color
       image_width image_height
-
-      default hover active disabled
     ].each do |item|
       define_method(item) do
         @hash[item]
       end
       define_method(:"#{item}=") do |value|
+        @dirty = true if @hash[item] != value
+
         @hash[item] = value
       end
     end
 
+    # NOTE: do not change return value
+    def default
+      nil
+    end
+
+    def dirty?
+      @dirty
+    end
+
+    def mark_clean!
+      @dirty = false
+    end
+
+    def empty?
+      @hash.empty?
+    end
+  end
+
+  class Style < StyleData
+    attr_reader :hash, :hover, :active, :disabled
+
     def initialize(hash = {})
-      h = hash
-      # h = Marshal.load(Marshal.dump(hash))
+      @hash = hash
 
-      h[:default] = {}
+      @hover = StyleData.new(hash[:hover] || {})
+      @active = StyleData.new(hash[:active] || {})
+      @disabled = StyleData.new(hash[:disabled] || {})
 
-      h.each do |key, value|
-        next if value.is_a?(Hash)
+      @substyles = [@hover, @active, @disabled]
 
-        h[:default][key] = value
-      end
+      super
+    end
+
+    def dirty?
+      @dirty || @substyles.any?(&:dirty?)
+    end
 
-      @hash = h
+    def mark_clean!
+      @substyles.each(&:mark_clean!)
+      @dirty = false
     end
   end
 end

data/lib/cyberarm_engine/ui/theme.rb

@@ -30,6 +30,11 @@ module CyberarmEngine
         end
       end
 
+      # css-like style classes, however First In, First Out- that is,
+       options[:style_class]&.each do |klass|
+         hash = deep_merge(hash, _theme[klass]) if _theme[klass]
+       end
+
       deep_merge(hash, options)
     end
 
@@ -53,6 +58,7 @@ module CyberarmEngine
         y: 0,
         z: 30,
 
+        design_width: nil,
         width: nil,
         height: nil,
         color: Gosu::Color::WHITE,
@@ -68,25 +74,25 @@ module CyberarmEngine
         debug_color: Gosu::Color::YELLOW
       },
 
-      Button: { # < Label
+      Button: { # < TextBlock
         margin: 1,
         padding: 4,
         border_thickness: 1,
-        border_color: ["ffd59674".hex, "ffff8746".hex],
+        border_color: [0xffd59674, 0xffff8746],
         border_radius: 0,
-        background: ["ffc75e61".to_i(16), "ffe26623".to_i(16)],
+        background: [0xffc75e61, 0xffe26623],
         text_align: :center,
         text_v_align: :center,
         text_wrap: :none,
 
         hover: {
           color: Gosu::Color.rgb(200, 200, 200),
-          background: ["ffB23E41".to_i(16), "ffFF7C00".to_i(16)]
+          background: [0xffB23E41, 0xffFF7C00]
         },
 
         active: {
           color: Gosu::Color::BLACK,
-          background: ["ffB23E41".to_i(16)]
+          background: [0xffB23E41]
         },
 
         disabled: {
@@ -121,7 +127,13 @@ module CyberarmEngine
         text_size: 28,
         text_wrap: :word_wrap, # :word_wrap, :break_word, :none
         text_shadow: false,
+        text_shadow_color: 0,
+        text_shadow_alpha: 30,
+        text_shadow_size: 2,
         text_border: false,
+        text_border_color: 0,
+        text_border_alpha: 30,
+        text_border_size: 2,
         text_align: :left,
         font: "Arial",
         margin: 0,

data/lib/cyberarm_engine/version.rb

@@ -1,4 +1,4 @@
 module CyberarmEngine
   NAME    = "InDev".freeze
-  VERSION = "0.25.1".freeze
+  VERSION = "0.30.0".freeze
 end

data/lib/cyberarm_engine/window.rb

@@ -6,6 +6,9 @@ module CyberarmEngine
     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
@@ -28,7 +31,7 @@ module CyberarmEngine
       @@instance
     end
 
-    def initialize(width: 800, height: 600, fullscreen: false, update_interval: 1000.0 / 60, resizable: false, borderless: false)
+    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
@@ -46,6 +49,9 @@ module CyberarmEngine
       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
 
@@ -79,11 +85,44 @@ module CyberarmEngine
 
       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

data/lib/cyberarm_engine.rb

@@ -10,6 +10,7 @@ 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"
 
@@ -41,6 +42,13 @@ 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"
@@ -58,6 +66,7 @@ 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"
@@ -67,6 +76,8 @@ 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"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cyberarm_engine
 version: !ruby/object:Gem::Version
-  version: 0.25.1
+  version: 0.30.0
 platform: ruby
 authors:
 - Cyberarm
@@ -29,14 +29,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -88,6 +88,20 @@ files:
 - assets/shaders/vertex/lighting.glsl
 - assets/textures/default.png
 - assets/textures/logo.png
+- assets/textures/ui/circle.png
+- assets/textures/ui/circle_small.png
+- assets/textures/ui/rounded.png
+- assets/textures/ui/rounded_bottom.png
+- assets/textures/ui/rounded_left.png
+- assets/textures/ui/rounded_left_bottom.png
+- assets/textures/ui/rounded_left_top.png
+- assets/textures/ui/rounded_right.png
+- assets/textures/ui/rounded_right_bottom.png
+- assets/textures/ui/rounded_right_top.png
+- assets/textures/ui/rounded_small.png
+- assets/textures/ui/rounded_tiny.png
+- assets/textures/ui/rounded_top.png
+- assets/textures/ui/square.png
 - bin/console
 - bin/setup
 - cyberarm_engine.gemspec
@@ -106,6 +120,7 @@ files:
 - lib/cyberarm_engine/console/command.rb
 - lib/cyberarm_engine/console/commands/help_command.rb
 - lib/cyberarm_engine/console/subcommand.rb
+- lib/cyberarm_engine/event_bus.rb
 - lib/cyberarm_engine/game_object.rb
 - lib/cyberarm_engine/game_state.rb
 - lib/cyberarm_engine/gosu_ext/draw_arc.rb
@@ -130,6 +145,12 @@ files:
 - lib/cyberarm_engine/opengl/renderer/renderer.rb
 - lib/cyberarm_engine/opengl/shader.rb
 - lib/cyberarm_engine/opengl/texture.rb
+- lib/cyberarm_engine/pathfinding/graph.rb
+- lib/cyberarm_engine/pathfinding/graph_search.rb
+- lib/cyberarm_engine/pathfinding/graph_searches/astar_search.rb
+- lib/cyberarm_engine/pathfinding/graph_searches/breadth_first_search.rb
+- lib/cyberarm_engine/pathfinding/graph_searches/dijkstra_search.rb
+- lib/cyberarm_engine/pathfinding/graphs/grid.rb
 - lib/cyberarm_engine/ray.rb
 - lib/cyberarm_engine/result.rb
 - lib/cyberarm_engine/stats.rb
@@ -140,6 +161,7 @@ files:
 - lib/cyberarm_engine/trees/aabb_tree.rb
 - lib/cyberarm_engine/trees/aabb_tree_debug.rb
 - lib/cyberarm_engine/ui/border_canvas.rb
+- lib/cyberarm_engine/ui/dialog.rb
 - lib/cyberarm_engine/ui/dsl.rb
 - lib/cyberarm_engine/ui/element.rb
 - lib/cyberarm_engine/ui/elements/button.rb
@@ -158,8 +180,10 @@ files:
 - lib/cyberarm_engine/ui/elements/stack.rb
 - lib/cyberarm_engine/ui/elements/text_block.rb
 - lib/cyberarm_engine/ui/elements/toggle_button.rb
+- lib/cyberarm_engine/ui/elements/widget.rb
 - lib/cyberarm_engine/ui/event.rb
 - lib/cyberarm_engine/ui/gui_state.rb
+- lib/cyberarm_engine/ui/page.rb
 - lib/cyberarm_engine/ui/style.rb
 - lib/cyberarm_engine/ui/theme.rb
 - lib/cyberarm_engine/vector.rb
@@ -186,7 +210,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.7
+rubygems_version: 4.0.3
 specification_version: 4
 summary: Make games quickly and easily with gosu
 test_files: []