Bumpe version

cyberarm_engine.gemspec

@@ -27,7 +27,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = %w[lib assets]
 
-  spec.add_dependency "excon", "~> 0.88"
+  spec.add_dependency "clipboard", "~> 1.3.5"
+  spec.add_dependency "excon", "~> 0.78.0"
   spec.add_dependency "gosu", "~> 1.1"
   spec.add_dependency "gosu_more_drawables", "~> 0.3"
   # spec.add_dependency "ffi", :platforms => [:mswin, :mingw] # Required by Clipboard on Windows

lib/cyberarm_engine.rb

@@ -8,6 +8,7 @@ end
 require "json"
 require "excon"
 require "gosu_more_drawables"
+require "clipboard"
 
 require_relative "cyberarm_engine/version"
 require_relative "cyberarm_engine/stats"
@@ -22,19 +23,12 @@ require_relative "cyberarm_engine/vector"
 require_relative "cyberarm_engine/transform"
 require_relative "cyberarm_engine/ray"
 require_relative "cyberarm_engine/background"
-require_relative "cyberarm_engine/background_nine_slice"
-require_relative "cyberarm_engine/background_image"
 require_relative "cyberarm_engine/animator"
 
 require_relative "cyberarm_engine/text"
 require_relative "cyberarm_engine/timer"
 require_relative "cyberarm_engine/config_file"
 
-require_relative "cyberarm_engine/console"
-require_relative "cyberarm_engine/console/command"
-require_relative "cyberarm_engine/console/subcommand"
-require_relative "cyberarm_engine/console/commands/help_command"
-
 require_relative "cyberarm_engine/ui/dsl"
 
 require_relative "cyberarm_engine/ui/theme"

lib/cyberarm_engine/animator.rb

@@ -43,177 +43,14 @@ module CyberarmEngine
       Gosu::Color.from_ahsv(alpha, hue, saturation, value)
     end
 
-    # Tween functions based on those provided here: https://github.com/danro/easing-js/blob/master/easing.js
-    # Under MIT / BSD
+    # NOTE: Use this for future reference? https://github.com/danro/easing-js/blob/master/easing.js
 
     def tween_linear(t)
       t
     end
 
-    def tween_ease_in_quad(t)
-      t ** 2
-    end
-
-    def tween_ease_out_quad(t)
-      -((t - 1) ** 2) -1
-    end
-
-    def tween_ease_in_out_quad(t)
-      return 0.5 * (t ** 2) if (t /= 0.5) < 1
-      return -0.5 * ((t -= 2) * t - 2)
-    end
-
-    def tween_ease_in_cubic(t)
-      t ** 3
-    end
-
-    def tween_ease_out_cubic(t)
-      ((t - 1) ** 3) + 1
-    end
-
-    def tween_ease_in_out_cubic(t)
-      return 0.5 * (t ** 3) if ((t /= 0.5) < 1)
-      return 0.5 * ((t - 2) ** 3) + 2
-    end
-
-    def tween_ease_in_quart(t)
-      t ** 4
-    end
-
-    def tween_ease_out_quart(t)
-      -((t - 1) ** 4) - 1
-    end
-
-    def tween_ease_in_out_quart(t)
-      return 0.5 * (t ** 4) if ((t /= 0.5) < 1)
-      return -0.5 * ((t -= 2) * (t ** 3) - 2)
-    end
-
-    def tween_ease_in_quint(t)
-      t ** 5
-    end
-
-    def tween_ease_out_quint(t)
-      ((t - 1) ** 5) + 1
-    end
-
-    def tween_ease_in_out_quint(t)
-      return 0.5 * (t ** 5) if ((t /= 0.5) < 1)
-      return 0.5 * ((t - 2) ** 5) + 2
-    end
-
-    def tween_ease_in(t) # sine
-      -Math.cos(t * (Math::PI / 2)) + 1
-    end
-
-    def tween_ease_out(t) # sine
-      Math.sin(t * (Math::PI / 2))
-    end
-
-    def tween_ease_in_out(t) # sine
+    def tween_ease_in_out(t)
       (-0.5 * (Math.cos(Math::PI * t) - 1))
     end
-
-    def tween_ease_in_expo(t)
-      (t == 0) ? 0 : 2 ** 10 * (t - 1)
-    end
-
-    def tween_ease_out_expo(t)
-      (t == 1) ? 1 : -(2 ** -10 * t) + 1
-    end
-
-    def tween_ease_in_out_expo(t)
-      return 0 if (t == 0)
-      return 1 if (t == 1)
-      return 0.5 * (2 ** 10 * (t - 1)) if ((t /= 0.5) < 1)
-      return 0.5 * (-(2 ** -10 * (t -= 1)) + 2)
-    end
-
-    def tween_ease_in_circ(t)
-      -(Math.sqrt(1 - (t * t)) - 1)
-    end
-
-    def tween_ease_out_circ(t)
-      Math.sqrt(1 - ((t - 1) ** 2))
-    end
-
-    def tween_ease_in_out_circ(t)
-      return -0.5 * (Math.sqrt(1 - t * t) - 1) if ((t /= 0.5) < 1)
-      return 0.5 * (Math.sqrt(1 - (t -= 2) * t) + 1)
-    end
-
-    def tween_ease_in_back(t)
-      s = 1.70158
-      t * t * ((s + 1) * t - s)
-    end
-
-    def tween_ease_out_back(t)
-      s = 1.70158
-      (t = t - 1) * t * ((s + 1) * t + s) + 1
-    end
-
-    def tween_ease_in_out_back(t)
-      s = 1.70158
-      return 0.5 * (t * t * (((s *= (1.525)) + 1) * t - s)) if ((t /= 0.5) < 1)
-      return 0.5 * ((t -= 2) * t * (((s *= (1.525)) + 1) * t + s) + 2)
-    end
-
-    def tween_elastic(t)
-      -1 * (4 ** (-8 * t)) * Math.sin((t * 6 - 1) * (2 * Math::PI) / 2) + 1
-    end
-
-    def tween_swing_from_to(t)
-      s = 1.70158
-      return 0.5 * (t * t * (((s *= (1.525)) + 1) * t - s)) if (t /= 0.5) < 1
-      return 0.5 * ((t -= 2) * t * (((s *= (1.525)) + 1) * t + s) + 2)
-    end
-
-    def tween_swing_from(t)
-      s = 1.70158;
-      t * t * ((s + 1) * t - s)
-    end
-
-    def tween_swing_to(t)
-      s = 1.70158
-      (t -= 1) * t * ((s + 1) * t + s) + 1
-    end
-
-    def tween_bounce(t)
-      if (t < (1 / 2.75))
-        (7.5625 * t * t)
-      elsif (t < (2 / 2.75))
-        (7.5625 * (t -= (1.5 / 2.75)) * t + 0.75)
-      elsif (t < (2.5 / 2.75))
-        (7.5625 * (t -= (2.25 / 2.75)) * t + 0.9375)
-      else
-        (7.5625 * (t -= (2.625 / 2.75)) * t + 0.984375)
-      end
-    end
-
-    def tween_bounce_past(t)
-      if (t < (1 / 2.75))
-        # missing "2 -"?
-        (7.5625 * t * t)
-      elsif (t < (2 / 2.75))
-        2 - (7.5625 * (t -= (1.5 / 2.75)) * t + 0.75)
-      elsif (t < (2.5 / 2.75))
-        2 - (7.5625 * (t -= (2.25 / 2.75)) * t + 0.9375)
-      else
-        2 - (7.5625 * (t -= (2.625 / 2.75)) * t + 0.984375)
-      end
-    end
-
-    def tween_ease_from_to(t)
-      return 0.5 * (t ** 4) if ((t /= 0.5) < 1)
-      return -0.5 * ((t -= 2) * (t ** 3) - 2)
-    end
-
-    def tween_ease_from(t)
-      t ** 4
-    end
-
-    def tween_ease_to(t)
-      t ** 0.25
-    end
   end
 end

lib/cyberarm_engine/background_image.rb

@@ -1,93 +0,0 @@
-module CyberarmEngine
-  class BackgroundImage
-    include CyberarmEngine::Common
-    attr_accessor :x, :y, :z, :mode
-    attr_reader :image, :width, :height, :color
-
-    def initialize(image_path: nil, x: 0, y: 0, z: 0, width: 0, height: 0, mode: :fill, color: Gosu::Color::WHITE)
-      @image_path = image_path
-      @image = get_image(image_path) if image_path
-
-      @x = x
-      @y = y
-      @z = z
-      @width = width
-      @height = height
-
-      @mode = mode
-
-      @color = color
-
-      @cached_tiling = nil
-    end
-
-    def image=(image_path)
-      @cached_tiling = nil if image_path != @image_path
-      @image_path = image_path
-      @image = image_path ? get_image(image_path) : image_path
-    end
-
-    def width=(n)
-      @cached_tiling = nil if @width != n
-      @width = n
-    end
-
-    def height=(n)
-      @cached_tiling = nil if @height != n
-      @height = n
-    end
-
-    def color=(c)
-      @cached_tiling = nil if @color != c
-      @color = c
-    end
-
-    def width_scale
-      (@width.to_f / @image.width).abs
-    end
-
-    def height_scale
-      (@height.to_f / @image.height).abs
-    end
-
-    def draw
-      return unless @image
-
-      Gosu.clip_to(@x, @y, @width, @height) do
-        send(:"draw_#{mode}")
-      end
-    end
-
-    def draw_stretch
-      @image.draw(@x, @y, @z, width_scale, height_scale, @color)
-    end
-
-    def draw_tiled
-      @cached_tiling ||= Gosu.record(@width, @height) do
-        height_scale.ceil.times do |y|
-          width_scale.ceil.times do |x|
-            @image.draw(x * @image.width, y * @image.height, @z, 1, 1, @color)
-          end
-        end
-      end
-
-      @cached_tiling.draw(@x, @y, @z)
-    end
-
-    def draw_fill
-      if @width * width_scale > height * height_scale
-        draw_fill_width
-      else
-        draw_fill_height
-      end
-    end
-
-    def draw_fill_width
-      @image.draw(@x, @y, @z, width_scale, width_scale, @color)
-    end
-
-    def draw_fill_height
-      @image.draw(@x, @y, @z, height_scale, height_scale, @color)
-    end
-  end
-end

lib/cyberarm_engine/background_nine_slice.rb

@@ -1,11 +1,10 @@
 module CyberarmEngine
   class BackgroundNineSlice
     include CyberarmEngine::Common
-    attr_accessor :x, :y, :z, :width, :height, :left, :top, :right, :bottom, :mode, :color
-    attr_reader :image
+    attr_accessor :x, :y, :z, :width, :height
 
-    def initialize(image_path: nil, x: 0, y: 0, z: 0, width: 0, height: 0, mode: :tiled, left: 1, top: 1, right: 1, bottom: 1, color: Gosu::Color::WHITE)
-      @image = get_image(image_path) if image_path
+    def initialize(image_path:, x: 0, y: 0, z: 0, width: 64, height: 64, mode: :tiled, left: 4, top: 4, right: 56, bottom: 56)
+      @image = get_image(image_path)
 
       @x = x
       @y = y
@@ -21,33 +20,23 @@ module CyberarmEngine
       @right = right
       @bottom = bottom
 
-      @color = color
-
-      nine_slice if @image
-    end
-
-    def image=(image_path)
-      old_image = @image
-      @image = image_path ? get_image(image_path) : image_path
-      nine_slice if @image && old_image != @image
+      nine_slice
     end
 
     def nine_slice
-      # pp [@left, @top, @right, @bottom, @image.width]
+      @segment_top_left = Gosu.render(@left, @top) { @image.draw(0, 0, 0) }
+      @segment_top_right = Gosu.render(@image.width - @right, @top) { @image.draw(-@right, 0, 0) }
 
-      @segment_top_left = @image.subimage(0, 0, @left, @top)
-      @segment_top_right = @image.subimage(@image.width - @right, 0, @right, @top)
+      @segment_left = Gosu.render(@left, @bottom - @top) { @image.draw(0, -@top, 0) }
+      @segment_right = Gosu.render(@image.width - @right, @bottom - @top) { @image.draw(-@right, -@top, 0) }
 
-      @segment_left = @image.subimage(0, @top, @left, @image.height - (@top + @bottom))
-      @segment_right = @image.subimage(@image.width - @right, @top, @left, @image.height - (@top + @bottom))
+      @segment_bottom_left = Gosu.render(@left, @image.height - @bottom) { @image.draw(0, -@bottom, 0) }
+      @segment_bottom_right = Gosu.render(@image.width - @right, @image.height - @bottom) { @image.draw(-@right, -@bottom, 0) }
 
-      @segment_bottom_left = @image.subimage(0, @image.height - @bottom, @left, @bottom)
-      @segment_bottom_right = @image.subimage(@image.width - @right, @image.height - @bottom, @right, @bottom)
+      @segment_top = Gosu.render(@right - @left, @top) { @image.draw(-@left, 0, 0) }
+      @segment_bottom = Gosu.render(@right - @left, @image.height - @bottom) { @image.draw(-@left, -@bottom, 0) }
 
-      @segment_top = @image.subimage(@left, 0, @image.width - (@left + @right), @top)
-      @segment_bottom = @image.subimage(@left, @image.height - @bottom, @image.width - (@left + @right), @bottom)
-
-      @segment_middle = @image.subimage(@left, @top, @image.width - (@left + @right), @image.height - (@top + @bottom))
+      @segment_middle = Gosu.render(@right - @left, @bottom - @top) { @image.draw(-@left, -@top, 0) }
     end
 
     def cx
@@ -67,73 +56,67 @@ module CyberarmEngine
     end
 
     def width_scale
