cyberarm_engine 0.8.1 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d3fd7c0b09fa9487e4a543e508ac8e0ec56561ac34cb620230a49f7c4244b1b3
-  data.tar.gz: 6903fa77e7e3bda53f8cadc9d1915ea905330dd2dcbe8ac8e2a83043132f7256
+  metadata.gz: 13dd35ba206e4239217450cd996f67797a204b97ff4b4bedf5ab77b8b8fa30cb
+  data.tar.gz: d2c4bd2d4f94d0d008fd828d4a8ed7bfea0670bbebaf74dd19f7bda01fd1b0c5
 SHA512:
-  metadata.gz: 39089172ed27cb6e49958d740190f97a28311fcadc4c89e7ba09f0efa71966abcf1ed73cdaa3cc3bcecece699bce411cc670da504ed2c1ee6b18bb4c38f3c740
-  data.tar.gz: 847163bc84e4dad3161e4e8f8c0eae741c421423323692e11f88e089e62763166070608d435b3e2c9d8b49467d45f5fdec815974e750e722e69489c795eea702
+  metadata.gz: 76274df828fc73fae6d3ec1c220815e90cc193c49dfc879495205c63e52a0a617e16740987d06deb2c9c39624eae53c9d47d51799b178fdb3bdc2c38995ee3d0
+  data.tar.gz: 1e7a9b9532d93adc3256cd1ed1d8a0c92c41b682850afdee2f91e56ebc0459b16ede6c05a6fa29e7b2f7ad8b51d95b51750d383c36ab059003ff102d0abfc79b

data/lib/cyberarm_engine.rb

@@ -19,16 +19,17 @@ 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/label"
-require_relative "cyberarm_engine/ui/button"
-require_relative "cyberarm_engine/ui/toggle_button"
-require_relative "cyberarm_engine/ui/edit_line"
-require_relative "cyberarm_engine/ui/image"
-require_relative "cyberarm_engine/ui/container"
-
-require_relative "cyberarm_engine/ui/flow"
-require_relative "cyberarm_engine/ui/stack"
-require_relative "cyberarm_engine/ui/check_box"
+require_relative "cyberarm_engine/ui/elements/label"
+require_relative "cyberarm_engine/ui/elements/button"
+require_relative "cyberarm_engine/ui/elements/toggle_button"
+require_relative "cyberarm_engine/ui/elements/edit_line"
+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/progress"
+
 require_relative "cyberarm_engine/ui/dsl"
 
 require_relative "cyberarm_engine/game_state"

data/lib/cyberarm_engine/background.rb

@@ -158,9 +158,20 @@ module CyberarmEngine
         @top_right    = background[:top_right]
         @bottom_left  = background[:bottom_left]
         @bottom_right = background[:bottom_right]
+      elsif background.is_a?(Range)
+        set([background.begin, background.begin, background.end, background.end])
       else
         raise ArgumentError, "background '#{background}' of type '#{background.class}' was not able to be processed"
       end
     end
   end
-end
+end
+
+# Add <=> method to support Range based gradients
+module Gosu
+ class Color
+   def <=>(other)
+     self
+   end
+ end
+end

data/lib/cyberarm_engine/engine.rb

@@ -62,7 +62,7 @@ module CyberarmEngine
         @states << klass
       else
         @states << klass.new(options) if child_of?(klass, GameState)
-        @states << klass.new if child_of?(klass, Container)
+        @states << klass.new if child_of?(klass, Element::Container)
       end
     end
 

data/lib/cyberarm_engine/ui/dsl.rb

@@ -3,7 +3,7 @@ module CyberarmEngine
     def flow(options = {}, &block)
       options[:parent] = @containers.last
       options[:theme] = current_theme
-      _container = Flow.new(options, block)
+      _container = Element::Flow.new(options, block)
       @containers << _container
       _container.build
       _container.parent.add(_container)
@@ -15,7 +15,7 @@ module CyberarmEngine
     def stack(options = {}, &block)
       options[:parent] = @containers.last
       options[:theme] = current_theme
