cyberarm_engine 0.23.0 → 0.24.1

data/lib/cyberarm_engine/ui/elements/container.rb

@@ -20,7 +20,10 @@ module CyberarmEngine
         @gui_state = options.delete(:gui_state)
         super
 
+        @last_scroll_position = Vector.new(0, 0)
         @scroll_position = Vector.new(0, 0)
+        @scroll_target_position = Vector.new(0, 0)
+        @scroll_chunk = 120
         @scroll_speed = 40
 
         @text_color = options[:color]
@@ -33,17 +36,17 @@ module CyberarmEngine
       def build
         @block.call(self) if @block
 
-        root.gui_state.request_recalculate
+        root.gui_state.request_recalculate_for(self)
       end
 
       def add(element)
         @children << element
 
-        root.gui_state.request_recalculate
+        root.gui_state.request_recalculate_for(self)
       end
 
       def remove(element)
-        root.gui_state.request_recalculate if @children.delete(element)
+        root.gui_state.request_recalculate_for(self) if @children.delete(element)
       end
 
       def clear(&block)
@@ -56,7 +59,7 @@ module CyberarmEngine
 
         CyberarmEngine::Element::Container.current_container = old_container
 
-        root.gui_state.request_recalculate
+        root.gui_state.request_recalculate_for(self)
       end
 
       def append(&block)
@@ -67,7 +70,7 @@ module CyberarmEngine
 
         CyberarmEngine::Element::Container.current_container = old_container
 
-        root.gui_state.request_recalculate
+        root.gui_state.request_recalculate_for(self)
       end
 
       def render
@@ -77,7 +80,9 @@ module CyberarmEngine
           content_width + 1,
           content_height + 1
         ) do
-          @children.each(&:draw)
+          Gosu.translate(@scroll_position.x, @scroll_position.y) do
+            @children.each(&:draw)
+          end
         end
       end
 
@@ -90,35 +95,74 @@ module CyberarmEngine
       end
 
       def update
+        update_scroll
         @children.each(&:update)
       end
 
       def hit_element?(x, y)
         return unless hit?(x, y)
 
+        # Offset child hit point by scroll position/offset
+        child_x = x - @scroll_position.x
+        child_y = y - @scroll_position.y
+
         @children.reverse_each do |child|
           next unless child.visible?
 
           case child
           when Container
-            if element = child.hit_element?(x, y)
+            if element = child.hit_element?(child_x, child_y)
               return element
             end
           else
-            return child if child.hit?(x, y)
+            return child if child.hit?(child_x, child_y)
           end
         end
 
         self if hit?(x, y)
       end
 
+      def update_child_element_visibity(child)
+        child.element_visible = child.x >= (@x - @scroll_position.x) - child.width && child.x <= (@x - @scroll_position.x) + width &&
+                                child.y >= (@y - @scroll_position.y) - child.height && child.y <= (@y - @scroll_position.y) + height
+      end
+
+      def update_scroll
+        dt = window.dt > 1 ? 1.0 : window.dt
+
+        scroll_x_diff = (@scroll_target_position.x - @scroll_position.x)
+        scroll_y_diff = (@scroll_target_position.y - @scroll_position.y)
+
+        @scroll_position.x += (scroll_x_diff * @scroll_speed * 0.25 * dt).round
+        @scroll_position.y += (scroll_y_diff * @scroll_speed * 0.25 * dt).round
+
+        @scroll_position.x = @scroll_target_position.x if scroll_x_diff.abs < 1.0
+        @scroll_position.y = @scroll_target_position.y if scroll_y_diff.abs < 1.0
+
+        # Scrolled PAST top
+        if @scroll_position.y > 0
+          @scroll_target_position.y = 0
+
+        # Scrolled PAST bottom
+        elsif @scroll_position.y.abs > max_scroll_height
+          @scroll_target_position.y = -max_scroll_height
+        end
+
+        if @last_scroll_position != @scroll_position
+          @children.each { |child| update_child_element_visibity(child) }
+          root.gui_state.request_repaint
+        end
+
+        @last_scroll_position.x = @scroll_position.x
+        @last_scroll_position.y = @scroll_position.y
+      end
+
       def recalculate
         @current_position = Vector.new(@style.margin_left + @style.padding_left, @style.margin_top + @style.padding_top)
-        @current_position += @scroll_position
 
         return unless visible?
 