-      scale = (@width.to_f - (@left + @right)) / (@image.width - (@left + @right))
-      scale.abs
+      width_scale = (@width - (@left + (@image.width - @right))).to_f / (@right - @left)
     end
 
     def height_scale
-      scale = (@height - (@top + @bottom)).to_f / (@image.height - (@top + @bottom))
-      scale.abs
+      height_scale = (@height - (@top + (@image.height - @bottom))).to_f / (@bottom - @top)
     end
 
     def draw
-      return unless @image && @segment_top_left
-
       @mode == :tiled ? draw_tiled : draw_stretched
     end
 
     def draw_stretched
-      @segment_top_left.draw(@x, @y, @z, 1, 1, @color)
-      @segment_top.draw(@x + @segment_top_left.width, @y, @z, width_scale, 1, @color) # SCALE X
-      @segment_top_right.draw((@x + @width) - @segment_top_right.width, @y, @z, 1, 1, @color)
+      @segment_top_left.draw(@x, @y, @z)
+      @segment_top.draw(@x + @segment_top_left.width, @y, @z, width_scale) # SCALE X
+      @segment_top_right.draw((@x + @width) - @segment_top_right.width, @y, @z)
 
-      @segment_right.draw((@x + @width) - @segment_right.width, @y + @top, @z, 1, height_scale, @color) # SCALE Y
-      @segment_bottom_right.draw((@x + @width) - @segment_bottom_right.width, @y + @height - @segment_bottom_right.height, @z, 1, 1, @color)
-      @segment_bottom.draw(@x + @segment_bottom_left.width, (@y + @height) - @segment_bottom.height, @z, width_scale, 1, @color) # SCALE X
-      @segment_bottom_left.draw(@x, (@y + @height) - @segment_bottom_left.height, @z, 1, 1, @color)
-      @segment_left.draw(@x, @y + @top, @z, 1, height_scale, @color) # SCALE Y
-      @segment_middle.draw(@x + @segment_top_left.width, @y + @segment_top.height, @z, width_scale, height_scale, @color) # SCALE X and SCALE Y
+      @segment_right.draw((@x + @width) - @segment_right.width, @y + @top, @z, 1, height_scale) # SCALE Y
+      @segment_bottom_right.draw((@x + @width) - @segment_bottom_right.width, @y + @height - @segment_bottom_right.height, @z)
+      @segment_bottom.draw(@x + @segment_bottom_left.width, (@y + @height) - @segment_bottom.height, @z, width_scale) # SCALE X
+      @segment_bottom_left.draw(@x, (@y + @height) - @segment_bottom_left.height, @z)
+      @segment_left.draw(@x, @y + @top, @z, 1, height_scale) # SCALE Y
+      @segment_middle.draw(@x + @segment_top_left.width, @y + @segment_top.height, @z, width_scale, height_scale) # SCALE X and SCALE Y
     end
 
     def draw_tiled
-      @segment_top_left.draw(@x, @y, @z, 1, 1, @color)
-
-      # p [width_scale, height_scale]
+      @segment_top_left.draw(@x, @y, @z)
 
       Gosu.clip_to(@x + @segment_top_left.width, @y, @segment_top.width * width_scale, @segment_top.height) do
         width_scale.ceil.times do |i|
-          @segment_top.draw(@x + @segment_top_left.width + (@segment_top.width * i), @y, @z, 1, 1, @color) # SCALE X
+          @segment_top.draw(@x + @segment_top_left.width + (@segment_top.width * i), @y, @z) # SCALE X
         end
       end
 
-      @segment_top_right.draw((@x + @width) - @segment_top_right.width, @y, @z, 1, 1, @color)
+      @segment_top_right.draw((@x + @width) - @segment_top_right.width, @y, @z)
 
       Gosu.clip_to(@x + @width - @segment_top_right.width, @y + @top, @segment_right.width, @segment_right.height * height_scale) do
         height_scale.ceil.times do |i|
-          @segment_right.draw((@x + @width) - @segment_right.width, @y + @top + (@segment_right.height * i), @z, 1, 1, @color) # SCALE Y
+          @segment_right.draw((@x + @width) - @segment_right.width, @y + @top + (@segment_right.height * i), @z) # SCALE Y
         end
       end
 
-      @segment_bottom_right.draw((@x + @width) - @segment_bottom_right.width, @y + @height - @segment_bottom_right.height, @z, 1, 1, @color)
+      @segment_bottom_right.draw((@x + @width) - @segment_bottom_right.width, @y + @height - @segment_bottom_right.height, @z)
 
       Gosu.clip_to(@x + @segment_top_left.width, @y + @height - @segment_bottom.height, @segment_top.width * width_scale, @segment_bottom.height) do
         width_scale.ceil.times do |i|
-          @segment_bottom.draw(@x + @segment_bottom_left.width + (@segment_bottom.width * i), (@y + @height) - @segment_bottom.height, @z, 1, 1, @color) # SCALE X
+          @segment_bottom.draw(@x + @segment_bottom_left.width + (@segment_bottom.width * i), (@y + @height) - @segment_bottom.height, @z) # SCALE X
         end
       end
 
-      @segment_bottom_left.draw(@x, (@y + @height) - @segment_bottom_left.height, @z, 1, 1, @color)
+      @segment_bottom_left.draw(@x, (@y + @height) - @segment_bottom_left.height, @z)
 
       Gosu.clip_to(@x, @y + @top, @segment_left.width, @segment_left.height * height_scale) do
         height_scale.ceil.times do |i|
-          @segment_left.draw(@x, @y + @top + (@segment_left.height * i), @z, 1, 1, @color) # SCALE Y
+          @segment_left.draw(@x, @y + @top + (@segment_left.height * i), @z) # SCALE Y
         end
       end
 
       Gosu.clip_to(@x + @segment_top_left.width, @y + @segment_top.height, @width - (@segment_left.width + @segment_right.width), @height - (@segment_top.height + @segment_bottom.height)) do
         height_scale.ceil.times do |y|
           width_scale.ceil.times do |x|
-            @segment_middle.draw(@x + @segment_top_left.width + (@segment_middle.width * x), @y + @segment_top.height + (@segment_middle.height * y), @z, 1, 1, @color) # SCALE X and SCALE Y
+            @segment_middle.draw(@x + @segment_top_left.width + (@segment_middle.width * x), @y + @segment_top.height + (@segment_middle.height * y), @z) # SCALE X and SCALE Y
           end
         end
       end

lib/cyberarm_engine/builtin/intro_state.rb

@@ -22,19 +22,18 @@ module CyberarmEngine
 
       base_time = Gosu.milliseconds
 
-      @born_time = Gosu.milliseconds
-      @continue_after = 5_000
-
       @animators = [
         Animator.new(start_time: base_time += 1000, duration: 100,   from: 0.0, to: 1.0, tween: :ease_in_out),
         Animator.new(start_time: base_time += -500, duration: 1_000, from: 0.0, to: 1.0, tween: :ease_in_out),
         Animator.new(start_time: base_time += 500,  duration: 1_000, from: 0.0, to: 1.0, tween: :ease_in_out),
         Animator.new(start_time: base_time += 500,  duration: 1_000, from: 0.0, to: 1.0, tween: :ease_in_out),
         Animator.new(start_time: base_time +  500,  duration: 1_000, from: 0.0, to: 1.0, tween: :ease_in_out),
-        Animator.new(start_time: Gosu.milliseconds + @continue_after - 1_000,  duration: 1_000, from: 0.0, to: 1.0, tween: :ease_in_out),
 
-        Animator.new(start_time: Gosu.milliseconds + 250, duration: 500, from: 0.0, to: 1.0, tween: :swing_to) # CyberarmEngine LOGO
+        Animator.new(start_time: Gosu.milliseconds + 250, duration: 500, from: 0.0, to: 1.0, tween: :ease_in_out) # CyberarmEngine LOGO
       ]
+
+      @born_time = Gosu.milliseconds
+      @continue_after = 5_000
     end
 
     def draw
@@ -61,7 +60,7 @@ module CyberarmEngine
         Gosu::Color::WHITE
       )
 
-      @title.x = window.width / 2 - @title.text_width / 2
+      @title.x = window.width / 2 - @title.width / 2
       @title.y = (window.height / 2 + (@spacer_height / 2) + @padding) * @animators[1].transition
       @title.text = "Powered By"
 
@@ -90,8 +89,6 @@ module CyberarmEngine
           )
         end
       end
-
-      Gosu.draw_rect(0, 0, window.width, window.height, Gosu::Color.rgba(0, 0, 0, 255 * @animators[5].transition), 10_000)
     end
 
     def update
@@ -115,14 +112,14 @@ module CyberarmEngine
       height = @title_size + @caption_size + @spacer_height + 2 * @padding + @spacer_height
 
       Gosu.record(width.ceil, height.ceil) do
-        @title.x = (width - @padding * 2) / 2 - @title.text_width / 2
+        @title.x = (width - @padding * 2) / 2 - @title.width / 2
         @title.y = @padding
         @title.draw
 
         Gosu.draw_rect(0, @padding + @title_size + @padding, @spacer_width, @spacer_height, Gosu::Color::WHITE)
         Gosu.draw_rect(1, @padding + @title_size + @padding + 1, @spacer_width - 2, @spacer_height - 2, color_hint)
 
-        @caption.x =  (width - @padding * 2) / 2 - @caption.text_width / 2
+        @caption.x =  (width - @padding * 2) / 2 - @caption.width / 2
         @caption.y = @padding + @title_size + @padding + @spacer_height + @padding
         @caption.draw
       end

lib/cyberarm_engine/common.rb

@@ -8,11 +8,8 @@ module CyberarmEngine
       window.current_state
     end
 
-    def previous_state(state = nil)
-      raise "Only available for CyberarmEngine::GameState and subclasses" unless is_a?(CyberarmEngine::GameState) || state.is_a?(CyberarmEngine::GameState)
-
-      i = window.states.index(state || self)
-      window.states[i - 1] unless (i - 1).negative?
+    def previous_state
+      window.previous_state
     end
 
     def pop_state
@@ -31,8 +28,8 @@ module CyberarmEngine
       window.show_cursor = boolean
     end
 
-    def draw_rect(x, y, width, height, color, z = 0, mode = :default)
-      Gosu.draw_rect(x, y, width, height, color, z, mode)
+    def draw_rect(x, y, width, height, color, z = 0)
+      Gosu.draw_rect(x, y, width, height, color, z)
     end
 
     def fill(color, z = 0)
@@ -98,19 +95,7 @@ module CyberarmEngine
     end
 
     def window
-      CyberarmEngine::Window.instance
-    end
-
-    def control_down?
-      Gosu.button_down?(Gosu::KB_LEFT_CONTROL) || Gosu.button_down?(Gosu::KB_RIGHT_CONTROL)
-    end
-
-    def shift_down?
-      Gosu.button_down?(Gosu::KB_LEFT_SHIFT) || Gosu.button_down?(Gosu::KB_RIGHT_SHIFT)
-    end
-
-    def alt_down?
-      Gosu.button_down?(Gosu::KB_LEFT_ALT) || Gosu.button_down?(Gosu::KB_RIGHT_ALT)
+      $window
     end
   end
 end

lib/cyberarm_engine/console.rb