-      _container = Stack.new(options, block)
+      _container = Element::Stack.new(options, block)
       @containers << _container
       _container.build
       _container.parent.add(_container)
@@ -27,7 +27,7 @@ module CyberarmEngine
     def label(text, options = {}, &block)
       options[:parent] = @containers.last
       options[:theme] = current_theme
-      _element = Label.new(text, options, block)
+      _element = Element::Label.new(text, options, block)
       @containers.last.add(_element)
 
       return _element
@@ -36,7 +36,7 @@ module CyberarmEngine
     def button(text, options = {}, &block)
       options[:parent] = @containers.last
       options[:theme] = current_theme
-      _element = Button.new(text, options, block) { if block.is_a?(Proc); block.call; end }
+      _element = Element::Button.new(text, options, block) { if block.is_a?(Proc); block.call; end }
       @containers.last.add(_element)
 
       return _element
@@ -45,7 +45,7 @@ module CyberarmEngine
     def edit_line(text, options = {}, &block)
       options[:parent] = @containers.last
       options[:theme] = current_theme
-      _element = EditLine.new(text, options, block)
+      _element = Element::EditLine.new(text, options, block)
       @containers.last.add(_element)
 
       return _element
@@ -54,7 +54,7 @@ module CyberarmEngine
     def toggle_button(options = {}, &block)
       options[:parent] = @containers.last
       options[:theme] = current_theme
-      _element = ToggleButton.new(options, block)
+      _element = Element::ToggleButton.new(options, block)
       @containers.last.add(_element)
 
       return _element
@@ -63,7 +63,7 @@ module CyberarmEngine
     def check_box(text, options = {}, &block)
       options[:parent] = @containers.last
       options[:theme] = current_theme
-      _element = CheckBox.new(text, options, block)
+      _element = Element::CheckBox.new(text, options, block)
       @containers.last.add(_element)
 
       return _element
@@ -72,7 +72,16 @@ module CyberarmEngine
     def image(path, options = {}, &block)
       options[:parent] = @containers.last
       options[:theme] = current_theme
-      _element = Image.new(path, options, block)
+      _element = Element::Image.new(path, options, block)
+      @containers.last.add(_element)
+
+      return _element
+    end
+
+    def progress(options = {}, &block)
+      options[:parent] = @containers.last
+      options[:theme] = current_theme
+      _element = Element::Progress.new(options, block)
       @containers.last.add(_element)
 
       return _element

data/lib/cyberarm_engine/ui/element.rb

@@ -23,11 +23,14 @@ module CyberarmEngine
       @y = @style.y
       @z = @style.z
 
+      @width  = 0
+      @height = 0
+
       @fixed_x = @x if @x != 0
       @fixed_y = @y if @y != 0
 
-      @style.width  = default(:width)  || $window.width
-      @style.height = default(:height) || $window.height
+      @style.width  = default(:width)  || nil
+      @style.height = default(:height) || nil
 
       stylize
 
@@ -119,17 +122,17 @@ module CyberarmEngine
 
     def toggle
       @visible = !@visible
-      root.recalculate
+      root.gui_state.request_recalculate
     end
 
     def show
       @visible = true
-      root.recalculate
+      root.gui_state.request_recalculate
     end
 
     def hide
       @visible = false
-      root.recalculate
+      root.gui_state.request_recalculate
     end
 
     def draw
@@ -159,7 +162,7 @@ module CyberarmEngine
 
     def width
       if visible?
-        (@style.border_thickness_left + @style.padding_left) + @style.width + (@style.padding_right + @style.border_thickness_right)
+        (@style.border_thickness_left + @style.padding_left) + @width + (@style.padding_right + @style.border_thickness_right)
       else
         0
       end
@@ -171,7 +174,7 @@ module CyberarmEngine
 
     def height
       if visible?
