cyberarm_engine 0.12.1 → 0.13.0

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

@@ -1,50 +1,50 @@
-module CyberarmEngine
-  class Element
-    class Progress < Element
-      def initialize(options = {}, block = nil)
-        super(options, block)
-
-        @fraction_background = Background.new(background: @style.fraction_background)
-        self.value = options[:fraction] ? options[:fraction] : 0.0
-      end
-
-      def render
-        @fraction_background.draw
-      end
-
-      def recalculate
-        _width = dimensional_size(@style.width, :width)
-        _height= dimensional_size(@style.height,:height)
-        @width = _width
-        @height= _height
-
-        update_background
-      end
-
-      def update_background
-        super
-
-        @fraction_background.x = @style.border_thickness_left + @style.padding_left + @x
-        @fraction_background.y = @style.border_thickness_top + @style.padding_top + @y
-        @fraction_background.z = @z
-        @fraction_background.width = @width * @fraction
-        @fraction_background.height = @height
-
-        @fraction_background.background = @style.fraction_background
-      end
-
-      def value
-        @fraction
-      end
-
-      def value=(decimal)
-        raise "value must be number" unless decimal.is_a?(Numeric)
-
-        @fraction = decimal.clamp(0.0, 1.0)
-        update_background
-
-        return @fraction
-      end
-    end
-  end
+module CyberarmEngine
+  class Element
+    class Progress < Element
+      def initialize(options = {}, block = nil)
+        super(options, block)
+
+        @fraction_background = Background.new(background: @style.fraction_background)
+        self.value = options[:fraction] ? options[:fraction] : 0.0
+      end
+
+      def render
+        @fraction_background.draw
+      end
+
+      def recalculate
+        _width = dimensional_size(@style.width, :width)
+        _height= dimensional_size(@style.height,:height)
+        @width = _width
+        @height= _height
+
+        update_background
+      end
+
+      def update_background
+        super
+
+        @fraction_background.x = @style.border_thickness_left + @style.padding_left + @x
+        @fraction_background.y = @style.border_thickness_top + @style.padding_top + @y
+        @fraction_background.z = @z
+        @fraction_background.width = @width * @fraction
+        @fraction_background.height = @height
+
+        @fraction_background.background = @style.fraction_background
+      end
+
+      def value
+        @fraction
+      end
+
+      def value=(decimal)
+        raise "value must be number" unless decimal.is_a?(Numeric)
+
+        @fraction = decimal.clamp(0.0, 1.0)
+        update_background
+
+        return @fraction
+      end
+    end
+  end
 end

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

@@ -1,13 +1,13 @@
-module CyberarmEngine
-  class Element
-    class Stack < Container
-      include Common
-
-      def layout
-        @children.each do |child|
-          move_to_next_line(child)
-        end
-      end
-    end
-  end
+module CyberarmEngine
+  class Element
+    class Stack < Container
+      include Common
+
+      def layout
+        @children.each do |child|
+          move_to_next_line(child)
+        end
+      end
+    end
+  end
 end

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