-        Stats.increment(:gui_recalculations_last_frame, 1)
+        Stats.frame.increment(:gui_recalculations)
 
         stylize
 
@@ -129,6 +173,9 @@ module CyberarmEngine
         old_width  = @width
         old_height = @height
 
+        @cached_scroll_width = nil
+        @cached_scroll_height = nil
+
         if is_root?
           @width  = @style.width  = window.width
           @height = @style.height = window.height
@@ -176,17 +223,35 @@ module CyberarmEngine
           child.recalculate
           child.reposition # TODO: Implement top,bottom,left,center, and right positioning
 
-          Stats.increment(:gui_recalculations_last_frame, 1)
+          Stats.frame.increment(:gui_recalculations)
 
-          child.element_visible = child.x >= @x - child.width && child.x <= @x + width &&
-                                  child.y >= @y - child.height && child.y <= @y + height
+          update_child_element_visibity(child)
         end
 
         # puts "TOOK: #{Gosu.milliseconds - s}ms to recalculate #{self.class}:0x#{self.object_id.to_s(16)}"
 
         update_background
 
+        # Fixes resized container scrolled past bottom
+        self.scroll_top = -@scroll_position.y
+        @scroll_target_position.y = @scroll_position.y
+
+        # Fixes resized container that is scrolled down from being stuck overscrolled when resized
+        if scroll_height < height
+          @scroll_target_position.y = 0
+        end
+
+        # NOTE: Experiment for removing need to explicitly call gui_state#recalculate at least 3 times for layout to layout...
+        if old_width != @width || old_height != @height
+          if @parent
+            root.gui_state.request_recalculate_for(@parent)
+          else
+            root.gui_state.request_recalculate
+          end
+        end
+
         root.gui_state.request_repaint if @width != old_width || @height != old_height
+        recalculate_if_size_changed
       end
 
       def layout
@@ -246,12 +311,13 @@ module CyberarmEngine
       def mouse_wheel_up(sender, x, y)
         return unless @style.scroll
 
-        if @scroll_position.y < 0
-          @scroll_position.y += @scroll_speed
-          @scroll_position.y = 0 if @scroll_position.y > 0
-
-          root.gui_state.request_recalculate_for(self)
-          root.gui_state.request_repaint
+        # Allow overscrolling UP, only if one can scroll DOWN
+        if height < scroll_height
+          if @scroll_target_position.y > 0
+            @scroll_target_position.y = @scroll_chunk
+          else
+            @scroll_target_position.y += @scroll_chunk
+          end
 
           return :handled
         end
@@ -262,15 +328,13 @@ module CyberarmEngine
 
         return unless height < scroll_height
 
-        if @scroll_position.y.abs < max_scroll_height
-          @scroll_position.y -= @scroll_speed
-          @scroll_position.y = -max_scroll_height if @scroll_position.y.abs > max_scroll_height
-
-          root.gui_state.request_recalculate_for(self)
-          root.gui_state.request_repaint
-
-          return :handled
+        if @scroll_target_position.y > 0
+          @scroll_target_position.y = -@scroll_chunk
+        else
+          @scroll_target_position.y -= @scroll_chunk
         end
+
+        return :handled
       end
 
       def scroll_top

data/lib/cyberarm_engine/ui/elements/slider.rb

@@ -33,7 +33,8 @@ module CyberarmEngine
         end
       end
 
-      attr_reader :range, :step_size, :value
+      attr_reader :step_size, :value
+      attr_accessor :range, :step_size
 
       def initialize(options = {}, block = nil)
         super(options, block)
@@ -76,7 +77,7 @@ module CyberarmEngine
       def update
         super
 
-        @tip = value.to_s
+        @tip = format("%.2f", value.to_f)
         @handle.tip = @tip
       end
 
@@ -87,7 +88,7 @@ module CyberarmEngine
       end
 
       def handle_dragged_to(x, _y)
-        @ratio = ((x - @handle.width / 2) - @x) / (content_width - @handle.outer_width)
+        @ratio = ((x - @handle.width / 2.0) - @x) / (content_width - @handle.outer_width.to_f)
 
         self.value = @ratio.clamp(0.0, 1.0) * (@range.max - @range.min) + @range.min
       end

data/lib/cyberarm_engine/ui/elements/text_block.rb

@@ -18,6 +18,15 @@ module CyberarmEngine
         @raw_text = text
       end
 