@@ -1,248 +0,0 @@
-# frozen_string_literal: true
-
-module CyberarmEngine
-  class Console
-    Z = 100_000
-    PADDING = 2
-    include Common
-
-    attr_reader :text_input
-
-    def initialize(font: Gosu.default_font_name)
-      @text_input = Gosu::TextInput.new
-      @width  = window.width  / 4 * 3
-      @height = window.height / 4 * 3
-
-      @input = Text.new("", x: 4, y: @height - (PADDING * 2), z: Console::Z + 1, font: font)
-      @input.y -= @input.height
-
-      @history = Text.new("", x: 4, z: Console::Z + 1, font: font, border: true, border_color: Gosu::Color::BLACK)
-      update_history_y
-
-      @command_history       = []
-      @command_history_index = 0
-
-      @memory = ""
-
-      @background_color = Gosu::Color.rgba(0, 0, 0, 200)
-      @foreground_color = Gosu::Color.rgba(100, 100, 100, 100)
-      @input_color      = Gosu::Color.rgba(100, 100, 100, 200)
-
-      @showing_cursor = false
-      @active_text_input = nil
-
-      @show_caret = true
-      @caret_last_change = Gosu.milliseconds
-      @caret_interval = 250
-      @caret_color = Gosu::Color::WHITE
-      @selection_color = Gosu::Color.new(0x5522ff22)
-    end
-
-    def draw
-      # Background/Border
-      draw_rect(0, 0, @width, @height, @background_color, Console::Z)
-      # Foregound/History
-      draw_rect(PADDING, PADDING, @width - (PADDING * 2), @height - (PADDING * 2), @foreground_color, Console::Z)
-      # Text bar
-      draw_rect(2, @input.y, @width - (PADDING * 2), @input.height, @input_color, Console::Z)
-
-      @history.draw
-      @input.draw
-      # Caret
-      if @show_caret
-        draw_rect(@input.x + caret_from_left, @input.y, Console::PADDING, @input.height, @caret_color, Console::Z + 2)
-      end
-      # Caret selection
-      if caret_start != caret_end
-        if caret_start < @text_input.selection_start
-          draw_rect(@input.x + caret_from_left, @input.y, caret_selection_width, @input.height, @selection_color, Console::Z)
-        else
-          draw_rect((@input.x + caret_from_left) - caret_selection_width, @input.y, caret_selection_width, @input.height, @selection_color, Console::Z)
-        end
-      end
-    end
-
-    def caret_from_left
-      return 0 if @text_input.caret_pos.zero?
-
-      @input.textobject.text_width(@text_input.text[0..@text_input.caret_pos - 1])
-    end
-
-    def caret_selection_width
-      @input.textobject.text_width(@text_input.text[caret_start..(caret_end - 1)])
-    end
-
-    def caret_pos
-      @text_input.caret_pos
-    end
-
-    def caret_start
-      @text_input.selection_start < @text_input.caret_pos ? @text_input.selection_start : @text_input.caret_pos
-    end
-
-    def caret_end
-      @text_input.selection_start > @text_input.caret_pos ? @text_input.selection_start : @text_input.caret_pos
-    end
-
-    def update
-      if Gosu.milliseconds - @caret_last_change >= @caret_interval
-        @caret_last_change = Gosu.milliseconds
-        @show_caret = !@show_caret
-      end
-
-      if @width != window.width || @height != @height
-        @width  = window.width  / 4 * 3
-        @height = window.height / 4 * 3
-
-        @input.y = @height - (PADDING * 2 + @input.height)
-        update_history_y
-      end
-
-      @input.text = @text_input.text
-    end
-
-    def button_down(id)
-      case id
-      when Gosu::KbEnter, Gosu::KbReturn
-        return unless @text_input.text.length.positive?
-
-        @history.text += "\n<c=999999>> #{@text_input.text}</c>"
-        @command_history << @text_input.text
-        @command_history_index = @command_history.size
-        update_history_y
-        handle_command
-        @text_input.text = ""
-
-      when Gosu::KbUp
-        @command_history_index -= 1
-        @command_history_index = 0 if @command_history_index.negative?
-        @text_input.text = @command_history[@command_history_index]
-
-      when Gosu::KbDown
-        @command_history_index += 1
-        if @command_history_index > @command_history.size - 1
-          @text_input.text = "" unless @command_history_index > @command_history.size
-          @command_history_index = @command_history.size
-        else
-          @text_input.text = @command_history[@command_history_index]
-        end
-
-      when Gosu::KbTab
-        split = @text_input.text.split(" ")
-
-        if !@text_input.text.end_with?(" ") && split.size == 1
-          list = abbrev_search(Console::Command.list_commands.map { |cmd| cmd.command.to_s }, @text_input.text)
-
-          if list.size == 1
-            @text_input.text = "#{list.first} "
-          elsif list.size.positive?
-            stdin("\n#{list.map { |cmd| Console::Style.highlight(cmd) }.join(', ')}")
-          end
-        elsif split.size.positive? && cmd = Console::Command.find(split.first)
-          cmd.autocomplete(self)
-        end
-
-      when Gosu::KbBacktick
-        # Remove backtick character from input
-        @text_input.text = if @text_input.text.size > 1
-                             @text_input.text[0..@text_input.text.size - 2]
-                           else
-                             ""
-                           end
-
-      # Copy
-      when Gosu::KbC
-        if control_down? && shift_down?
-          @memory = @text_input.text[caret_start..caret_end - 1] if caret_start != caret_end
-          p @memory
-        elsif control_down?
-          @text_input.text = ""
-        end
-
-      # Paste
-      when Gosu::KbV
-        if control_down? && shift_down?
-          string = @text_input.text.chars.insert(caret_pos, @memory).join
-          _caret_pos = caret_pos
-          @text_input.text = string
-          @text_input.caret_pos = _caret_pos + @memory.length
-          @text_input.selection_start = _caret_pos + @memory.length
-        end
-
-      # Cut
-      when Gosu::KbX
-        if control_down? && shift_down?
-          @memory = @text_input.text[caret_start..caret_end - 1] if caret_start != caret_end
-          string  = @text_input.text.chars
-          Array(caret_start..caret_end - 1).each_with_index do |i, j|
-            string.delete_at(i - j)
-          end
-
-          @text_input.text = string.join
-        end
-
-      # Delete word to left of caret
-      when Gosu::KbW
-        if control_down?
-          split = @text_input.text.split(" ")
-          split.delete(split.last)
-          @text_input.text = split.join(" ")
-        end
-
-      # Clear history
-      when Gosu::KbL
-        @history.text = "" if control_down?
-      end
-    end
-
-    def button_up(id)
-    end
-
-    def update_history_y
-      @history.y = @height - (PADDING * 2) - @input.height - (@history.text.lines.count * @history.textobject.height)
-    end
-
-    def handle_command
-      string = @text_input.text
-      split  = string.split(" ")
-      command = split.first
-      arguments = split.length.positive? ? split[1..split.length - 1] : []
-
-      CyberarmEngine::Console::Command.use(command, arguments, self)
-    end
-
-    def abbrev_search(array, text)
-      return [] unless text.length.positive?
-
-      list = []
-      Abbrev.abbrev(array).each do |abbrev, value|
-        next unless abbrev&.start_with?(text)
-
-        list << value
-      end
-
-      list.uniq
-    end
-
-    def stdin(string)
-      @history.text += "\n#{string}"
-      update_history_y
-    end
-
-    def focus
-      @active_text_input = window.text_input
-      window.text_input = @text_input
-
-      @showing_cursor = window.needs_cursor
-      window.needs_cursor = true
-
-      @show_caret = true
-      @caret_last_change = Gosu.milliseconds
-    end
-
-    def blur
-      window.text_input  = @active_text_input
-      window.needs_cursor = @showing_cursor
-    end
-  end
-end

lib/cyberarm_engine/console/command.rb

@@ -1,158 +0,0 @@
-# frozen_string_literal: true
-
-module CyberarmEngine
-  class Console
-    module Style
-      def self.error(string)
-        "<c=ff5555>#{string}</c>"
-      end
-
-      def self.warn(string)
-        "<c=ff7700>#{string}</c>"
-      end
-
-      def self.notice(string)
-        "<c=55ff55>#{string}</c>"
-      end
-
-      def self.highlight(string, color = "5555ff")
-        "<c=#{color}>#{string}</c>"
-      end
-    end
-
-    class Command
-      def self.inherited(subclass)
-        @list ||= []
-        @commands ||= []
-        @list << subclass
-      end
-
-      def self.setup
-        @list ||= []
-        @commands = []
-        @list.each do |subclass|
-          cmd = subclass.new
-          if @commands.detect { |c| c.command == cmd.command }
-            raise "Command '#{cmd.command}' from '#{cmd.class}' already exists!"
-          end
-
-          @commands << cmd
-        end
-      end
-
-      def self.use(command, arguments, console)
-        found_command = @commands.detect { |cmd| cmd.command == command.to_sym }
-
-        if found_command
-          found_command.handle(arguments, console)
-        else
-          console.stdin("Command #{Style.error(command)} not found.")
-        end
-      end
-
-      def self.find(command)
-        @commands.detect { |cmd| cmd.command == command.to_sym }
-      end
-
-      def self.list_commands
-        @commands
-      end
-
-      def initialize
-        @store = {}
-        @subcommands = []
-
-        setup
-      end
-
-      def setup
-      end
-
-      def subcommand(command, type)
-        if @subcommands.detect { |subcmd| subcmd.command == command.to_sym }
-          raise "Subcommand '#{command}' for '#{self.command}' already exists!"
-        end
-
-        @subcommands << SubCommand.new(self, command, type)
-      end
-
-      def get(key)
-        @store[key]
-      end
-
-      def set(key, value)
-        @store[key] = value
-      end
-
-      def group
-        raise NotImplementedError
-      end
-
-      def command
-        raise NotImplementedError
-      end
-
-      def handle(arguments, console)
-        raise NotImplementedError
-      end
-
-      def autocomplete(console)
-        split = console.text_input.text.split(" ")
-
-        if @subcommands.size.positive?
-          if !console.text_input.text.end_with?(" ") && split.size == 2
-            list = console.abbrev_search(@subcommands.map { |cmd| cmd.command.to_s }, split.last)
-
-            if list.size == 1
-              console.text_input.text = "#{split.first} #{list.first} "
-            else
-              return unless list.size.positive?
-
-              console.stdin(list.map { |cmd| Console::Style.highlight(cmd) }.join(", ").to_s)
-            end
-
-          # List available options on subcommand
-          elsif (console.text_input.text.end_with?(" ") && split.size == 2) || !console.text_input.text.end_with?(" ") && split.size == 3
-            subcommand = @subcommands.detect { |cmd| cmd.command.to_s == (split[1]) }
-
-            if subcommand
-              if split.size == 2
-                console.stdin("Available options: #{subcommand.values.map { |value| Console::Style.highlight(value) }.join(',')}")
-              else
-                list = console.abbrev_search(subcommand.values, split.last)
-                if list.size == 1
-                  console.text_input.text = "#{split.first} #{split[1]} #{list.first} "
-                elsif list.size.positive?
-                  console.stdin("Available options: #{list.map { |value| Console::Style.highlight(value) }.join(',')}")
-                end
-              end
-            end
-
-          # List available subcommands if command was entered and has only a space after it
-          elsif console.text_input.text.end_with?(" ") && split.size == 1
-            console.stdin("Available subcommands: #{@subcommands.map { |cmd| Console::Style.highlight(cmd.command) }.join(', ')}")
-          end
-        end
-      end
-
-      def handle_subcommand(arguments, console)
-        if arguments.size.zero?
-          console.stdin(usage)
-          return
-        end
-        subcommand = arguments.delete_at(0)
-
-        found_command = @subcommands.detect { |cmd| cmd.command == subcommand.to_sym }
-        if found_command
-          found_command.handle(arguments, console)
-        else
-          console.stdin("Unknown subcommand #{Style.error(subcommand)} for #{Style.highlight(command)}")
-        end
-      end
-
-      def usage
-        raise NotImplementedError
-      end
-    end
-  end
-end

lib/cyberarm_engine/console/commands/help_command.rb

@@ -1,43 +0,0 @@
-# frozen_string_literal: true
-
-module CyberarmEngine
-  class Console
-    class HelpCommand < CyberarmEngine::Console::Command
-      def group
-        :global
-      end
-
-      def command
-        :help
-      end
-
-      def handle(arguments, console)
-        console.stdin(usage(arguments.first))
-      end
-
-      def autocomplete(console)
-        split = console.text_input.text.split(" ")
-        if !console.text_input.text.start_with?(" ") && split.size == 2
-          list = console.abbrev_search(Command.list_commands.map { |cmd| cmd.command.to_s }, split.last)
-          if list.size == 1
-            console.text_input.text = "#{split.first} #{list.first} "
-          elsif list.size > 1
-            console.stdin(list.map { |cmd| Style.highlight(cmd) }.join(", "))
-          end
-        end
-      end
-
-      def usage(command = nil)
-        if command
-          if cmd = Command.find(command)
-            cmd.usage
-          else
-            "#{Style.error(command)} is not a command"
-          end
-        else
-          "Available commands:\n#{Command.list_commands.map { |cmd| Style.highlight(cmd.command).to_s }.join(', ')}"
-        end
-      end
-    end
-  end
-end

lib/cyberarm_engine/console/subcommand.rb

@@ -1,100 +0,0 @@
-# frozen_string_literal: true
-
-module CyberarmEngine
-  class Console
-    class Command
-      class SubCommand
-        def initialize(parent, command, type)
-          @parent = parent
-          @command = command
-          @type = type
-        end
-
-        attr_reader :command
-
-        def handle(arguments, console)
-          if arguments.size > 1
-            console.stdin("to many arguments for #{Style.highlight(command.to_s)}, got #{Style.error(arguments.size)} expected #{Style.notice(1)}.")
-            return
-          end
-
-          case @type
-          when :boolean
-            case arguments.last
-            when "", nil
-              var = @parent.get(command.to_sym) || false
-              console.stdin("#{command}: #{Style.highlight(var)}")
-            when "on"
-              var = @parent.set(command.to_sym, true)
-              console.stdin("#{command} => #{Style.highlight(var)}")
-            when "off"
-              var = @parent.set(command.to_sym, false)
-              console.stdin("#{command} => #{Style.highlight(var)}")
-            else
-              console.stdin("Invalid argument for #{Style.highlight(command.to_s)}, got #{Style.error(arguments.last)} expected #{Style.notice('on')}, or #{Style.notice('off')}.")
-            end
-          when :string
-            case arguments.last
-            when "", nil
-              var = @parent.get(command.to_sym) || "\"\""
-              console.stdin("#{command}: #{Style.highlight(var)}")
-            else
-              var = @parent.set(command.to_sym, arguments.last)
-              console.stdin("#{command} => #{Style.highlight(var)}")
-            end
-          when :integer
-            case arguments.last
-            when "", nil
-              var = @parent.get(command.to_sym) || "nil"
-              console.stdin("#{command}: #{Style.highlight(var)}")
-            else
-              begin
-                var = @parent.set(command.to_sym, Integer(arguments.last))
-                console.stdin("#{command} => #{Style.highlight(var)}")
-              rescue ArgumentError
-                console.stdin("Error: #{Style.error("Expected an integer, got '#{arguments.last}'")}")
-              end
-            end
-          when :decimal
-            case arguments.last
-            when "", nil
-              var = @parent.get(command.to_sym) || "nil"
-              console.stdin("#{command}: #{Style.highlight(var)}")
-            else
-              begin
-                var = @parent.set(command.to_sym, Float(arguments.last))
-                console.stdin("#{command} => #{Style.highlight(var)}")
-              rescue ArgumentError
-                console.stdin("Error: #{Style.error("Expected a decimal or integer, got '#{arguments.last}'")}")
-              end
-            end
-          else
-            raise RuntimeError
-          end
-        end
-
-        def values
-          case @type
-          when :boolean
-            %w[on off]
-          else
-            []
-          end
-        end
-
-        def usage
-          case @type
-          when :boolean
-            "#{Style.highlight(command)} #{Style.notice('[on|off]')}"
-          when :string
-            "#{Style.highlight(command)} #{Style.notice('[string]')}"
-          when :integer
-            "#{Style.highlight(command)} #{Style.notice('[0]')}"
-          when :decimal
-            "#{Style.highlight(command)} #{Style.notice('[0.0]')}"
-          end
-        end
-      end
-    end
-  end
-end

