cyberarm_engine 0.13.0 → 0.17.0

data/lib/cyberarm_engine/ui/gui_state.rb

@@ -1,135 +1,226 @@
-module CyberarmEngine
-  class GuiState < GameState
-    include Common
-    include DSL
-
-    def initialize(options = {})
-      @options = options
-      @game_objects = []
-      @global_pause = false
-
-      @down_keys = {}
-
-      @root_container = Element::Stack.new(gui_state: self)
-      @game_objects << @root_container
-      $__current_container__ = @root_container
-
-      @active_width  = window.width
-      @active_height = window.height
-
-      @focus = nil
-      @mouse_over = nil
-      @mouse_down_on = {}
-      @mouse_down_position = {}
-      @pending_recalculate_request = false
-    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 and element && @focus != element
-      @focus = element
-    end
-
-    def focused
-      @focus
-    end
-
-    def update
-      if @pending_recalculate_request
-        @root_container.recalculate
-        @pending_recalculate_request = false
-      end
-
-      super
-
-      new_mouse_over = @root_container.hit_element?(window.mouse_x, window.mouse_y)
-      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
-      end
-      @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)
-
-      request_recalculate if @active_width != window.width || @active_height != window.height
-
-      @active_width  = window.width
-      @active_height = window.height
-    end
-
-    def button_down(id)
-      super
-
-      case id
-      when Gosu::MsLeft
-        redirect_mouse_button(:left)
-      when Gosu::MsMiddle
-        redirect_mouse_button(:middle)
-      when Gosu::MsRight
-        redirect_mouse_button(:right)
-      end
-    end
-
-    def button_up(id)
-      super
-
-      case id
-      when Gosu::MsLeft
-        redirect_released_mouse_button(:left)
-      when Gosu::MsMiddle
-        redirect_released_mouse_button(:middle)
-      when Gosu::MsRight
-        redirect_released_mouse_button(:right)
-      when Gosu::MsWheelUp
-        redirect_mouse_wheel(:up)
-      when Gosu::MsWheelDown
-        redirect_mouse_wheel(:down)
-      end
-    end
-
-    def redirect_mouse_button(button)
-      if @focus && @mouse_over != @focus
-        @focus.publish(:blur)
-        @focus = nil
-      end
-
-      if @mouse_over
-        @mouse_down_position[button] = Vector.new(window.mouse_x, window.mouse_y)
-        @mouse_down_on[button]       = @mouse_over
-
-        @mouse_over.publish(:"#{button}_mouse_button", window.mouse_x, window.mouse_y)
-      else
-        @mouse_down_position[button] = nil
-        @mouse_down_on[button]       = nil
-      end
-    end
-
-    def redirect_released_mouse_button(button)
-      if @mouse_over
-        @mouse_over.publish(:"released_#{button}_mouse_button", window.mouse_x, window.mouse_y)
-        @mouse_over.publish(:"clicked_#{button}_mouse_button", window.mouse_x, window.mouse_y) if @mouse_over == @mouse_down_on[button]
-      end
-
-      @mouse_down_position[button] = nil
-      @mouse_down_on[button]       = nil
-    end
-
-    def redirect_holding_mouse_button(button)
-      @mouse_over.publish(:"holding_#{button}_mouse_button", window.mouse_x, window.mouse_y) if @mouse_over
-    end
-
-    def redirect_mouse_wheel(button)
-      @mouse_over.publish(:"mouse_wheel_#{button}", window.mouse_x, window.mouse_y) if @mouse_over
-    end
-
-    # Schedule a full GUI recalculation on next update
-    def request_recalculate
-      @pending_recalculate_request = true
-    end
-  end
-end
+module CyberarmEngine
+  class GuiState < GameState
+    include Common
+    include DSL
+
+    def initialize(options = {})
+      @options = options
+      @game_objects = []
+      @global_pause = false
+
+      @down_keys = {}
+
+      @root_container = Element::Stack.new(gui_state: self)
+      @game_objects << @root_container
+      $__current_container__ = @root_container
+
+      @active_width  = window.width
+      @active_height = window.height
+
+      @menu = nil
+      @focus = nil
+      @mouse_over = nil
+      @mouse_down_on = {}
+      @mouse_down_position = {}
+      @last_mouse_pos = nil
+      @dragging_element = nil
+      @pending_recalculate_request = false
+
+      @tip = Element::ToolTip.new("", parent: @root_container, z: Float::INFINITY)
+      @menu = nil
+      @min_drag_distance = 0
+      @mouse_pos = Vector.new
+    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
+      @focus = element
+    end
+
+    def focused
+      @focus
+    end
+
+    def draw
+      super
+
+      if @menu
+        Gosu.flush
+        @menu.draw
+      end
+
+      if @tip.value.length.positive?
+        Gosu.flush
+        @tip.draw
+      end
+    end
+
+    def update
+      if @pending_recalculate_request
+        @root_container.recalculate
+        @root_container.recalculate
+        @root_container.recalculate
+
+        @pending_recalculate_request = false
+      end
+
+      @menu&.update
+      super
+
+      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)
+
+      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
+      end
+      @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)
+
+      if Vector.new(window.mouse_x, window.mouse_y) == @last_mouse_pos
+        if @mouse_over && (Gosu.milliseconds - @mouse_moved_at) > tool_tip_delay
+          @tip.value = @mouse_over.tip if @mouse_over
+          @tip.x = window.mouse_x - @tip.width / 2
+          @tip.x = 0 if @tip.x < 0
+          @tip.x = window.width - @tip.width if @tip.x + @tip.width > window.width
+          @tip.y = window.mouse_y - @tip.height
+          @tip.y = 0 if @tip.y < 0
+          @tip.y = window.height - @tip.height if @tip.y + @tip.height > window.height
+          @tip.update
+          @tip.recalculate
+        else
+          @tip.value = ""
+        end
+      else
+        @mouse_moved_at = Gosu.milliseconds
+      end
+
+      @last_mouse_pos = Vector.new(window.mouse_x, window.mouse_y)
+      @mouse_pos = @last_mouse_pos.clone
+
+      if @active_width != window.width || @active_height != window.height
+        request_recalculate
+        @root_container.publish(:window_size_changed)
+      end
+
+      @active_width  = window.width
+      @active_height = window.height
+    end
+
+    def tool_tip_delay
+      250 # ms
+    end
+
+    def button_down(id)
+      super
+
+      case id
+      when Gosu::MsLeft
+        redirect_mouse_button(:left)
+      when Gosu::MsMiddle
+        redirect_mouse_button(:middle)
+      when Gosu::MsRight
+        redirect_mouse_button(:right)
+      when Gosu::KbF5
+        request_recalculate
+      end
+
+      @focus.button_down(id) if @focus.respond_to?(:button_down)
+    end
+
+    def button_up(id)
+      super
+
+      case id
+      when Gosu::MsLeft
+        redirect_released_mouse_button(:left)
+      when Gosu::MsMiddle
+        redirect_released_mouse_button(:middle)
+      when Gosu::MsRight
+        redirect_released_mouse_button(:right)
+      when Gosu::MsWheelUp
+        redirect_mouse_wheel(:up)
+      when Gosu::MsWheelDown
+        redirect_mouse_wheel(:down)
+      end
+
+      @focus.button_up(id) if @focus.respond_to?(:button_up)
+    end
+
+    def redirect_mouse_button(button)
+      hide_menu unless @menu && (@menu == @mouse_over) || (@mouse_over&.parent == @menu)
+
+      if @focus && @mouse_over != @focus
+        @focus.publish(:blur)
+        @focus = nil
+      end
+
+      if @mouse_over
+        @mouse_down_position[button] = Vector.new(window.mouse_x, window.mouse_y)
+        @mouse_down_on[button]       = @mouse_over
+
+        @mouse_over.publish(:"#{button}_mouse_button", window.mouse_x, window.mouse_y)
+      else
+        @mouse_down_position[button] = nil
+        @mouse_down_on[button]       = nil
+      end
+    end
+
+    def redirect_released_mouse_button(button)
+      hide_menu if @menu && (@menu == @mouse_over) || (@mouse_over&.parent == @menu)
+
+      if @mouse_over
+        @mouse_over.publish(:"released_#{button}_mouse_button", window.mouse_x, window.mouse_y)
+        if @mouse_over == @mouse_down_on[button]
+          @mouse_over.publish(:"clicked_#{button}_mouse_button", window.mouse_x,
+                              window.mouse_y)
+        end
+      end
+
+      if @dragging_element
+        @dragging_element.publish(:end_drag, window.mouse_x, window.mouse_y, button)
+        @dragging_element = nil
+      end
+
+      @mouse_down_position[button] = nil
+      @mouse_down_on[button]       = nil
+    end
+
+    def redirect_holding_mouse_button(button)
+      if !@dragging_element && @mouse_down_on[button] && @mouse_down_on[button].draggable?(button) && @mouse_pos.distance(@mouse_down_position[button]) > @min_drag_distance
+        @dragging_element = @mouse_down_on[button]
+        @dragging_element.publish(:begin_drag, window.mouse_x, window.mouse_y, button)
+      end
+
+      if @dragging_element
+        @dragging_element.publish(:drag_update, window.mouse_x, window.mouse_y, button) if @dragging_element
+      elsif @mouse_over
+        @mouse_over.publish(:"holding_#{button}_mouse_button", window.mouse_x, window.mouse_y)
+      end
+    end
+
+    def redirect_mouse_wheel(button)
+      @mouse_over.publish(:"mouse_wheel_#{button}", window.mouse_x, window.mouse_y) if @mouse_over
+    end
+
+    # Schedule a full GUI recalculation on next update
+    def request_recalculate
+      @pending_recalculate_request = true
+    end
+
+    def show_menu(list_box)
+      @menu = list_box
+    end
+
+    def hide_menu
+      @menu = nil
+    end
+  end
+end