-        (@style.border_thickness_top + @style.padding_top) + @style.height + (@style.padding_bottom + @style.border_thickness_bottom)
+        (@style.border_thickness_top + @style.padding_top) + @height + (@style.padding_bottom + @style.border_thickness_bottom)
       else
         0
       end
@@ -181,6 +184,19 @@ module CyberarmEngine
       @style.margin_top + height + @style.margin_bottom
     end
 
+    private def dimensional_size(size, dimension)
+      raise "dimension must be either :width or :height" unless dimension == :width || dimension == :height
+      if size && size.is_a?(Numeric)
+        if size.between?(0.0, 1.0)
+          @parent.send(:"#{dimension}") * size
+        else
+          size
+        end
+      else
+        nil
+      end
+    end
+
     def background=(_background)
       @style.background_canvas.background=(_background)
       update_background
@@ -214,6 +230,10 @@ module CyberarmEngine
       @root
     end
 
+    def is_root?
+      @gui_state != nil
+    end
+
     def recalculate
       raise "#{self.class}#recalculate was not overridden!"
     end

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

@@ -0,0 +1,55 @@
+module CyberarmEngine
+  class Element
+    class Button < Label
+      def initialize(text, options = {}, block = nil)
+        super(text, options, block)
+
+        @style.background_canvas.background = default(:background)
+      end
+
+      def render
+        draw_text
+      end
+
+      def draw_text
+        @text.draw
+      end
+
+      def enter(sender)
+        @focus = false unless window.button_down?(Gosu::MsLeft)
+
+        if @focus
+          @style.background_canvas.background = default(:active, :background)
+          @text.color = default(:active, :color)
+        else
+          @style.background_canvas.background = default(:hover, :background)
+          @text.color = default(:hover, :color)
+        end
+      end
+
+      def left_mouse_button(sender, x, y)
+        @focus = true
+        @style.background_canvas.background = default(:active, :background)
+        window.current_state.focus = self
+        @text.color = default(:active, :color)
+      end
+
+      def released_left_mouse_button(sender,x, y)
+        enter(sender)
+      end
+
+      def clicked_left_mouse_button(sender, x, y)
+        @block.call(self) if @block
+      end
+
+      def leave(sender)
+        @style.background_canvas.background = default(:background)
+        @text.color = default(:color)
+      end
+
+      def blur(sender)
+        @focus = false
+      end
+    end
+  end
+end

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