lib/cyberarm_engine/game_object.rb

@@ -7,7 +7,7 @@ module CyberarmEngine
     attr_reader :alpha
 
     def initialize(options = {})
-      window.current_state.add_game_object(self) if options[:auto_manage] || options[:auto_manage].nil?
+      $window.current_state.add_game_object(self) if options[:auto_manage] || options[:auto_manage].nil?
 
       @options = options
       @image = options[:image] ? image(options[:image]) : nil
@@ -55,9 +55,9 @@ module CyberarmEngine
 
       if $debug
         show_debug_heading
-        Gosu.draw_circle(@position.x, @position.y, radius, 9999, @debug_color)
+        $window.draw_circle(@position.x, @position.y, radius, 9999, @debug_color)
         if @debug_text.text != ""
-          Gosu.draw_rect(@debug_text.x - 10, (@debug_text.y - 10), @debug_text.width + 20, @debug_text.height + 20,
+          $window.draw_rect(@debug_text.x - 10, (@debug_text.y - 10), @debug_text.width + 20, @debug_text.height + 20,
                             Gosu::Color.rgba(0, 0, 0, 200), 9999)
           @debug_text.draw
         end
@@ -102,13 +102,13 @@ module CyberarmEngine
     end
 
     def _x_visible
-      x.between?((window.width / 2) - @world_center_point.x, (window.width / 2) + @world_center_point.x) ||
-        x.between?((@world_center_point.x - window.width / 2), (window.width / 2) + @world_center_point.x)
+      x.between?(($window.width / 2) - @world_center_point.x, ($window.width / 2) + @world_center_point.x) ||
+        x.between?((@world_center_point.x - $window.width / 2), ($window.width / 2) + @world_center_point.x)
     end
 
     def _y_visible
-      y.between?((window.height / 2) - @world_center_point.y, (window.height / 2) + @world_center_point.y) ||
-        y.between?(@world_center_point.y - (window.height / 2), (window.height / 2) + @world_center_point.y)
+      y.between?(($window.height / 2) - @world_center_point.y, ($window.height / 2) + @world_center_point.y) ||
+        y.between?(@world_center_point.y - ($window.height / 2), ($window.height / 2) + @world_center_point.y)
     end
 
     def heading(ahead_by = 100, _object = nil, angle_only = false)
@@ -153,6 +153,10 @@ module CyberarmEngine
       @color = Gosu::Color.rgba(@color.red, @color.green, @color.blue, int)
     end
 
+    def draw_rect(x, y, width, height, color, z = 0)
+      $window.draw_rect(x, y, width, height, color, z)
+    end
+
     def button_up(id)
     end
 
@@ -186,12 +190,12 @@ module CyberarmEngine
     # Duplication... so DRY.
     def each_circle_collision(object, _resolve_with = :width, &block)
       if object.class != Class && object.instance_of?(object.class)
-        window.current_state.game_objects.select { |i| i.instance_of?(object.class) }.each do |o|
+        $window.current_state.game_objects.select { |i| i.instance_of?(object.class) }.each do |o|
           distance = Gosu.distance(x, y, object.x, object.y)
           block.call(o, object) if distance <= radius + object.radius && block
         end
       else
-        list = window.current_state.game_objects.select { |i| i.instance_of?(object) }
+        list = $window.current_state.game_objects.select { |i| i.instance_of?(object) }
         list.each do |o|
           next if self == o
 
@@ -202,9 +206,9 @@ module CyberarmEngine
     end
 
     def destroy
-      if window.current_state
-        window.current_state.game_objects.each do |o|
-          window.current_state.game_objects.delete(o) if o.is_a?(self.class) && o == self
+      if $window.current_state
+        $window.current_state.game_objects.each do |o|
+          $window.current_state.game_objects.delete(o) if o.is_a?(self.class) && o == self
         end
       end
     end
@@ -216,13 +220,13 @@ module CyberarmEngine
 
     def self.each_circle_collision(object, _resolve_with = :width, &block)
       if object.class != Class && object.instance_of?(object.class)
-        window.current_state.game_objects.select { |i| i.instance_of?(self) }.each do |o|
+        $window.current_state.game_objects.select { |i| i.instance_of?(self) }.each do |o|
           distance = Gosu.distance(o.x, o.y, object.x, object.y)
           block.call(o, object) if distance <= o.radius + object.radius && block
         end
       else
-        lista = window.current_state.game_objects.select { |i| i.instance_of?(self) }
-        listb = window.current_state.game_objects.select { |i| i.instance_of?(object) }
+        lista = $window.current_state.game_objects.select { |i| i.instance_of?(self) }
+        listb = $window.current_state.game_objects.select { |i| i.instance_of?(object) }
         lista.product(listb).each do |o, o2|
           next if o == o2
 
@@ -234,9 +238,9 @@ module CyberarmEngine
 
     def self.destroy_all
       INSTANCES.clear
-      if window.current_state
-        window.current_state.game_objects.each do |o|
-          window.current_state.game_objects.delete(o) if o.is_a?(self.class)
+      if $window.current_state
+        $window.current_state.game_objects.each do |o|
+          $window.current_state.game_objects.delete(o) if o.is_a?(self.class)
         end
       end
     end

lib/cyberarm_engine/game_state.rb

@@ -9,7 +9,7 @@ module CyberarmEngine
       @options = options
       @game_objects = []
       @global_pause = false
-      window.text_input = nil unless options[:preserve_text_input]
+      $window.text_input = nil unless options[:preserve_text_input]
 
       @down_keys = {}
     end
@@ -30,23 +30,48 @@ module CyberarmEngine
       @game_objects.each(&:update)
     end
 
-    def needs_redraw?
-      true
+    def draw_bounding_box(box)
+      x = box.x
+      y = box.y
+      max_x = box.max_x
+      max_y = box.max_y
+
+      color = Gosu::Color.rgba(255, 127, 64, 240)
+
+      # pipe = 4
+      # Gosu.draw_rect(x-width, y-height, x+(width*2), y+(height*2), color, Float::INFINITY)
+      # puts "BB render: #{x}:#{y} w:#{x.abs+width} h:#{y.abs+height}"
+      # Gosu.draw_rect(x, y, x.abs+width, y.abs+height, color, Float::INFINITY)
+
+      # TOP LEFT to BOTTOM LEFT
+      $window.draw_line(
+        x, y, color,
+        x, max_y, color,
+        Float::INFINITY
+      )
+      # BOTTOM LEFT to BOTTOM RIGHT
+      $window.draw_line(
+        x, max_y, color,
+        max_x, max_y, color,
+        Float::INFINITY
+      )
+      # BOTTOM RIGHT to TOP RIGHT
+      $window.draw_line(
+        max_x, max_y, color,
+        max_x, y, color,
+        Float::INFINITY
+      )
+      # TOP RIGHT to TOP LEFT
+      $window.draw_line(
+        max_x, y, color,
+        x, y, color,
+        Float::INFINITY
+      )
     end
 
-    def drop(filename)
-    end
-
-    def gamepad_connected(index)
-    end
-
-    def gamepad_disconnected(index)
-    end
-
-    def gain_focus
-    end
-
-    def lose_focus
+    def destroy
+      @options.clear
+      @game_objects.clear
     end
 
     def button_down(id)
@@ -65,54 +90,6 @@ module CyberarmEngine
       end
     end
 
-    def close
-      window.close!
-    end
-
-    def draw_bounding_box(box)
-      x = box.x
-      y = box.y
-      max_x = box.max_x
-      max_y = box.max_y
-
-      color = Gosu::Color.rgba(255, 127, 64, 240)
-
-      # pipe = 4
-      # Gosu.draw_rect(x-width, y-height, x+(width*2), y+(height*2), color, Float::INFINITY)
-      # puts "BB render: #{x}:#{y} w:#{x.abs+width} h:#{y.abs+height}"
-      # Gosu.draw_rect(x, y, x.abs+width, y.abs+height, color, Float::INFINITY)
-
-      # TOP LEFT to BOTTOM LEFT
-      Gosu.draw_line(
-        x, y, color,
-        x, max_y, color,
-        Float::INFINITY
-      )
-      # BOTTOM LEFT to BOTTOM RIGHT
-      Gosu.draw_line(
-        x, max_y, color,
-        max_x, max_y, color,
-        Float::INFINITY
-      )
-      # BOTTOM RIGHT to TOP RIGHT
-      Gosu.draw_line(
-        max_x, max_y, color,
-        max_x, y, color,
-        Float::INFINITY
-      )
-      # TOP RIGHT to TOP LEFT
-      Gosu.draw_line(
-        max_x, y, color,
-        x, y, color,
-        Float::INFINITY
-      )
-    end
-
-    def destroy
-      @options.clear
-      @game_objects.clear
-    end
-
     def add_game_object(object)
       @game_objects << object
     end

lib/cyberarm_engine/model.rb

@@ -3,8 +3,7 @@ module CyberarmEngine
     attr_accessor :objects, :materials, :vertices, :uvs, :texures, :normals, :faces, :colors, :bones, :material_file,
                   :current_material, :current_object, :vertex_count, :smoothing
     attr_reader :position, :bounding_box, :textured_material, :file_path, :positions_buffer_id, :colors_buffer_id,
-                :normals_buffer_id, :uvs_buffer_id, :textures_buffer_id, :vertex_array_id, :aabb_tree,
-                :vertices_count
+                :normals_buffer_id, :uvs_buffer_id, :textures_buffer_id, :vertex_array_id, :aabb_tree
 
     def initialize(file_path:)
       @file_path = file_path
@@ -24,8 +23,6 @@ module CyberarmEngine
       @bones    = []
       @smoothing = 0
 
-      @vertices_count = 0
-
       @bounding_box = BoundingBox.new
       start_time = Process.clock_gettime(Process::CLOCK_MONOTONIC, :float_millisecond)
 
@@ -35,8 +32,6 @@ module CyberarmEngine
 
       parse(parser)
 
-      @vertices_count = @vertices.size
-
       @has_texture = false
 
       @materials.each do |_key, material|

lib/cyberarm_engine/opengl/perspective_camera.rb

@@ -3,8 +3,8 @@ module CyberarmEngine
     attr_accessor :position, :orientation, :aspect_ratio, :field_of_view,
                   :min_view_distance, :max_view_distance
 
-    def initialize(position:, aspect_ratio:, orientation: Vector.new(0, 0, 0),
-                   field_of_view: 70.0, min_view_distance: 0.1, max_view_distance: 1024.0)
+    def initialize(position:, aspect_ratio:, orientation: Vector.new(0, 0,
+                                                                     0), field_of_view: 70.0, min_view_distance: 0.1, max_view_distance: 155.0)
       @position = position
       @orientation = orientation
 

lib/cyberarm_engine/opengl/renderer/opengl_renderer.rb

@@ -3,15 +3,12 @@ module CyberarmEngine
     @@immediate_mode_warning = false
 
     attr_accessor :show_wireframe
-    attr_reader :number_of_vertices
 
     def initialize(width:, height:, show_wireframe: false)
       @width = width
       @height = height
       @show_wireframe = show_wireframe
 
-      @number_of_vertices = 0
-
       @g_buffer = GBuffer.new(width: @width, height: @height)
     end
 
@@ -23,8 +20,6 @@ module CyberarmEngine
     end
 
     def render(camera, lights, entities)
-      @number_of_vertices = 0
-
       glViewport(0, 0, @width, @height)
       glEnable(GL_DEPTH_TEST)
 
@@ -49,8 +44,6 @@ module CyberarmEngine
             gl_error?
             draw_model(entity.model, shader)
             entity.draw
-
-            @number_of_vertices += entity.model.vertices_count
           end
         end
 
@@ -97,8 +90,6 @@ module CyberarmEngine
           draw_mesh(entity.model)
           entity.draw
           glPopMatrix
-
-          @number_of_vertices += entity.model.vertices_count
         end
       end
 

lib/cyberarm_engine/opengl/renderer/renderer.rb

@@ -4,7 +4,7 @@ module CyberarmEngine
 
     def initialize
       @bounding_box_renderer = BoundingBoxRenderer.new
-      @opengl_renderer = OpenGLRenderer.new(width: CyberarmEngine::Window.instance.width, height: CyberarmEngine::Window.instance.height)
+      @opengl_renderer = OpenGLRenderer.new(width: $window.width, height: $window.height)
     end
 
     def draw(camera, lights, entities)

lib/cyberarm_engine/text.rb

@@ -3,9 +3,7 @@ module CyberarmEngine
     CACHE = {}
 
     attr_accessor :x, :y, :z, :size, :options
-    attr_reader :text, :textobject, :factor_x, :factor_y, :color,
-                :border, :border_size, :border_alpha, :border_color,
-                :shadow, :shadow_size, :shadow_alpha, :shadow_color
+    attr_reader :text, :textobject, :factor_x, :factor_y, :color, :shadow, :shadow_size, :shadow_alpha, :shadow_color
 
     def initialize(text, options = {})
       @text = text.to_s || ""
@@ -17,27 +15,16 @@ module CyberarmEngine
       @z = options[:z] || 1025
       @factor_x = options[:factor_x]  || 1
       @factor_y = options[:factor_y]  || 1
-      if options[:color]
-        @color = options[:color].is_a?(Gosu::Color) ? options[:color] : Gosu::Color.new(options[:color])
-      else
-        @color = Gosu::Color::WHITE
-      end
-      @mode      = options[:mode]      || :default
+      @color    = options[:color]     || Gosu::Color::WHITE
+      @mode     = options[:mode]      || :default
       @alignment = options[:alignment] || nil
-
-      @border   = options[:border]
-      @border   = true if options[:border].nil?
-      @border_size = options[:border_size] || 1
-      @border_alpha = options[:border_alpha] || 30
-      @border_color = options[:border_color] || Gosu::Color::BLACK
-
-      @shadow = options[:shadow]
-      @shadow_size = options[:shadow_size] || 2
+      @shadow   = true  if options[:shadow] == true
+      @shadow   = false if options[:shadow] == false
+      @shadow   = true if options[:shadow].nil?
+      @shadow_size = options[:shadow_size] || 1
       @shadow_alpha = options[:shadow_alpha] || 30
-      @shadow_color = options[:shadow_color] || Gosu::Color::BLACK
-
-      @static = options[:static] || (options[:static].nil? || options[:static] == false ? false : true)
-
+      @shadow_alpha = options[:shadow_alpha] || 30
+      @shadow_color = options[:shadow_color]
       @textobject = check_cache(@size, @font)
 
       if @alignment
@@ -45,11 +32,13 @@ module CyberarmEngine
         when :left
           @x = 0 + BUTTON_PADDING
         when :center
-          @x = (CyberarmEngine::Window.instance.width / 2) - (@textobject.text_width(@text) / 2)
+          @x = ($window.width / 2) - (@textobject.text_width(@text) / 2)
         when :right
-          @x = CyberarmEngine::Window.instance.width - BUTTON_PADDING - @textobject.text_width(@text)
+          @x = $window.width - BUTTON_PADDING - @textobject.text_width(@text)
         end
       end
+
+      self
     end
 
     def check_cache(size, font_name)
@@ -86,155 +75,85 @@ module CyberarmEngine
     end
 
     def text=(string)
-      invalidate_cache! if @text != string
+      @rendered_shadow = nil
       @text = string
     end
 
     def factor_x=(n)
-      invalidate_cache! if @factor_x != n
+      @rendered_shadow = nil
       @factor_x = n
     end
 
     def factor_y=(n)
-      invalidate_cache! if @factor_y != n
+      @rendered_shadow = nil
       @factor_y = n
     end
 
     def color=(color)
-      old_color = @color
-
-      if color
-        @color = color.is_a?(Gosu::Color) ? color : Gosu::Color.new(color)
-      else
-        raise "color cannot be nil"
-      end
-
-      invalidate_cache! if old_color != color
+      @rendered_shadow = nil
+      @color = color
     end
 
-    def border=(boolean)
-      invalidate_cache! if @border != boolean
-      @border = boolean
+    def shadow=(boolean)
+      @rendered_shadow = nil
+      @shadow = boolean
     end
 
-    def border_size=(n)
-      invalidate_cache! if @border_size != n
-      @border_size = n
+    def shadow_size=(n)
+      @rendered_shadow = nil
+      @shadow_size = n
     end
 
-    def border_alpha=(n)
-      invalidate_cache! if @border_alpha != n
-      @border_alpha = n
+    def shadow_alpha=(n)
+      @rendered_shadow = nil
+      @shadow_alpha = n
     end
 
-    def border_color=(n)
-      invalidate_cache! if @border_color != n
-      @border_color = n
+    def shadow_color=(n)
+      @rendered_shadow = nil
+      @shadow_color = n
     end
 
     def width(text = @text)
-      markup_width(text)
-    end
-
-    def text_width(text = @text)
-      spacing = 0
-      spacing += @border_size if @border
-      spacing += @shadow_size if @shadow
-
-      if text == @text && @static && @gosu_cached_text_image
-        @gosu_cached_text_image&.width + spacing
-      else
-        textobject.text_width(text) + spacing
-      end
+      textobject.text_width(text)
     end
 
     def markup_width(text = @text)
-      spacing = 0
-      spacing += @border_size if @border
-      spacing += @shadow_size if @shadow
-
-      if text == @text && @static && @gosu_cached_text_image
-        @gosu_cached_text_image&.width + spacing
-      else
-        textobject.markup_width(text) + spacing
-      end
+      textobject.markup_width(text)
     end
 
     def height(text = @text)
-      if text.lines.count > 0
-        text.lines.count * textobject.height + @border_size + @shadow_size
-      else
-        @textobject.height + @border_size + @shadow_size
-      end
+      text.lines.count > 0 ? text.lines.count * textobject.height : @textobject.height
     end
 
     def draw(method = :draw_markup)
-      if @static
-        if @border && !@cached_text_border_image
-          _x = @border_size
-          _y = @border_size
-          _width = method == :draw_markup ? text_width : markup_width
-          img = Gosu::Image.send(:"from_#{method.to_s.split("_").last}", @text, @size, font: @font)
+      if @shadow && !ARGV.join.include?("--no-shadow")
+        shadow_alpha = @color.alpha <= 30 ? @color.alpha : @shadow_alpha
+        shadow_color = @shadow_color || Gosu::Color.rgba(@color.red, @color.green, @color.blue,
+                                                         shadow_alpha)
+        white = Gosu::Color::WHITE
 
-          @cached_text_border_image = Gosu.render((_width + (@border_size * 2)).ceil, (height + (@border_size * 2)).ceil) do
-            img.draw(-_x, 0, @z, @factor_x, @factor_y, @border_color, @mode)
-            img.draw(-_x, -_y, @z, @factor_x, @factor_y, @border_color, @mode)
+        _x = @shadow_size
+        _y = @shadow_size
 
-            img.draw(0, -_y, @z, @factor_x, @factor_y, @border_color, @mode)
-            img.draw(_x, -_y, @z, @factor_x, @factor_y, @border_color, @mode)
+        @rendered_shadow ||= Gosu.render((width + (shadow_size * 2)).ceil, (height + (@shadow_size * 2)).ceil) do
+          @textobject.send(method, @text, _x - @shadow_size, _y, @z, @factor_x, @factor_y, white, :add)
+          @textobject.send(method, @text, _x - @shadow_size, _y - @shadow_size, @z, @factor_x, @factor_y, white, :add)
 
-            img.draw(_x, 0, @z, @factor_x, @factor_y, @border_color, @mode)
-            img.draw(_x, _y, @z, @factor_x, @factor_y, @border_color, @mode)
+          @textobject.send(method, @text, _x, _y - @shadow_size, @z, @factor_x, @factor_y, white, :add)
+          @textobject.send(method, @text, _x + @shadow_size, _y - @shadow_size, @z, @factor_x, @factor_y, white, :add)
 
-            img.draw(0, _y, @z, @factor_x, @factor_y, @border_color, @mode)
-            img.draw(-_x, _y, @z, @factor_x, @factor_y, @border_color, @mode)
-          end
+          @textobject.send(method, @text, _x, _y + @shadow_size, @z, @factor_x, @factor_y, white, :add)
+          @textobject.send(method, @text, _x - @shadow_size, _y + @shadow_size, @z, @factor_x, @factor_y, white, :add)
+
+          @textobject.send(method, @text, _x + @shadow_size, _y, @z, @factor_x, @factor_y, white, :add)
+          @textobject.send(method, @text, _x + @shadow_size, _y + @shadow_size, @z, @factor_x, @factor_y, white, :add)
         end
 
-        @cached_text_shadow_image ||= Gosu::Image.send(:"from_#{method.to_s.split("_").last}", @text, @size, font: @font) if @shadow
-
-        @gosu_cached_text_image ||= Gosu::Image.send(:"from_#{method.to_s.split("_").last}", @text, @size, font: @font)
-
-        @cached_text_border_image.draw(@x, @y, @z, @factor_x, @factor_y, @border_color, @mode) if @border
-
-        @cached_text_shadow_image.draw(@x + @shadow_size, @y + @shadow_size, @z, @factor_x, @factor_y, @shadow_color, @mode) if @shadow
-
-        @gosu_cached_text_image.draw(@x, @y, @z, @factor_x, @factor_y, @color, @mode)
-      else
-        if @border && !ARGV.join.include?("--no-border")
-          border_alpha = @color.alpha <= 30 ? @color.alpha : @border_alpha
-          border_color = @border_color || Gosu::Color.rgba(@color.red, @color.green, @color.blue,
-                                                          border_alpha)
-          white = Gosu::Color::WHITE
-
-          _x = @border_size
-          _y = @border_size
-          _width = method == :draw_markup ? text_width : markup_width
-
-          @cached_text_border_image ||= Gosu.render((_width + (border_size * 2)).ceil, (height + (@border_size * 2)).ceil) do
-            @textobject.send(method, @text, _x - @border_size, _y, @z, @factor_x, @factor_y, white, @mode)
-            @textobject.send(method, @text, _x - @border_size, _y - @border_size, @z, @factor_x, @factor_y, white, @mode)
-
-            @textobject.send(method, @text, _x, _y - @border_size, @z, @factor_x, @factor_y, white, @mode)
-            @textobject.send(method, @text, _x + @border_size, _y - @border_size, @z, @factor_x, @factor_y, white, @mode)
-
-            @textobject.send(method, @text, _x, _y + @border_size, @z, @factor_x, @factor_y, white, @mode)
-            @textobject.send(method, @text, _x - @border_size, _y + @border_size, @z, @factor_x, @factor_y, white, @mode)
-
-            @textobject.send(method, @text, _x + @border_size, _y, @z, @factor_x, @factor_y, white, @mode)
-            @textobject.send(method, @text, _x + @border_size, _y + @border_size, @z, @factor_x, @factor_y, white, @mode)
-          end
-
-          @cached_text_border_image.draw(@x - @border_size, @y - @border_size, @z, @factor_x, @factor_y, border_color)
-        end
-
-        if @shadow
-          shadow_color = @shadow_color || Gosu::Color.rgba(@color.red, @color.green, @color.blue, @shadow_alpha)
-          @textobject.send(method, @text, @x + @shadow_size, @y + @shadow_size, @z, @factor_x, @factor_y, shadow_color, @mode)
-        end
-
-        @textobject.send(method, @text, @x, @y, @z, @factor_x, @factor_y, @color, @mode)
+        @rendered_shadow.draw(@x - @shadow_size, @y - @shadow_size, @z, @factor_x, @factor_y, shadow_color)
       end
+
+      @textobject.send(method, @text, @x, @y, @z, @factor_x, @factor_y, @color, @mode)
     end
 
     def alpha=(n)
@@ -247,11 +166,5 @@ module CyberarmEngine
 
     def update
     end
-
-    def invalidate_cache!
-      @cached_text_border_image = nil
-      @cached_text_shadow_image = nil
-      @gosu_cached_text_image = nil
-    end
   end
 end

lib/cyberarm_engine/ui/dsl.rb

@@ -116,7 +116,7 @@ module CyberarmEngine
     end
 
     private def element_parent
-      CyberarmEngine::Element::Container.current_container
+      $__current_container__
     end
 
     private def container(klass, options = {}, &block)
@@ -126,12 +126,12 @@ module CyberarmEngine
       _container = klass.new(options, block)
 
       old_parent = element_parent
-      CyberarmEngine::Element::Container.current_container = _container
+      $__current_container__ = _container
 
       _container.build
       _container.parent.add(_container)
 
-      CyberarmEngine::Element::Container.current_container = old_parent
+      $__current_container__ = old_parent
 
       _container
     end

lib/cyberarm_engine/ui/element.rb

@@ -4,7 +4,7 @@ module CyberarmEngine
     include Event
     include Common
 
-    attr_accessor :x, :y, :z, :tip, :element_visible
+    attr_accessor :x, :y, :z, :enabled, :tip
     attr_reader :parent, :options, :style, :event_handler, :background_canvas, :border_canvas
 
     def initialize(options = {}, block = nil)
@@ -13,9 +13,9 @@ module CyberarmEngine
       @options = options
       @block = block
 
-      @focus   = !@options.key?(:focus)   ? false : @options[:focus]
-      @enabled = !@options.key?(:enabled) ? true  : @options[:enabled]
-      @visible = !@options.key?(:visible) ? true  : @options[:visible]
+      @focus   = @options[:focus].nil?   ? false : @options[:focus]
+      @enabled = @options[:enabled].nil? ? true  : @options[:enabled]
+      @visible = @options[:visible].nil? ? true  : @options[:visible]
       @tip     = @options[:tip] || ""
 
       @debug_color = @options[:debug_color].nil? ? Gosu::Color::RED : @options[:debug_color]
@@ -24,7 +24,6 @@ module CyberarmEngine
 
       @root ||= nil
       @gui_state ||= nil
-      @element_visible = true
 
       @x = @style.x
       @y = @style.y
@@ -37,9 +36,7 @@ module CyberarmEngine
       @style.height = default(:height) || nil
 
       @style.background_canvas = Background.new
-      @style.background_nine_slice_canvas = BackgroundNineSlice.new
-      @style.background_image_canvas = BackgroundImage.new
-      @style.border_canvas = BorderCanvas.new(element: self)
+      @style.border_canvas     = BorderCanvas.new(element: self)
 
       @style_event = :default
 
@@ -53,15 +50,10 @@ module CyberarmEngine
     def stylize
       set_static_position
 
-      set_color
-      set_font
-
       set_padding
       set_margin
 
       set_background
-      set_background_nine_slice
-      set_background_image
 
       set_border_thickness
       set_border_color
@@ -76,44 +68,12 @@ module CyberarmEngine
       @y = @style.y if @style.y != 0
     end
 
-    def set_color
-      @style.color = safe_style_fetch(:color)
-      @text&.color = @style.color
-    end
-
-    def set_font
-      @text&.swap_font(safe_style_fetch(:text_size), safe_style_fetch(:font))
-    end
-
     def set_background
       @style.background = safe_style_fetch(:background)
 
       @style.background_canvas.background = @style.background
     end
 
-    def set_background_nine_slice
-      @style.background_nine_slice = safe_style_fetch(:background_nine_slice)
-
-      @style.background_nine_slice_mode = safe_style_fetch(:background_nine_slice_mode) || :stretch
-      @style.background_nine_slice_color = safe_style_fetch(:background_nine_slice_color) || Gosu::Color::WHITE
-      @style.background_nine_slice_canvas.color = @style.background_nine_slice_color
-
-      @style.background_nine_slice_from_edge = safe_style_fetch(:background_nine_slice_from_edge)
-
-      @style.background_nine_slice_left      = safe_style_fetch(:background_nine_slice_left)   || @style.background_nine_slice_from_edge
-      @style.background_nine_slice_top       = safe_style_fetch(:background_nine_slice_top)    || @style.background_nine_slice_from_edge
-      @style.background_nine_slice_right     = safe_style_fetch(:background_nine_slice_right)  || @style.background_nine_slice_from_edge
-      @style.background_nine_slice_bottom    = safe_style_fetch(:background_nine_slice_bottom) || @style.background_nine_slice_from_edge
-    end
-
-    def set_background_image
-      @style.background_image = safe_style_fetch(:background_image)
-      @style.background_image_mode = safe_style_fetch(:background_image_mode) || :stretch
-      @style.background_image_color = safe_style_fetch(:background_image_color) || Gosu::Color::WHITE
-      @style.background_image_canvas.mode = @style.background_image_mode
-      @style.background_image_canvas.color = @style.background_image_color
-    end
-
     def set_border_thickness
       @style.border_thickness = safe_style_fetch(:border_thickness)
 
@@ -158,18 +118,15 @@ module CyberarmEngine
     end
 
     def update_styles(event = :default)
-      old_width = width
-      old_height = height
-
+      _style = @style.send(event)
       @style_event = event
 
-      return if self.is_a?(ToolTip)
-
-      if old_width != width || old_height != height
-        (root&.gui_state || @gui_state).request_recalculate
-      else
-        stylize
+      if @text.is_a?(CyberarmEngine::Text)
+        @text.color = _style&.dig(:color) || @style.default[:color]
+        @text.swap_font(_style&.dig(:text_size) || @style.default[:text_size], _style&.dig(:font) || @style.default[:font])
       end
+
+      (root&.gui_state || @gui_state).request_recalculate
     end
 
     def default_events
@@ -255,14 +212,6 @@ module CyberarmEngine
       :handled
     end
 
-    def enabled=(boolean)
-      @enabled = boolean
-
-      recalculate
-
-      @enabled
-    end
-
     def enabled?
       @enabled
     end
@@ -271,10 +220,6 @@ module CyberarmEngine
       @visible
     end
 
-    def element_visible?
-      @element_visible
-    end
-
     def toggle
       @visible = !@visible
       root.gui_state.request_recalculate
@@ -294,14 +239,13 @@ module CyberarmEngine
 
     def draw
       return unless visible?
-      return unless element_visible?
 
       @style.background_canvas.draw
-      @style.background_nine_slice_canvas.draw
-      @style.background_image_canvas.draw
       @style.border_canvas.draw
 
-      render
+      Gosu.clip_to(@x, @y, width, height) do
+        render
+      end
     end
 
     def debug_draw
@@ -399,83 +343,31 @@ module CyberarmEngine
     end
 
     def scroll_width
-      @children.sum(&:outer_width)
+      @children.sum { |c| c.width } + noncontent_width
     end
 
     def scroll_height
-      if is_a?(CyberarmEngine::Element::Flow)
-        return 0 if @children.size.zero?
-
-        pairs_ = []
-        sorted_children_ = @children.sort_by(&:y)
-        a_ = []
-        y_position_ = sorted_children_.first.y
-
-        sorted_children_.each do |child|
-          unless child.y == y_position_
-            y_position_ = child.y
-            pairs_ << a_
-            a_ = []
-          end
-
-          a_ << child
-        end
-
-        pairs_ << a_ unless pairs_.last == a_
-
-        pairs_.sum { |pair| pair.map(&:outer_height).max } + @style.padding_bottom + @style.border_thickness_bottom
-      else
-        @children.sum(&:outer_height) + @style.padding_bottom + @style.border_thickness_bottom
-      end
+      @children.sum { |c| c.height } + noncontent_height
     end
 
     def max_scroll_width
-      scroll_width - outer_width
+      scroll_width - width
     end
 
     def max_scroll_height
-      scroll_height - outer_height
+      scroll_height - height
     end
 
     def dimensional_size(size, dimension)
       raise "dimension must be either :width or :height" unless %i[width height].include?(dimension)
 
-      new_size = if size.is_a?(Numeric) && size.between?(0.0, 1.0)
-        (@parent.send(:"content_#{dimension}") * size).floor - send(:"noncontent_#{dimension}").floor
-      else
-        size
-      end
-
-      if @parent && @style.fill # Handle fill behavior
-        if dimension == :width && @parent.is_a?(Flow)
-          return space_available_width - noncontent_width
-
-        elsif dimension == :height && @parent.is_a?(Stack)
-          return space_available_height - noncontent_height
+      if size && size.is_a?(Numeric)
+        if size.between?(0.0, 1.0)
+          ((@parent.send(:"content_#{dimension}") - send(:"noncontent_#{dimension}")) * size).round
+        else
+          size
         end
-
-      else # Handle min_width/height and max_width/height
-        return @style.send(:"min_#{dimension}") if @style.send(:"min_#{dimension}") && new_size.to_f < @style.send(:"min_#{dimension}")
-        return @style.send(:"max_#{dimension}") if @style.send(:"max_#{dimension}") && new_size.to_f > @style.send(:"max_#{dimension}")
       end
-
-      new_size
-    end
-
-    def space_available_width
-      # TODO: This may get expensive if there are a lot of children, probably should cache it somehow
-      fill_siblings = @parent.children.select { |c| c.style.fill }.count.to_f # include self since we're dividing
-
-      available_space = ((@parent.content_width - (@parent.children.reject { |c| c.style.fill }).map(&:outer_width).sum) / fill_siblings)
-      (available_space.nan? || available_space.infinite?) ? 0 : available_space.floor # The parent element might not have its dimensions, yet.
-    end
-
-    def space_available_height
-      # TODO: This may get expensive if there are a lot of children, probably should cache it somehow
-      fill_siblings = @parent.children.select { |c| c.style.fill }.count.to_f # include self since we're dividing
-
-      available_space = ((@parent.content_height - (@parent.children.reject { |c| c.style.fill }).map(&:outer_height).sum) / fill_siblings)
-      (available_space.nan? || available_space.infinite?) ? 0 : available_space.floor # The parent element might not have its dimensions, yet.
     end
 
     def background=(_background)
@@ -491,53 +383,10 @@ module CyberarmEngine
       @style.background_canvas.height = height
 
       @style.background_canvas.update
-      update_background_nine_slice
-      update_background_image
+
       @style.border_canvas.update
     end
 
-    def background_nine_slice=(_image_path)
-      @style.background_nine_slice_canvas.image = _image_path
-      update_background_nine_slice
-    end
-
-    def update_background_nine_slice
-      @style.background_nine_slice_canvas.x = @x
-      @style.background_nine_slice_canvas.y = @y
-      @style.background_nine_slice_canvas.z = @z
-      @style.background_nine_slice_canvas.width = width
-      @style.background_nine_slice_canvas.height = height
-
-      @style.background_nine_slice_canvas.mode = @style.background_nine_slice_mode
-
-      @style.background_nine_slice_canvas.color = @style.background_nine_slice_color
-
-      @style.background_nine_slice_canvas.left   = @style.background_nine_slice_left
-      @style.background_nine_slice_canvas.top    = @style.background_nine_slice_top
-      @style.background_nine_slice_canvas.right  = @style.background_nine_slice_right
-      @style.background_nine_slice_canvas.bottom = @style.background_nine_slice_bottom
-
-      @style.background_nine_slice_canvas.image = @style.background_nine_slice
-    end
-
-    def background_image=(image_path)
-      @style.background_image = image_path.is_a?(Gosu::Image) ? image_path : get_image(image_path)
-      update_background_image
-    end
-
-    def update_background_image
-      @style.background_image_canvas.x = @x
-      @style.background_image_canvas.y = @y
-      @style.background_image_canvas.z = @z
-      @style.background_image_canvas.width = width
-      @style.background_image_canvas.height = height
-
-      @style.background_image_canvas.mode = @style.background_image_mode
-      @style.background_image_canvas.color = @style.background_image_color
-
-      @style.background_image_canvas.image = @style.background_image
-    end
-
     def root
       return self if is_root?
 

lib/cyberarm_engine/ui/elements/button.rb

@@ -64,8 +64,8 @@ module CyberarmEngine
             @scale_y = 1
           end
 
-          @width = _width || @image.width.floor * @scale_x
-          @height = _height || @image.height.floor * @scale_y
+          @width = _width || @image.width.round * @scale_x
+          @height = _height || @image.height.round * @scale_y
 
           update_background
         else
@@ -86,12 +86,9 @@ module CyberarmEngine
 
         old_width = width
         old_height = height
+        recalculate
 
-        if old_width != width || old_height != height
-          root.gui_state.request_recalculate
-        else
-          recalculate
-        end
+        root.gui_state.request_recalculate if old_width != width || old_height != height
 
         publish(:changed, self.value)
       end

lib/cyberarm_engine/ui/elements/container.rb

@@ -6,16 +6,6 @@ module CyberarmEngine
       attr_accessor :stroke_color, :fill_color
       attr_reader :children, :gui_state, :scroll_position
 
-      def self.current_container
-        @@current_container
-      end
-
-      def self.current_container=(container)
-        raise ArgumentError, "Expected container to an an instance of CyberarmEngine::Element::Container, got #{container.class}" unless container.is_a?(CyberarmEngine::Element::Container)
-
-        @@current_container = container
-      end
-
       def initialize(options = {}, block = nil)
         @gui_state = options.delete(:gui_state)
         super
@@ -45,34 +35,29 @@ module CyberarmEngine
       def clear(&block)
         @children.clear
 
-        old_container = CyberarmEngine::Element::Container.current_container
+        old_container = $__current_container__
 
-        CyberarmEngine::Element::Container.current_container = self
+        $__current_container__ = self
         block.call(self) if block
 
-        CyberarmEngine::Element::Container.current_container = old_container
+        $__current_container__ = old_container
 
         root.gui_state.request_recalculate
       end
 
-      def append(&block)
-        old_container = CyberarmEngine::Element::Container.current_container
+      def apend(&block)
+        old_container = $__current_container__
 
-        CyberarmEngine::Element::Container.current_container = self
+        $__current_container__ = self
         block.call(self) if block
 
-        CyberarmEngine::Element::Container.current_container = old_container
+        $__current_container__ = old_container
 
         root.gui_state.request_recalculate
       end
 
       def render
-        Gosu.clip_to(
-          @x + @style.border_thickness_left + @style.padding_left,
-          @y + @style.border_thickness_top + @style.padding_top,
-          content_width + 1,
-          content_height + 1
-        ) do
+        Gosu.clip_to(@x, @y, width, height) do
           @children.each(&:draw)
         end
       end
@@ -90,8 +75,6 @@ module CyberarmEngine
       end
 
       def hit_element?(x, y)
-        return unless hit?(x, y)
-
         @children.reverse_each do |child|
           next unless child.visible?
 
@@ -118,8 +101,6 @@ module CyberarmEngine
 
         stylize
 
-        # s = Gosu.milliseconds
-
         layout
 
         if is_root?
@@ -132,35 +113,11 @@ module CyberarmEngine
           _width = dimensional_size(@style.width, :width)
           _height = dimensional_size(@style.height, :height)
 
-          @width  = _width  || (@children.map { |c| c.x + c.outer_width }.max || 0).floor
-          @height = _height || (@children.map { |c| c.y + c.outer_height }.max || 0).floor
+          @width  = _width  || (@children.map { |c| c.x + c.outer_width }.max || 0).round
+          @height = _height || (@children.map { |c| c.y + c.outer_height }.max || 0).round
         end
 
-        # FIXME: Correctly handle alignment when element has siblings
-        # FIXME: Enable alignment for any element, not just containers
-        if @style.v_align
-          space = space_available_height
-
-          case @style.v_align
-          when :center
-            @y = parent.height / 2 - height / 2
-          when :bottom
-            @y = parent.height - height
-          end
-        end
-
-        if @style.h_align
-          space = space_available_width
-
-          case @style.h_align
-          when :center
-            @x = parent.width / 2 - width / 2
-          when :right
-            @x = parent.width - width
-          end
-        end
-
-        # Move children to parent after positioning
+        # Move child to parent after positioning
         @children.each do |child|
           child.x += (@x + @style.border_thickness_left) - style.margin_left
           child.y += (@y + @style.border_thickness_top) - style.margin_top
@@ -170,13 +127,8 @@ module CyberarmEngine
           child.reposition # TODO: Implement top,bottom,left,center, and right positioning
 
           Stats.increment(:gui_recalculations_last_frame, 1)
-
-          child.element_visible = child.x >= @x - child.width && child.x <= @x + width &&
-                                  child.y >= @y - child.height && child.y <= @y + height
         end
 
-        # puts "TOOK: #{Gosu.milliseconds - s}ms to recalculate #{self.class}:0x#{self.object_id.to_s(16)}"
-
         update_background
       end
 
@@ -185,17 +137,16 @@ module CyberarmEngine
       end
 
       def max_width
-        # _width = dimensional_size(@style.width, :width)
-        # if _width
-        #   outer_width
-        # else
-        #   window.width - (@parent ? @parent.style.margin_right + @style.margin_right : @style.margin_right)
-        # end
-
-        outer_width
+        _width = dimensional_size(@style.width, :width)
+        if _width
+          outer_width
+        else
+          window.width - (@parent ? @parent.style.margin_right + @style.margin_right : @style.margin_right)
+        end
       end
 
       def fits_on_line?(element) # Flow
+        p [@options[:id], @width] if @options[:id]
         @current_position.x + element.outer_width <= max_width &&
           @current_position.x + element.outer_width <= window.width
       end
@@ -205,6 +156,7 @@ module CyberarmEngine
         element.y = element.style.margin_top  + @current_position.y
 
         @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
@@ -217,14 +169,14 @@ module CyberarmEngine
         response
       end
 
-      def position_on_next_line(element) # Flow
-        @current_position.x = @style.margin_left + @style.padding_left
-        @current_position.y += tallest_neighbor(element, @current_position.y).outer_height
+      def position_on_next_line(child) # Flow
+        @current_position.x = @style.margin_left
+        @current_position.y += tallest_neighbor(child, @current_position.y).outer_height
 
-        element.x = element.style.margin_left + @current_position.x
-        element.y = element.style.margin_top  + @current_position.y
+        child.x = child.style.margin_left + @current_position.x
+        child.y = child.style.margin_top  + @current_position.y
 
-        @current_position.x += element.outer_width
+        @current_position.x += child.outer_width
       end
 
       def move_to_next_line(element) # Stack
@@ -240,8 +192,7 @@ module CyberarmEngine
         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)