data/lib/cyberarm_engine/ui/style.rb

@@ -1,37 +1,38 @@
-module Gosu
-  class Color
-    def _dump(level)
-      [
-        "%02X" % self.alpha,
-        "%02X" % self.red,
-        "%02X" % self.green,
-        "%02X" % self.blue
-      ].join
-    end
-
-    def self._load(hex)
-      argb(hex.to_i(16))
-    end
-  end
-end
-
-module CyberarmEngine
-  class Style
-    def initialize(hash = {})
-      @hash = Marshal.load(Marshal.dump(hash))
-    end
-
-    def method_missing(method, *args, &block)
-      if method.to_s.end_with?("=")
-        raise "Did not expect more than 1 argument" if args.size > 1
-        return @hash[method.to_s.sub("=", "").to_sym] = args.first
-
-      elsif args.size == 0
-        return @hash[method]
-
-      else
-        raise ArgumentError, "Did not expect arguments"
-      end
-    end
-  end
-end
+module Gosu
+  class Color
+    def _dump(_level)
+      [
+        "%02X" % alpha,
+        "%02X" % red,
+        "%02X" % green,
+        "%02X" % blue
+      ].join
+    end
+
+    def self._load(hex)
+      argb(hex.to_i(16))
+    end
+  end
+end
+
+module CyberarmEngine
+  class Style
+    def initialize(hash = {})
+      @hash = Marshal.load(Marshal.dump(hash))
+    end
+
+    def method_missing(method, *args)
+      if method.to_s.end_with?("=")
+        raise "Did not expect more than 1 argument" if args.size > 1
+
+        @hash[method.to_s.sub("=", "").to_sym] = args.first
+
+      elsif args.size == 0
+        @hash[method]
+
+      else
+        raise ArgumentError, "Did not expect arguments"
+      end
+    end
+  end
+end

