cyberarm_engine 0.8.1 → 0.9.0

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

@@ -0,0 +1,92 @@
+module CyberarmEngine
+  class Element
+    class EditLine < Button
+      def initialize(text, options = {}, block = nil)
+        super(text, options, block)
+
+        @type = default(:type)
+
+        @caret_width = default(:caret_width)
+        @caret_height= @text.height
+        @caret_color = default(:caret_color)
+        @caret_interval = default(:caret_interval)
+        @caret_last_interval = Gosu.milliseconds
+        @show_caret  = true
+
+        @text_input = Gosu::TextInput.new
+        @text_input.text = text
+
+        return self
+      end
+
+      def render
+        Gosu.clip_to(@text.x, @text.y, @style.width, @text.height) do
+          draw_text
+          Gosu.draw_rect(caret_position, @text.y, @caret_width, @caret_height, @caret_color, @z + 40) if @focus && @show_caret
+        end
+      end
+
+      def update
+        if @type == :password
+          @text.text = default(:password_character) * @text_input.text.length
+        else
+          @text.text = @text_input.text
+        end
+
+        if Gosu.milliseconds >= @caret_last_interval + @caret_interval
+          @caret_last_interval = Gosu.milliseconds
+
+          @show_caret = !@show_caret
+        end
+      end
+
+      def left_mouse_button(sender, x, y)
+        super
+        window.text_input = @text_input
+      end
+
+      def enter(sender)
+        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 leave(sender)
+        unless @focus
+          super
+        end
+      end
+
+      def blur(sender)
+        @focus = false
+        @style.background_canvas.background = default(:background)
+        @text.color = default(:color)
+        window.text_input = nil
+      end
+
+      # TODO: Fix caret rendering in wrong position unless caret_pos is at end of text
+      def caret_position
+        if @type == :password
+          @text.x + @text.textobject.text_width(default(:password_character) * @text_input.text[0..@text_input.caret_pos-1].length)
+        else
+          @text.x + @text.textobject.text_width(@text_input.text[0..@text_input.caret_pos-1])
+        end
+      end
+
+      def recalculate
+        super
+
+        @width = dimensional_size(@style.width, :width) || default(:width)
+        update_background
+      end
+
+      def value
+        @text_input.text
+      end
+    end
+  end
+end

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

@@ -0,0 +1,17 @@
+module CyberarmEngine
+  class Element
+    class Flow < Container
+      include Common
+
+      def layout
+        @children.each do |child|
+          if fits_on_line?(child)
+            position_on_current_line(child)
+          else
+            position_on_next_line(child)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,50 @@
+module CyberarmEngine
+  class Element
+    class Image < Element
+      def initialize(path, options = {}, block = nil)
+        super(options, block)
+        @path = path
+
+        @image = Gosu::Image.new(path, retro: @options[:image_retro])
+        @scale_x, @scale_y = 1, 1
+      end
+
+      def render
+        @image.draw(
+          @style.border_thickness_left + @style.padding_left + @x,
+          @style.border_thickness_top + @style.padding_top + @y,
+          @z + 2,
+          @scale_x, @scale_y) # TODO: Add color support?
+      end
+
+      def clicked_left_mouse_button(sender, x, y)
+        @block.call(self) if @block
+      end
+
+      def recalculate
+        _width = dimensional_size(@style.width, :width)
+        _height= dimensional_size(@style.height,:height)
+
+        if _width && _height
+          @scale_x = _width.to_f / @image.width
+          @scale_y = _height.to_f / @image.height
+        elsif _width
+          @scale_x = _width.to_f / @image.width
+          @scale_y = @scale_x
+        elsif _height
+          @scale_y = _height.to_f / @image.height
+          @scale_x = @scale_y
+        else
+          @scale_x, @scale_y = 1, 1
+        end
+
+        @width = _width  ? _width  : @image.width.round * @scale_x
+        @height= _height ? _height : @image.height.round * @scale_y
+      end
+
+      def value
+        @path
+      end
+    end
+  end
+end

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