+      def update
+        super
+
+        if @text.textobject.name != safe_style_fetch(:font)
+          set_font
+          root.gui_state.request_recalculate
+        end
+      end
+
       def render
         # Gosu.clip_to is too expensive to always use so check if we actually need it.
         if @text.width > width || @text.height > height
@@ -84,6 +93,7 @@ module CyberarmEngine
         update_background
 
         root.gui_state.request_repaint if @width != old_width || @height != old_height
+        recalculate_if_size_changed
       end
 
       def handle_text_wrapping(max_width)
@@ -156,7 +166,7 @@ module CyberarmEngine
       end
 
       def line_width(text)
-        (@text.textobject.markup_width(text) + noncontent_width)
+        (@text.textobject.markup_width(text.to_s) + noncontent_width)
       end
 
       def value

data/lib/cyberarm_engine/ui/gui_state.rb

@@ -63,7 +63,8 @@ module CyberarmEngine
         @tip.draw
       end
 
-      if defined?(GUI_DEBUG)
+      # FIXME
+      if false# defined?(GUI_DEBUG)
         Gosu.flush
 
         @root_container.debug_draw
@@ -77,16 +78,23 @@ module CyberarmEngine
     end
 
     def update
+      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.each(&:recalculate)
+      @pending_element_recalculate_requests.clear
+
+      Stats.frame.end_timing(:gui_element_recalculate_requests)
+
       if @pending_recalculate_request
-        @root_container.recalculate
-        @root_container.recalculate
+        Stats.frame.start_timing(:gui_recalculate)
+
         @root_container.recalculate
 
         @pending_recalculate_request = false
-      end
 
-      @pending_element_recalculate_requests.each(&:recalculate)
-      @pending_element_recalculate_requests.clear
+        Stats.frame.end_timing(:gui_recalculate)
+      end
 
       if @pending_focus_request
         @pending_focus_request = false
@@ -121,9 +129,9 @@ module CyberarmEngine
       @mouse_over.publish(:leave) if @mouse_over && new_mouse_over != @mouse_over
       @mouse_over = new_mouse_over
 
-      redirect_holding_mouse_button(:left) if @mouse_over && Gosu.button_down?(Gosu::MsLeft)
-      redirect_holding_mouse_button(:middle) if @mouse_over && Gosu.button_down?(Gosu::MsMiddle)
-      redirect_holding_mouse_button(:right) if @mouse_over && Gosu.button_down?(Gosu::MsRight)
+      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
         if @mouse_over && (Gosu.milliseconds - @mouse_moved_at) > tool_tip_delay
@@ -151,13 +159,13 @@ module CyberarmEngine
       super
 
       case id
-      when Gosu::MsLeft
+      when Gosu::MS_LEFT
         redirect_mouse_button(:left)
-      when Gosu::MsMiddle
+      when Gosu::MS_MIDDLE
         redirect_mouse_button(:middle)
-      when Gosu::MsRight
+      when Gosu::MS_RIGHT
         redirect_mouse_button(:right)
-      when Gosu::KbF5
+      when Gosu::KB_F5
         request_recalculate
       end
 
@@ -168,15 +176,15 @@ module CyberarmEngine
       super
 
       case id
-      when Gosu::MsLeft
+      when Gosu::MS_LEFT
         redirect_released_mouse_button(:left)
-      when Gosu::MsMiddle
+      when Gosu::MS_MIDDLE
         redirect_released_mouse_button(:middle)
-      when Gosu::MsRight
+      when Gosu::MS_RIGHT
         redirect_released_mouse_button(:right)
-      when Gosu::MsWheelUp
+      when Gosu::MS_WHEEL_UP
         redirect_mouse_wheel(:up)
-      when Gosu::MsWheelDown
+      when Gosu::MS_WHEEL_DOWN
         redirect_mouse_wheel(:down)
       end
 
@@ -276,6 +284,8 @@ module CyberarmEngine
     def hide_menu
       return unless @menu
 
+      request_repaint
+
       @hid_menu_for = @menu.parent
       @menu = nil
     end

data/lib/cyberarm_engine/ui/style.rb

@@ -20,7 +20,8 @@ module CyberarmEngine
     attr_reader :hash
 
     def initialize(hash = {})
-      h = Marshal.load(Marshal.dump(hash))
+      h = hash
+      # h = Marshal.load(Marshal.dump(hash))
 
       h[:default] = {}
 