data/lib/cyberarm_engine/ui/theme.rb

@@ -1,120 +1,182 @@
-module CyberarmEngine
-  module Theme
-    def default(*args)
-      value = @options
-      args.each do |arg|
-        value = value.dig(arg)
-      end
-
-      value
-    end
-
-    def theme_defaults(options)
-      raise "Error" unless self.class.ancestors.include?(CyberarmEngine::Element)
-      _theme = THEME
-      _theme = _theme.merge(options[:theme]) if options[:theme]
-      _theme.delete(:theme) if options[:theme]
-
-      hash = {}
-      class_names = self.class.ancestors
-      class_names = class_names[0..class_names.index(CyberarmEngine::Element)].map! {|c| c.to_s.split("::").last.to_sym}.reverse!
-
-      class_names.each do |klass|
-        next unless data = _theme.dig(klass)
-        data.each do |key, value|
-          hash.merge!(data)
-        end
-      end
-
-      deep_merge(hash, options)
-    end
-
-    # Derived from Rails Hash#deep_merge!
-    # Enables passing partial themes through Element options without issue
-    def deep_merge(original, intergrate, &block)
-      hash = original.merge(intergrate) do |key, this_val, other_val|
-        if this_val.is_a?(Hash) && other_val.is_a?(Hash)
-          deep_merge(this_val, other_val, &block)
-        elsif block_given?
-          block.call(key, this_val, other_val)
-        else
-          other_val
-        end
-      end
-
-      return hash
-    end
-
-    THEME = {
-      Element: {
-        x: 0,
-        y: 0,
-        z: 30,
-
-        width:  nil,
-        height: nil,
-        color:     Gosu::Color::WHITE,
-        background: Gosu::Color::NONE,
-        margin:   0,
-        padding:  0,
-        border_thickness: 0,
-        border_color: Gosu::Color::NONE,
-        border_radius: 0,
-      },
-
-      Button: { # < Label
-        margin:   1,
-        padding:  4,
-        border_thickness: 1,
-        border_color: ["ffd59674".hex, "ffff8746".hex],
-        border_radius: 0,
-        background: ["ffc75e61".to_i(16), "ffe26623".to_i(16)],
-
-        hover: {
-          color: Gosu::Color.rgb(200,200,200),
-          background:  ["ffB23E41".to_i(16), "ffFF7C00".to_i(16)],
-        },
-
-        active: {
-          color: Gosu::Color::BLACK,
-          background: ["ffB23E41".to_i(16)]
-        }
-      },
-
-      EditLine: { # < Button
-        type: :text,
-        width: 200,
-        password_character: "•",
-        caret_width: 2,
-        caret_color: Gosu::Color::WHITE,
-        caret_interval: 500,
-        selection_color: Gosu::Color::GREEN,
-      },
-
-      Image: { # < Element
-        retro: false
-      },
-
-      Label: { # < Element
-      text_size: 28,
-      text_shadow: false,
-      font: "Arial",
-      margin: 0,
-      padding: 2
-      },
-
-      ToggleButton: { # < Button
-        checkmark: "√"
-      },
-
-      Progress: { # < Element
-        width: 250,
-        height: 36,
-        background: 0xff111111,
-        fraction_background: [0xffc75e61, 0xffe26623],
-        border_thickness: 1,
-        border_color: [0xffd59674, 0xffff8746]
-      }
-    }.freeze
-  end
-end
+module CyberarmEngine
+  module Theme
+    def default(*args)
+      value = @options
+      args.each do |arg|
+        value = value.dig(arg)
+      end
+
+      value
+    end
+
+    def theme_defaults(options)
+      raise "Error" unless self.class.ancestors.include?(CyberarmEngine::Element)
+
+      _theme = THEME
+      _theme = deep_merge(_theme, options[:theme]) if options[:theme]
+      _theme.delete(:theme) if options[:theme]
+
+      hash = {}
+      class_names = self.class.ancestors
+      class_names = class_names[0..class_names.index(CyberarmEngine::Element)].map! do |c|
+        c.to_s.split("::").last.to_sym
+      end.reverse!
+
+      class_names.each do |klass|
+        next unless data = _theme.dig(klass)
+
+        data.each do |_key, _value|
+          hash.merge!(data)
+        end
+      end
+
+      deep_merge(hash, options)
+    end
+
+    # Derived from Rails Hash#deep_merge!
+    # Enables passing partial themes through Element options without issue
+    def deep_merge(original, intergrate, &block)
+      original.merge(intergrate) do |key, this_val, other_val|
+        if this_val.is_a?(Hash) && other_val.is_a?(Hash)
+          deep_merge(this_val, other_val, &block)
+        elsif block_given?
+          block.call(key, this_val, other_val)
+        else
+          other_val
+        end
+      end
+    end
+
+    THEME = {
+      Element: {
+        x: 0,
+        y: 0,
+        z: 30,
+
+        width: nil,
+        height: nil,
+        color: Gosu::Color::WHITE,
+        background: Gosu::Color::NONE,
+        margin: 0,
+        padding: 0,
+        border_thickness: 0,
+        border_color: Gosu::Color::NONE,
+        border_radius: 0
+      },
+
+      Button: { # < Label
+        margin: 1,
+        padding: 4,
+        border_thickness: 1,
+        border_color: ["ffd59674".hex, "ffff8746".hex],
+        border_radius: 0,
+        background: ["ffc75e61".to_i(16), "ffe26623".to_i(16)],
+        text_align: :center,
+        text_wrap: :none,
+
+        hover: {
+          color: Gosu::Color.rgb(200, 200, 200),
+          background: ["ffB23E41".to_i(16), "ffFF7C00".to_i(16)]
+        },
+
+        active: {
+          color: Gosu::Color::BLACK,
+          background: ["ffB23E41".to_i(16)]
+        },
+
+        disabled: {
+          color: Gosu::Color::GRAY,
+          background: 0xff303030
+        }
+      },
+
+      EditLine: { # < Button
+        type: :text,
+        width: 200,
+        password_character: "•",
+        caret_width: 2,
+        caret_color: Gosu::Color::WHITE,
+        caret_interval: 500,
+        selection_color: Gosu::Color.rgba(255, 128, 50, 200),
+        text_align: :left
+      },
+
+      Image: { # < Element
+        color: Gosu::Color::WHITE,
+        tileable: false,
+        retro: false
+      },
+
+      TextBlock: { # < Element
+        text_size: 28,
+        text_wrap: :word_wrap, # :word_wrap, :break_word, :none
+        text_shadow: false,
+        text_align: :left,
+        font: "Arial",
+        margin: 0,
+        padding: 2
+      },
+
+      Banner: { # < TextBlock
+        text_size: 48
+      },
+
+      Title: { # < TextBlock
+        text_size: 34
+      },
+
+      Subtitle: { # < TextBlock
+        text_size: 26
+      },
+
+      Tagline: { # < TextBlock
+        text_size: 24
+      },
+
+      Caption: { # < TextBlock
+        text_size: 22
+      },
+
+      Para: { # < TextBlock
+        text_size: 18
+      },
+
+      Inscription: { # < TextBlock
+        text_size: 16
+      },
+
+      ToolTip: { # < TextBlock
+        color: Gosu::Color::WHITE,
+        padding_top: 4,
+        padding_bottom: 4,
+        padding_left: 8,
+        padding_right: 8,
+        border_thickness: 1,
+        border_color: 0xffaaaaaa,
+        background: 0xff404040
+      },
+
+      ToggleButton: { # < Button
+        checkmark: "√"
+      },
+
+      Progress: { # < Element
+        width: 250,
+        height: 36,
+        background: 0xff111111,
+        fraction_background: [0xffc75e61, 0xffe26623],
+        border_thickness: 1,
+        border_color: [0xffd59674, 0xffff8746]
+      },
+
+      Slider: { # < Element
+        width: 250,
+        height: 36,
+        background: 0xff111111,
+        fraction_background: [0xffc75e61, 0xffe26623],
+        border_thickness: 1,
+        border_color: [0xffd59674, 0xffff8746]
+      }
+    }.freeze
+  end
+end