@@ -0,0 +1,45 @@
+module CyberarmEngine
+  class Element
+    class Label < Element
+      def initialize(text, options = {}, block = nil)
+        super(options, block)
+
+        @text = Text.new(text, font: @options[:font], z: @z, color: @options[:color], size: @options[:text_size], shadow: @options[:text_shadow])
+      end
+
+      def render
+        @text.draw
+      end
+
+      def clicked_left_mouse_button(sender, x, y)
+        @block.call(self) if @block
+      end
+
+      def recalculate
+        _width = dimensional_size(@style.width, :width)
+        _height= dimensional_size(@style.height,:height)
+        @width = _width  ? _width  : @text.width.round
+        @height= _height ? _height : @text.height.round
+
+        @text.x = @style.border_thickness_left + @style.padding_left + @x
+        @text.y = @style.border_thickness_top + @style.padding_top  + @y
+        @text.z = @z + 3
+
+        update_background
+      end
+
+      def value
+        @text.text
+      end
+
+      def value=(value)
+        @text.text = value
+
+        old_width, old_height = width, height
+        recalculate
+
+        root.gui_state.request_recalculate if old_width != width || old_height != height
+      end
+    end
+  end
+end

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

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

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

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

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

@@ -0,0 +1,54 @@
+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
+      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/gui_state.rb

@@ -10,15 +10,18 @@ module CyberarmEngine
 
       @down_keys = {}
 
-      @root_container = Stack.new
+      @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
 
       setup
     end
@@ -35,6 +38,11 @@ module CyberarmEngine
     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)
@@ -49,6 +57,11 @@ module CyberarmEngine
       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)
@@ -115,5 +128,10 @@ module CyberarmEngine
     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

data/lib/cyberarm_engine/ui/theme.rb

@@ -26,7 +26,23 @@ module CyberarmEngine
         end
       end
 
-      hash.merge(options)
+      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 = {
@@ -74,7 +90,7 @@ module CyberarmEngine
         caret_interval: 500,
       },
 
-      Image: {
+      Image: { # < Element
         retro: false
       },
 
@@ -88,7 +104,16 @@ module CyberarmEngine
 
       ToggleButton: { # < Button
         checkmark: "√"
+      },
+
+      Progress: { # < Element
+        width: 250,
+        height: 36,
+        background: 0xff111111,
+        fraction_background: [0xffc75e61, 0xffe26623],
+        border_thickness: 4,
+        border_color: [0xffd59674, 0xffff8746]
       }
     }.freeze
   end
-end
+end

data/lib/cyberarm_engine/version.rb

@@ -1,4 +1,4 @@
 module CyberarmEngine
   NAME    = "InDev"
-  VERSION = "0.8.1"
+  VERSION = "0.9.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cyberarm_engine
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.9.0
 platform: ruby
 authors:
 - Cyberarm
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-06-21 00:00:00.000000000 Z
+date: 2019-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gosu
@@ -93,21 +93,22 @@ files:
 - lib/cyberarm_engine/objects/text.rb
 - lib/cyberarm_engine/objects/timer.rb
 - lib/cyberarm_engine/ui/border_canvas.rb
-- lib/cyberarm_engine/ui/button.rb
-- lib/cyberarm_engine/ui/check_box.rb
-- lib/cyberarm_engine/ui/container.rb
 - lib/cyberarm_engine/ui/dsl.rb
-- lib/cyberarm_engine/ui/edit_line.rb
 - lib/cyberarm_engine/ui/element.rb
+- lib/cyberarm_engine/ui/elements/button.rb
+- lib/cyberarm_engine/ui/elements/check_box.rb
+- lib/cyberarm_engine/ui/elements/container.rb
+- lib/cyberarm_engine/ui/elements/edit_line.rb
+- lib/cyberarm_engine/ui/elements/flow.rb
+- lib/cyberarm_engine/ui/elements/image.rb
+- lib/cyberarm_engine/ui/elements/label.rb
+- lib/cyberarm_engine/ui/elements/progress.rb
+- lib/cyberarm_engine/ui/elements/stack.rb
+- lib/cyberarm_engine/ui/elements/toggle_button.rb
 - lib/cyberarm_engine/ui/event.rb
-- lib/cyberarm_engine/ui/flow.rb
 - lib/cyberarm_engine/ui/gui_state.rb
-- lib/cyberarm_engine/ui/image.rb
-- lib/cyberarm_engine/ui/label.rb
-- lib/cyberarm_engine/ui/stack.rb
 - lib/cyberarm_engine/ui/style.rb
 - lib/cyberarm_engine/ui/theme.rb
-- lib/cyberarm_engine/ui/toggle_button.rb
 - lib/cyberarm_engine/version.rb
 homepage: https://github.com/cyberarm/cyberarm_engine
 licenses:
@@ -129,7 +130,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Make games quickly and easily with gosu