+          recalculate
 
           return :handled
         end
@@ -255,8 +206,7 @@ module CyberarmEngine
         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)
+          recalculate
 
           return :handled
         end

lib/cyberarm_engine/ui/elements/edit_box.rb

@@ -98,7 +98,7 @@ module CyberarmEngine
       end
 
       def row_at(y)
-        ((y - @text.y) / @text.textobject.height).floor
+        ((y - @text.y) / @text.textobject.height).round
       end
 
       def column_at(x, y)

lib/cyberarm_engine/ui/elements/edit_line.rb

@@ -1,20 +1,6 @@
 module CyberarmEngine
   class Element
     class EditLine < Button
-      class TextInput < Gosu::TextInput
-        def filter=(filter)
-          @filter = filter
-        end
-
-        def filter(text_in)
-          if @filter
-            @filter.call(text_in)
-          else
-            text_in
-          end
-        end
-      end
-
       def initialize(text, options = {}, block = nil)
         @filter = options.delete(:filter)
         super(text, options, block)
@@ -28,11 +14,17 @@ module CyberarmEngine
         @caret_last_interval = Gosu.milliseconds
         @show_caret = true
 
-        @text_input = TextInput.new
-        @text_input.filter = @filter
+        @text_input = Gosu::TextInput.new
         @text_input.text = text
         @last_text_value = text