data/lib/cyberarm_engine/vector.rb

@@ -95,39 +95,58 @@ module CyberarmEngine
       Vector.new(@x, @y)
     end
 
-    # Performs math operation, excluding {weight}
-    private def operator(function, other)
+    # Adds Vector and Numeric or Vector and Vector, excluding {weight}
+    # @return [CyberarmEngine::Vector]
+    def +(other)
       if other.is_a?(Numeric)
         Vector.new(
-          @x.send(:"#{function}", other),
-          @y.send(:"#{function}", other),
-          @z.send(:"#{function}", other)
+          @x + other,
+          @y + other,
+          @z + other
         )
       else
         Vector.new(
-          @x.send(:"#{function}", other.x),
-          @y.send(:"#{function}", other.y),
-          @z.send(:"#{function}", other.z)
+          @x + other.x,
+          @y + other.y,
+          @z + other.z
         )
       end
     end
 
-    # Adds Vector and Numeric or Vector and Vector, excluding {weight}
-    # @return [CyberarmEngine::Vector]
-    def +(other)
-      operator("+", other)
-    end
-
     # Subtracts Vector and Numeric or Vector and Vector, excluding {weight}
     # @return [CyberarmEngine::Vector]
     def -(other)
-      operator("-", other)
+      if other.is_a?(Numeric)
+        Vector.new(
+          @x - other,
+          @y - other,
+          @z - other
+        )
+      else
+        Vector.new(
+          @x - other.x,
+          @y - other.y,
+          @z - other.z
+        )
+      end
     end
 
     # Multiplies Vector and Numeric or Vector and Vector, excluding {weight}
     # @return [CyberarmEngine::Vector]
     def *(other)
-      operator("*", other)
+      if other.is_a?(Numeric)
+        Vector.new(
+          @x * other,
+          @y * other,
+          @z * other
+        )
+      else
+        Vector.new(
+          @x * other.x,
+          @y * other.y,
+          @z * other.z
+        )
+      end
     end
 
     def multiply_transform(transform)

data/lib/cyberarm_engine/version.rb

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

data/lib/cyberarm_engine/window.rb

@@ -6,16 +6,16 @@ module CyberarmEngine
     SAMPLES = {}
     SONGS = {}
 
-    attr_accessor :show_cursor
+    attr_accessor :show_cursor, :show_stats_plotter
     attr_writer :exit_on_opengl_error
-    attr_reader :last_frame_time, :states
+    attr_reader :last_frame_time, :delta_time, :states
 
     def self.now
       Gosu.milliseconds
     end
 
     def self.dt
-      instance.last_frame_time / 1000.0
+      instance.dt
     end
 
     def self.instance=(window)
@@ -31,32 +31,57 @@ module CyberarmEngine
     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
-      self.caption = "CyberarmEngine #{CyberarmEngine::VERSION} #{Gosu.language}"
+      @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 if defined?(setup)
+      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
-      Stats.clear
+      # 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
 
-      current_state&.update
+      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?
@@ -120,7 +145,7 @@ module CyberarmEngine
     def push_state(klass, options = {})
       options = { setup: true }.merge(options)
 
-      if klass.instance_of?(klass.class) && defined?(klass.options)
+      if klass.instance_of?(klass.class) && klass.respond_to?(:options)
         @states << klass
         klass.setup if options[:setup]
         klass.post_setup if options[:setup]
@@ -133,6 +158,8 @@ module CyberarmEngine
     end
 
     private def child_of?(input, klass)
+      return false unless input
+
       input.ancestors.detect { |c| c == klass }
     end
 

data/lib/cyberarm_engine.rb

@@ -7,13 +7,19 @@ else
 end
 require "json"
 require "excon"
-require "gosu_more_drawables"
 
 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"
 
@@ -66,6 +72,6 @@ require_relative "cyberarm_engine/model/material"
 require_relative "cyberarm_engine/model/model_object"
 require_relative "cyberarm_engine/model/parser"
 require_relative "cyberarm_engine/model/parsers/wavefront_parser"
-require_relative "cyberarm_engine/model/parsers/collada_parser" if defined?(Nokogiri)
+require_relative "cyberarm_engine/model/parsers/collada_parser" if RUBY_ENGINE != "mruby" && defined?(Nokogiri)
 
 require_relative "cyberarm_engine/builtin/intro_state"

data/mrbgem.rake

@@ -0,0 +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