@@ -1,56 +1,56 @@
-module CyberarmEngine
-  class Element
-    class ToggleButton < Button
-      attr_reader :toggled
-
-      def initialize(options, block = nil)
-        super(options[:checkmark], options, block)
-        @toggled = options[:toggled] || false
-        if @toggled
-          @text.text = @options[:checkmark]
-        else
-          @text.text = ""
-        end
-
-        return self
-      end
-
-      def toggled=(boolean)
-        @toggled = !boolean
-        toggle
-      end
-
-      def clicked_left_mouse_button(sender, x, y)
-        toggle
-
-        @block.call(self) if @block
-
-        return :handled
-      end
-
-      def toggle
-        if @toggled
-          @toggled = false
-          @text.text = ""
-        else
-          @toggled = true
-          @text.text = @options[:checkmark]
-        end
-      end
-
-      def recalculate
-        super
-
-        _width = dimensional_size(@style.width, :width)
-        _height= dimensional_size(@style.height,:height)
-        @width  = _width  ? _width  : @text.textobject.text_width(@options[:checkmark])
-        @height = _height ? _height : @text.height
-        update_background
-      end
-
-      def value
-        @toggled
-      end
-    end
-  end
+module CyberarmEngine
+  class Element
+    class ToggleButton < Button
+      attr_reader :toggled
+
+      def initialize(options, block = nil)
+        super(options[:checkmark], options, block)
+        @toggled = options[:toggled] || false
+        if @toggled
+          @text.text = @options[:checkmark]
+        else
+          @text.text = ""
+        end
+
+        return self
+      end
+
+      def toggled=(boolean)
+        @toggled = !boolean
+        toggle
+      end
+
+      def clicked_left_mouse_button(sender, x, y)
+        toggle
+
+        @block.call(self) if @block
+
+        return :handled
+      end
+
+      def toggle
+        if @toggled
+          @toggled = false
+          @text.text = ""
+        else
+          @toggled = true
+          @text.text = @options[:checkmark]
+        end
+      end
+
+      def recalculate
+        super
+
+        _width = dimensional_size(@style.width, :width)
+        _height= dimensional_size(@style.height,:height)
+        @width  = _width  ? _width  : @text.textobject.text_width(@options[:checkmark])
+        @height = _height ? _height : @text.height
+        update_background
+      end
+
+      def value
+        @toggled
+      end
+    end
+  end
 end

data/lib/cyberarm_engine/ui/event.rb

@@ -1,46 +1,47 @@
-module CyberarmEngine
-  module Event # Gets included into Element
-    def subscribe(event, method = nil, &block)
-      handler = method || block
-      @event_handler[event] << handler
-
-      Subscription.new(self, event, handler)
-    end
-
-    def unsubscribe(subscription)
-    end
-
-    def publish(event, *args)
-      raise ArgumentError, "#{self.class} does not handle #{event.inspect}" unless @event_handler.include?(event)
-
-      return unless enabled?
-
-      if respond_to?(event)
-        return :handled if send(event, self, *args) == :handled
-      end
-
-      @event_handler[event].reverse_each do |handler|
-        return :handled if handler.call(self, *args) == :handled
-      end
-
-      return nil
-    end
-
-    def event(event)
-      @event_handler ||= Hash.new
-      @event_handler[event] ||= []
-    end
-  end
-
-  class Subscription
-    attr_reader :publisher, :event, :handler
-
-    def initialize(publisher, event, handler)
-      @publisher, @event, @handler = publisher, event, handler
-    end
-
-    def unsubscribe
-      @publisher.unsubscribe(self)
-    end
-  end
+module CyberarmEngine
+  module Event # Gets included into Element
+    def subscribe(event, method = nil, &block)
+      handler = method || block
+      @event_handler[event] << handler
+
+      Subscription.new(self, event, handler)
+    end
+
+    def unsubscribe(subscription)
+    end
+
+    def publish(event, *args)
+      raise ArgumentError, "#{self.class} does not handle #{event.inspect}" unless @event_handler.include?(event)
+
+      return unless enabled?
+
+      if respond_to?(event)
+        return :handled if send(event, self, *args) == :handled
+      end
+
+      @event_handler[event].reverse_each do |handler|
+        return :handled if handler.call(self, *args) == :handled
+      end
+
+      parent.publish(event, *args) if parent
+      return nil
+    end
+
+    def event(event)
+      @event_handler ||= Hash.new
+      @event_handler[event] ||= []
+    end
+  end
+
+  class Subscription
+    attr_reader :publisher, :event, :handler
+
+    def initialize(publisher, event, handler)
+      @publisher, @event, @handler = publisher, event, handler
+    end
+
+    def unsubscribe
+      @publisher.unsubscribe(self)
+    end
+  end
 end

data/lib/cyberarm_engine/ui/gui_state.rb

@@ -1,135 +1,135 @@
-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
-      @containers     = [@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
+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