-        @last_caret_position = @text_input.caret_pos
+
+        if @filter && @filter.respond_to?(:call)
+          @text_input.instance_variable_set(:@filter, @filter)
+
+          def @text_input.filter(text_in)
+            @filter.call(text_in)
+          end
+        end
 
         @offset_x = 0
         @offset_y = 0
@@ -83,12 +75,6 @@ module CyberarmEngine
           publish(:changed, value)
         end
 
-        if @last_caret_position != @text_input.caret_pos
-          @last_caret_position = @text_input.caret_pos
-          @show_caret = true
-          @caret_last_interval = Gosu.milliseconds
-        end
-
         if Gosu.milliseconds >= @caret_last_interval + @caret_interval
           @caret_last_interval = Gosu.milliseconds
 
@@ -112,20 +98,20 @@ module CyberarmEngine
             @text_input.caret_pos = @text_input.text.length
 
           when Gosu::KB_C
-            Gosu.clipboard = if @text_input.selection_start < @text_input.caret_pos
-                               @text_input.text[@text_input.selection_start...@text_input.caret_pos]
-                             else
-                               @text_input.text[@text_input.caret_pos...@text_input.selection_start]
-                             end
+            if @text_input.selection_start < @text_input.caret_pos
+              Clipboard.copy(@text_input.text[@text_input.selection_start...@text_input.caret_pos])
+            else
+              Clipboard.copy(@text_input.text[@text_input.caret_pos...@text_input.selection_start])
+            end
 
           when Gosu::KB_X
             chars = @text_input.text.chars
 
             if @text_input.selection_start < @text_input.caret_pos