@@ -0,0 +1,59 @@
+module CyberarmEngine
+  class Element
+    class CheckBox < Flow
+      def initialize(text, options, block = nil)
+        super({}, block = nil)
+        options[:toggled] = options[:checked]
+
+        @toggle_button = ToggleButton.new(options)
+        @label         = Label.new(text, options)
+
+        define_label_singletons
+
+        add(@toggle_button)
+        add(@label)
+      end
+
+      def text=(text)
+        @label.text = text
+        recalculate
+      end
+
+      def value
+        @toggle_button.value
+      end
+
+      def value=(bool)
+        @toggle_button.vlaue = bool
+      end
+
+      def define_label_singletons
+        @label.define_singleton_method(:_toggle_button) do |button|
+          @_toggle_button = button
+        end
+
+        @label._toggle_button(@toggle_button)
+
+        @label.define_singleton_method(:holding_left_mouse_button) do |sender, x, y|
+          @_toggle_button.left_mouse_button(sender, x, y)
+        end
+
+        @label.define_singleton_method(:released_left_mouse_button) do |sender, x, y|
+          @_toggle_button.released_left_mouse_button(sender, x, y)
+        end
+
+        @label.define_singleton_method(:clicked_left_mouse_button) do |sender, x, y|
+          @_toggle_button.clicked_left_mouse_button(sender, x, y)
+        end
+
+        @label.define_singleton_method(:enter) do |sender|
+          @_toggle_button.enter(sender)
+        end
+
+        @label.define_singleton_method(:leave) do |sender|
+          @_toggle_button.leave(sender)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,159 @@
+module CyberarmEngine
+  class Element
+    class Container < Element
+      include Common
+
+      attr_accessor :stroke_color, :fill_color
+      attr_reader :children, :gui_state
+      attr_reader :scroll_x, :scroll_y
+
+      def initialize(options = {}, block = nil)
+        @gui_state = options.delete(:gui_state)
+        super
+
+        @scroll_x, @scroll_y = 0, 0
+        @scroll_speed = 10
+
+        @text_color = options[:color]
+
+        @children = []
+      end
+
+      def build
+        @block.call(self) if @block
+
+        recalculate
+      end
+
+      def add(element)
+        @children << element
+
+        recalculate
+      end
+
+      def render
+        Gosu.clip_to(@x, @y, width, height) do
+          @children.each(&:draw)
+        end
+      end
+
+      def update
+        @children.each(&:update)
+      end
+
+      def hit_element?(x, y)
+        @children.reverse_each do |child|
+          case child
+          when Container
+            if element = child.hit_element?(x, y)
+              return element
+            end
+          else
+            return child if child.hit?(x, y)
+          end
+        end
+
+        self if hit?(x, y)
+      end
+
+      def recalculate
+        @current_position = Vector.new(@style.margin_left + @style.padding_left, @style.margin_top + @style.padding_top)
+        return unless visible?
+        stylize
+
+        layout
+
+        if is_root?
+          @width  = @style.width  = window.width
+          @height = @style.height = window.height
+        else
+          _width = dimensional_size(@style.width, :width)
+          _height= dimensional_size(@style.height,:height)
+          @width  = _width  ? _width  : (@children.map {|c| c.x + c.outer_width }.max || 0).round
+          @height = _height ? _height : (@children.map {|c| c.y + c.outer_height}.max || 0).round
+        end
+
+
+        # Move child to parent after positioning
+        @children.each do |child|
+          child.x += @x
+          child.y += @y
+
+          child.stylize
+          child.recalculate
+          child.reposition # TODO: Implement top,bottom,left,center, and right positioning
+        end
+
+        update_background
+      end
+
+      def layout
+        raise "Not overridden"
+      end
+
+      def max_width
+        @max_width ? @max_width : window.width - (@parent ? @parent.style.margin_right + @style.margin_right : @style.margin_right)
+      end
+
+      def fits_on_line?(element) # Flow
+        @current_position.x + element.outer_width <= max_width &&
+        @current_position.x + element.outer_width <= window.width
+      end
+
+      def position_on_current_line(element) # Flow
+        element.x = element.style.margin_left + @current_position.x
+        element.y = element.style.margin_top  + @current_position.y
+
+        element.recalculate
+
+        @current_position.x += element.outer_width
+        @current_position.x = @style.margin_left if @current_position.x >= max_width
+      end
+
+      def tallest_neighbor(querier, y_position) # Flow
+        response = querier
+        @children.each do |child|
+          response = child if child.outer_height > response.outer_height
+          break if child == querier
+        end
+
+        return response
+      end
+
+      def position_on_next_line(child) # Flow
+        @current_position.x = @style.margin_left
+        @current_position.y += tallest_neighbor(child, @current_position.y).outer_height
+
+        child.x = child.style.margin_left + @current_position.x
+        child.y = child.style.margin_top  + @current_position.y
+
+        child.recalculate
+
+        @current_position.x += child.outer_width
+      end
+
+      def move_to_next_line(element) # Stack
+        element.x = element.style.margin_left + @current_position.x
+        element.y = element.style.margin_top  + @current_position.y
+
+        element.recalculate
+
+        @current_position.y += element.outer_height
+      end
+
+      # def mouse_wheel_up(sender, x, y)
+      #   @children.each {|c| c.y -= @scroll_speed}
+      #   @children.each {|c| c.recalculate}
+      # end
+
+      # def mouse_wheel_down(sender, x, y)
+      #   @children.each {|c| c.y += @scroll_speed}
+      #   @children.each {|c| c.recalculate}
+      # end
+
+      def value
+        @children.map {|c| c.class}.join(", ")
+      end
+    end
+  end
+end