-              Gosu.clipboard = @text_input.text[@text_input.selection_start...@text_input.caret_pos]
+              Clipboard.copy(@text_input.text[@text_input.selection_start...@text_input.caret_pos])
               chars.slice!(@text_input.selection_start, @text_input.caret_pos)
             else
-              Gosu.clipboard = @text_input.text[@text_input.caret_pos...@text_input.selection_start]
+              Clipboard.copy(@text_input.text[@text_input.caret_pos...@text_input.selection_start])
               chars.slice!(@text_input.caret_pos, @text_input.selection_start)
             end
 
@@ -133,9 +119,10 @@ module CyberarmEngine
 
           when Gosu::KB_V
             if instance_of?(EditLine) # EditLine assumes a single line of text
-              @text_input.insert_text(Gosu.clipboard.gsub("\n", ""))
+              @text_input.text = @text_input.text.insert(@text_input.caret_pos,
+                                                         Clipboard.paste.encode("UTF-8").gsub("\n", ""))
             else
-              @text_input.insert_text(Gosu.clipboard)
+              @text_input.text = @text_input.text.insert(@text_input.caret_pos, Clipboard.paste.encode("UTF-8"))
             end
           end
         end
@@ -193,7 +180,7 @@ module CyberarmEngine
         if @type == :password
           @text.x + @text.width(default(:password_character) * @text_input.text[0...@text_input.send(method)].length)
         else
-          @text.x + @text.width(@text_input.text[0...@text_input.send(method)]) - @style.border_thickness_left
+          @text.x + @text.width(@text_input.text[0...@text_input.send(method)])
         end
       end
 
@@ -210,35 +197,20 @@ module CyberarmEngine
       end
 
       def focus(sender)
-        @focus = true
+        super
+
         window.text_input = @text_input
         @text_input.caret_pos = @text_input.selection_start = @text_input.text.length
 
-        update_styles(:active)
-
         :handled
       end
 
       def enter(sender)
-        if @enabled && @focus
-          update_styles(:active)
-        elsif @enabled && !@focus
-          update_styles(:hover)
-        else
-          update_styles(:disabled)
-        end
+        _has_focus = @focus
 
-        :handled
-      end
+        super
 
-      def leave(sender)
-        if @enabled && @focus
-          update_styles(:active)
-        elsif @enabled && !@focus
-          update_styles
-        else
-          update_styles(:disabled)
-        end
+        @focus = _has_focus
 
         :handled
       end

lib/cyberarm_engine/ui/elements/image.rb

@@ -45,8 +45,8 @@ module CyberarmEngine
           @scale_y = 1
         end
 
-        @width = _width || @image.width.floor * @scale_x
-        @height = _height || @image.height.floor * @scale_y
+        @width = _width || @image.width.round * @scale_x
+        @height = _height || @image.height.round * @scale_y
 
         update_background
       end

lib/cyberarm_engine/ui/elements/list_box.rb

@@ -13,12 +13,10 @@ module CyberarmEngine
         @style.background_canvas.background = default(:background)
 
         # TODO: "Clean Up" into own class?
-        @menu = Stack.new(parent: self, theme: @options[:theme])
+        @menu = Stack.new(parent: parent, width: @options[:width], theme: @options[:theme])
         @menu.define_singleton_method(:recalculate_menu) do
           @x = @__list_box.x
           @y = @__list_box.y + @__list_box.height
-
-          @y = @__list_box.y - height if @y + height > window.height
         end
         @menu.instance_variable_set(:"@__list_box", self)
 
@@ -31,13 +29,6 @@ module CyberarmEngine
         self.choose = @choose
       end
 
-      def render
-        super
-
-        w = @text.textobject.text_width("▼")
-        @text.textobject.draw_text("▼", @x + content_width - w, @y + @style.padding_top, @z, 1, 1, @text.color)
-      end
-
       def choose=(item)
         valid = @items.detect { |i| i == item }
         raise "Invalid value '#{item}' for choose, valid options were: #{@items.map { |i| "#{i.inspect}" }.join(", ")}" unless valid
@@ -55,20 +46,10 @@ module CyberarmEngine
         :handled
       end
 
-      def clicked_left_mouse_button(_sender, _x, _y)
-        # @block&.call(self.value) if @enabled
-
-        :handled
-      end
-
       def show_menu
         @menu.clear
 
-        @menu.style.width = width
-
         @items.each do |item|
-          next if item == self.value
-
           btn = Button.new(
             item,
             {
@@ -80,7 +61,7 @@ module CyberarmEngine
             },
             proc do
               self.choose = item
-              @block&.call(self.value)
+              @block&.call(item)
             end
           )
 

lib/cyberarm_engine/ui/elements/progress.rb

@@ -1,16 +1,9 @@
 module CyberarmEngine
   class Element
     class Progress < Element
-      attr_reader :type
-
       def initialize(options = {}, block = nil)
         super(options, block)
 
-        @animation_speed = options[:animation_speed] || 3_000
-        @marquee_width = options[:marquee_width] || 0.25
-        @marquee_offset = 0
-        @marquee_animation_time = Gosu.milliseconds
-        @type = options[:type] || :linear
         @fraction_background = Background.new(background: @style.fraction_background)
         self.value = options[:fraction] || 0.0
       end
@@ -31,45 +24,15 @@ module CyberarmEngine
       def update_background
         super
 
-        @fraction_background.x = (@style.border_thickness_left + @style.padding_left + @x) + @marquee_offset
+        @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 * (@type == :marquee ? @marquee_width : @fraction)
+        @fraction_background.width = @width * @fraction
         @fraction_background.height = @height
 
         @fraction_background.background = @style.fraction_background
       end
 
-      def update
-        super
-
-        return unless @type == :marquee
-
-        marquee_width = @width * @marquee_width
-        range = @width + marquee_width
-
-        @marquee_offset = (@width * (Gosu.milliseconds - @marquee_animation_time) / @animation_speed) - marquee_width
-        @marquee_animation_time = Gosu.milliseconds if @marquee_offset > range
-
-        update_background
-      end
-
-      def type=(type)
-        @type = type
-
-        case type
-        when :linear
-          @marquee_offset = 0
-        when :marquee
-          @marquee_offset = 0
-          @marquee_animation_time = Gosu.milliseconds
-        else
-          raise ArgumentError, "Only types :linear and :marquee are supported"
-        end
-
-        update_background
-      end
-
       def value
         @fraction
       end

lib/cyberarm_engine/ui/elements/slider.rb

@@ -42,7 +42,7 @@ module CyberarmEngine
         @step_size = @options[:step] || 0.1
         @value     = @options[:value] || (@range.first + @range.last) / 2
 
-        @handle = Handle.new("", parent: self, theme: options[:theme], width: 8, height: 1.0) { close }
+        @handle = Handle.new("", parent: self, width: 8, height: 1.0) { close }
         add(@handle)
       end
 
@@ -61,10 +61,10 @@ module CyberarmEngine
       end
 
       def position_handle
-        @handle.x = @x + @handle.style.margin_left + @style.padding_left + @style.border_thickness_left +
+        @handle.x = @x + @style.padding_left + @style.border_thickness_left +
                     ((content_width - @handle.outer_width) * (@value - @range.min) / (@range.max - @range.min).to_f)
 
-        @handle.y = @y + @handle.style.margin_top + @style.border_thickness_top + @style.padding_top
+        @handle.y = @y + @style.border_thickness_top + @style.padding_top
       end
 
       def draw

lib/cyberarm_engine/ui/elements/text_block.rb

@@ -7,35 +7,18 @@ module CyberarmEngine
         @text = Text.new(
           text, font: @options[:font], z: @z, color: @options[:color],
                 size: @options[:text_size], shadow: @options[:text_shadow],
-                static: @options[:text_static],
                 shadow_size: @options[:text_shadow_size],
-                shadow_color: @options[:text_shadow_color],
-                border: @options[:text_border],
-                border_size: @options[:text_border_size],
-                border_color: @options[:text_border_color]
+                shadow_color: @options[:text_shadow_color]
         )
 
         @raw_text = text
       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
-          Gosu.clip_to(@x, @y, width, height) do
-            @text.draw
-          end
-        else
-          @text.draw
-        end
+        @text.draw
       end
 
       def recalculate
-        unless @enabled
-          @text.color = @style.disabled[:color]
-        else
-          @text.color = @style.color
-        end
-
         @width  = 0
         @height = 0
 
@@ -44,19 +27,19 @@ module CyberarmEngine
 
         handle_text_wrapping(_width)
 
-        @width  = _width  || @text.width.floor
-        @height = _height || @text.height.floor
+        @width  = _width  || @text.width.round
+        @height = _height || @text.height.round
 
         @text.y = @style.border_thickness_top + @style.padding_top + @y
         @text.z = @z + 3
 
-        if (text_alignment = @options[:text_align] || @options[:text_h_align])
+        if (text_alignment = @options[:text_align])
           case text_alignment
           when :left
             @text.x = @style.border_thickness_left + @style.padding_left + @x
           when :center
-            @text.x = if @text.width <= width
-                        @x + width / 2 - @text.width / 2
+            @text.x = if @text.width <= outer_width
+                        @x + outer_width / 2 - @text.width / 2
                       else # Act as left aligned
                         @style.border_thickness_left + @style.padding_left + @x
                       end
@@ -65,81 +48,50 @@ module CyberarmEngine
           end
         end
 
-        if (vertical_alignment = @options[:text_v_align])
-          case vertical_alignment
-          when :center
-            @text.y = if @text.height <= height
-                        @y + height / 2 - @text.height / 2
-                      else
-                        @style.border_thickness_top + @style.padding_top + @y
-                      end
-          when :bottom
-            @text.y = @y + outer_height - (@text.height + @style.border_thickness_bottom + @style.padding_bottom)
-          end
-        end
-
         update_background
       end
 
       def handle_text_wrapping(max_width)
-        max_width ||= @parent&.content_width
+        max_width ||= @parent&.width
         max_width ||= @x - (window.width + noncontent_width)
         wrap_behavior = style.text_wrap
         copy = @raw_text.to_s.dup
 
-        # Only perform text wrapping: if it is enabled, is possible to wrap, and text is too long to fit on one line
-        if wrap_behavior != :none && line_width(copy[0]) <= max_width && line_width(copy) > max_width
-          breaks = [] # list of indexes to insert a line break
+        if line_width(copy[0]) <= max_width && line_width(copy) > max_width && wrap_behavior != :none
+          breaks = []
           line_start = 0
-          line_end = copy.length
+          line_end   = copy.length
 
-          stalled = false
-          stalled_interations = 0
-          max_stalled_iterations = 10
-          checked_copy_length = line_width(copy[line_start..line_end])
+          while line_start != copy.length
+            if line_width(copy[line_start...line_end]) > max_width
+              line_end = ((line_end - line_start) / 2.0)
+              line_end = 1.0 if line_end <= 1
+            elsif line_end < copy.length && line_width(copy[line_start...line_end + 1]) < max_width
+              # To small, grow!
+              # TODO: find a more efficient way
+              line_end += 1
 
-          # find length of lines
-          while line_width(copy[line_start..line_end]) > max_width && stalled_interations < max_stalled_iterations
-            search_start = line_start
-            search_end = line_end
+            else # FOUND IT!
+              entering_line_end = line_end.floor
+              max_reach = line_end.floor - line_start < 63 ? line_end.floor - line_start : 63
+              reach = 0
 
-            # Perform a binary search to find length of line
-            while search_start < search_end
-              midpoint = ((search_start.to_f + search_end) / 2.0).floor
-
-              if line_width(copy[line_start..midpoint]) > max_width
-                search_end = midpoint
-              else
-                search_start = midpoint + 1
-              end
-            end
-
-            if wrap_behavior == :word_wrap
-              word_search_end = search_end
-              failed = false
-
-              until(copy[word_search_end].to_s.match(/[[:punct:]]| /))
-                word_search_end -= 1
-
-                if word_search_end <= 1 || word_search_end < line_start
-                  failed = true
-                  break
+              if wrap_behavior == :word_wrap
+                max_reach.times do |i|
+                  reach = i
+                  break if copy[line_end.floor - i].to_s.match(/[[:punct:]]| /)
                 end
+
+                # puts "Max width: #{max_width}/#{line_width(@raw_text)} Reach: {#{reach}/#{max_reach}} Line Start: #{line_start}/#{line_end.floor} (#{copy.length}|#{@raw_text.length}) [#{entering_line_end}] '#{copy}' {#{copy[line_start...line_end]}}"
+                line_end = line_end.floor - reach + 1 if reach != max_reach # Add +1 to walk in front of punctuation
               end
 
-              line_start = failed ? search_end : word_search_end + 1 # walk in front of punctuation
-            else
-              line_start = search_end
+              breaks << line_end.floor
+              line_start = line_end.floor
+              line_end = copy.length
+
+              break if entering_line_end == copy.length || reach == max_reach
             end
-
-            breaks << line_start
-
-            # Prevent locking up due to outer while loop text width < max_width check not being satisfied.
-            stalled = checked_copy_length == line_width(copy[line_start..line_end])
-            checked_copy_length = line_width(copy[line_start..line_end])
-
-            stalled_interations += 1 if stalled
-            stalled_interations = 0 unless stalled
           end
 
           breaks.each_with_index do |pos, index|
@@ -163,12 +115,9 @@ module CyberarmEngine
 
         old_width = width
         old_height = height
+        recalculate
 
-        if old_width != width || old_height != height
-          root.gui_state.request_recalculate
-        else
-          recalculate
-        end
+        root.gui_state.request_recalculate if old_width != width || old_height != height
 
         publish(:changed, self.value)
       end

lib/cyberarm_engine/ui/elements/toggle_button.rb

@@ -5,7 +5,7 @@ module CyberarmEngine
 
       def initialize(options, block = nil)
         if options.dig(:theme, :ToggleButton, :checkmark_image)
-          options[:theme][:ToggleButton][:image_width] ||= options[:theme][:TextBlock][:text_size]
+          options[:theme][:ToggleButton][:image_width] ||= options[:theme][:Label][:text_size]
           super(get_image(options.dig(:theme, :ToggleButton, :checkmark_image)), options, block)
 
           @_image = @image

lib/cyberarm_engine/ui/event.rb

@@ -15,19 +15,12 @@ module CyberarmEngine
 
       return unless enabled?
 
-      was_handled = false
-
-      was_handled = true if respond_to?(event) && (send(event, self, *args) == :handled)
+      return :handled if respond_to?(event) && (send(event, self, *args) == :handled)
 
       @event_handler[event].reverse_each do |handler|
-        if handler.call(self, *args) == :handled
-          was_handled = true
-          break
-        end
+        return :handled if handler.call(self, *args) == :handled
       end
 
-      return :handled if was_handled
-
       parent.publish(event, *args) if parent
       nil
     end

lib/cyberarm_engine/ui/gui_state.rb

@@ -12,7 +12,7 @@ module CyberarmEngine
 
       @root_container = Element::Stack.new(gui_state: self)
       @game_objects << @root_container
-      CyberarmEngine::Element::Container.current_container = @root_container
+      $__current_container__ = @root_container
 
       @active_width  = window.width
       @active_height = window.height
@@ -25,7 +25,6 @@ module CyberarmEngine
       @last_mouse_pos = nil
       @dragging_element = nil
       @pending_recalculate_request = false
-      @pending_element_recalculate_requests = []
 
       @menu = nil
       @min_drag_distance = 0
@@ -57,7 +56,6 @@ module CyberarmEngine
 
       if @tip.value.length.positive?
         Gosu.flush
-
         @tip.draw
       end
 
@@ -77,9 +75,6 @@ module CyberarmEngine
         @pending_recalculate_request = false
       end
 
-      @pending_element_recalculate_requests.each(&:recalculate)
-      @pending_element_recalculate_requests.clear
-
       if @pending_focus_request
         @pending_focus_request = false
 
@@ -90,8 +85,6 @@ module CyberarmEngine
       @menu&.update
       super
 
-      return unless window.has_focus?
-
       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)
 
@@ -110,7 +103,7 @@ module CyberarmEngine
       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.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 + 5)
@@ -137,6 +130,10 @@ module CyberarmEngine
       @active_height = window.height
     end
 
+    def tool_tip_delay
+      250 # ms
+    end
+
     def button_down(id)
       super
 
@@ -171,13 +168,6 @@ module CyberarmEngine
       end
 
       @focus.button_up(id) if @focus.respond_to?(:button_up)
-
-      # Prevents menu from popping back up if the listbox is clicked to hide it.
-      @hid_menu_for = nil
-    end
-
-    def tool_tip_delay
-      @tip.style.delay || 250 # ms
     end
 
     def redirect_mouse_button(button)
@@ -188,7 +178,7 @@ module CyberarmEngine
         @focus = nil
       end
 
-      if @mouse_over && @hid_menu_for != @mouse_over
+      if @mouse_over
         @mouse_down_position[button] = Vector.new(window.mouse_x, window.mouse_y)
         @mouse_down_on[button]       = @mouse_over
 
@@ -202,7 +192,7 @@ module CyberarmEngine
     def redirect_released_mouse_button(button)
       hide_menu if @menu && (@menu == @mouse_over) || (@mouse_over&.parent == @menu)
 
-      if @mouse_over && @hid_menu_for != @mouse_over
+      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,
@@ -241,13 +231,6 @@ module CyberarmEngine
       @pending_recalculate_request = true
     end
 
-    def request_recalculate_for(element)
-      # element is already queued
-      return if @pending_element_recalculate_requests.detect { |e| e == element }
-
-      @pending_element_recalculate_requests << element
-    end
-
     def request_focus(element)
       @pending_focus_request = true
       @pending_focus_element = element
@@ -258,9 +241,6 @@ module CyberarmEngine
     end
 
     def hide_menu
-      return unless @menu
-
-      @hid_menu_for = @menu.parent
       @menu = nil
     end
 

lib/cyberarm_engine/ui/theme.rb

@@ -76,7 +76,6 @@ module CyberarmEngine
         border_radius: 0,
         background: ["ffc75e61".to_i(16), "ffe26623".to_i(16)],
         text_align: :center,
-        text_v_align: :center,
         text_wrap: :none,
 
         hover: {
@@ -103,12 +102,7 @@ module CyberarmEngine
         caret_color: Gosu::Color::WHITE,
         caret_interval: 500,
         selection_color: Gosu::Color.rgba(255, 128, 50, 200),
-        text_align: :left,
-        text_static: false # static text causes issues correctly displaying caret position
-      },
-
-      EditBox: { # < EditLine
-        text_v_align: :top
+        text_align: :left
       },
 
       Image: { # < Element
@@ -121,14 +115,10 @@ module CyberarmEngine
         text_size: 28,
         text_wrap: :word_wrap, # :word_wrap, :break_word, :none
         text_shadow: false,
-        text_border: false,
         text_align: :left,
         font: "Arial",
         margin: 0,
-        padding: 2,
-        disabled: {
-          color: Gosu::Color.rgb(175, 175, 175),
-        }
+        padding: 2
       },
 
       Banner: { # < TextBlock
@@ -160,7 +150,6 @@ module CyberarmEngine
       },
 
       ToolTip: { # < TextBlock
-        delay: 100, # ms
         color: Gosu::Color::WHITE,
         padding_top: 4,
         padding_bottom: 4,

lib/cyberarm_engine/version.rb

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

lib/cyberarm_engine/window.rb

@@ -8,33 +8,21 @@ module CyberarmEngine
 
     attr_accessor :show_cursor
     attr_writer :exit_on_opengl_error
-    attr_reader :last_frame_time, :states
+    attr_reader :last_frame_time
 
     def self.now
       Gosu.milliseconds
     end
 
     def self.dt
-      instance.last_frame_time / 1000.0
-    end
-
-    def self.instance=(window)
-      raise ArgumentError, "Expected window to be a subclass of CyberarmEngine::Window, got: #{window.class}" unless window.is_a?(CyberarmEngine::Window)
-
-      @@instance = window
-    end
-
-    def self.instance
-      @@instance
+      $window.last_frame_time / 1000.0
     end
 
     def initialize(width: 800, height: 600, fullscreen: false, update_interval: 1000.0 / 60, resizable: false, borderless: false)
       @show_cursor = false
-      @has_focus = false
 
       super(width, height, fullscreen: fullscreen, update_interval: update_interval, resizable: resizable, borderless: borderless)
-      Window.instance = self
-
+      $window = self
       @last_frame_time = Gosu.milliseconds - 1
       @current_frame_time = Gosu.milliseconds
       self.caption = "CyberarmEngine #{CyberarmEngine::VERSION} #{Gosu.language}"
@@ -46,14 +34,13 @@ module CyberarmEngine
     end
 
     def draw
-      current_state&.draw
+      current_state.draw if current_state
     end
 
     def update
       Stats.clear
 
-      current_state&.update
-
+      current_state.update if current_state
       @last_frame_time = Gosu.milliseconds - @current_frame_time
       @current_frame_time = Gosu.milliseconds
     end
@@ -62,48 +49,6 @@ module CyberarmEngine
       @show_cursor
     end
 
-    def needs_redraw?
-      current_state ? current_state.needs_redraw? : true
-    end
-
-    def drop(filename)
-      current_state&.drop(filename)
-    end
-
-    def gamepad_connected(index)
-      current_state&.gamepad_connected(index)
-    end
-
-    def gamepad_disconnected(index)
-      current_state&.gamepad_disconnected(index)
-    end
-
-    def gain_focus
-      @has_focus = true
-
-      current_state&.gain_focus
-    end
-
-    def lose_focus
-      @has_focus = false
-
-      current_state&.lose_focus
-    end
-
-    def button_down(id)
-      super
-      current_state&.button_down(id)
-    end
-
-    def button_up(id)
-      super
-      current_state&.button_up(id)
-    end
-
-    def close
-      current_state ? current_state.close : super
-    end
-
     def dt
       @last_frame_time / 1000.0
     end
@@ -116,6 +61,16 @@ module CyberarmEngine
       @exit_on_opengl_error
     end
 
+    def button_down(id)
+      super
+      current_state.button_down(id) if current_state
+    end
+
+    def button_up(id)
+      super
+      current_state.button_up(id) if current_state
+    end
+
     def push_state(klass, options = {})
       options = { setup: true }.merge(options)
 
@@ -139,6 +94,12 @@ module CyberarmEngine
       @states.last
     end
 
+    def previous_state
+      if @states.size > 1 && (state = @states[@states.size - 2])
+        state
+      end
+    end
+
     def pop_state
       @states.pop
     end
@@ -147,10 +108,6 @@ module CyberarmEngine
       @states.shift
     end
 
-    def has_focus?
-      @has_focus
-    end
-
     # Sourced from https://gist.github.com/ippa/662583
     def draw_circle(cx, cy, r, z = 9999, color = Gosu::Color::GREEN, step = 10)
       0.step(360, step) do |a1|