cyberarm_engine 0.25.0 → 0.30.0

data/lib/cyberarm_engine/trees/aabb_node.rb

@@ -1,126 +1,126 @@
-# frozen_string_literal: true
-
-module CyberarmEngine
-  class AABBTree
-    class AABBNode
-      attr_accessor :bounding_box, :parent, :object
-      attr_reader :a, :b
-
-      def initialize(parent:, object:, bounding_box:)
-        @parent = parent
-        @object = object
-        @bounding_box = bounding_box
-
-        @a = nil
-        @b = nil
-      end
-
-      def a=(leaf)
-        @a = leaf
-        @a.parent = self
-      end
-
-      def b=(leaf)
-        @b = leaf
-        @b.parent = self
-      end
-
-      def leaf?
-        @object
-      end
-
-      def insert_subtree(leaf)
-        if leaf?
-          new_node = AABBNode.new(parent: nil, object: nil, bounding_box: @bounding_box.union(leaf.bounding_box))
-
-          new_node.a = self
-          new_node.b = leaf
-
-          new_node
-        else
-          cost_a = @a.bounding_box.volume + @b.bounding_box.union(leaf.bounding_box).volume
-          cost_b = @b.bounding_box.volume + @a.bounding_box.union(leaf.bounding_box).volume
-
-          if cost_a == cost_b
-            cost_a = @a.proximity(leaf)
-            cost_b = @b.proximity(leaf)
-          end
-
-          if cost_b < cost_a
-            self.b = @b.insert_subtree(leaf)
-          else
-            self.a = @a.insert_subtree(leaf)
-          end
-
-          @bounding_box = @bounding_box.union(leaf.bounding_box)
-
-          self
-        end
-      end
-
-      def search_subtree(collider, items = [])
-        if @bounding_box.intersect?(collider)
-          if leaf?
-            items << self
-          else
-            @a.search_subtree(collider, items)
-            @b.search_subtree(collider, items)
-          end
-        end
-
-        items
-      end
-
-      def remove_subtree(leaf)
-        if leaf
-          self
-        elsif leaf.parent == self
-          other_child = other(leaf)
-          other_child.parent = @parent
-          other_child
-        else
-          leaf.parent.disown_child(leaf)
-          self
-        end
-      end
-
-      def other(leaf)
-        @a == leaf ? @b : @a
-      end
-
-      def disown_child(leaf)
-        value = other(leaf)
-        raise "Can not replace child of a leaf!" if @parent.leaf?
-        raise "Node is not a child of parent!" unless leaf.child_of?(@parent)
-
-        if @parent.a == self
-          @parent.a = value
-        else
-          @parent.b = value
-        end
-
-        @parent.update_bounding_box
-      end
-
-      def child_of?(leaf)
-        self == leaf.a || self == leaf.b
-      end
-
-      def proximity(leaf)
-        (@bounding_box - leaf.bounding_box).sum.abs
-      end
-
-      def update_bounding_box
-        node = self
-
-        unless node.leaf?
-          node.bounding_box = node.a.bounding_box.union(node.b.bounding_box)
-
-          while (node = node.parent)
-            node.bounding_box = node.a.bounding_box.union(node.b.bounding_box)
-          end
-        end
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+module CyberarmEngine
+  class AABBTree
+    class AABBNode
+      attr_accessor :bounding_box, :parent, :object
+      attr_reader :a, :b
+
+      def initialize(parent:, object:, bounding_box:)
+        @parent = parent
+        @object = object
+        @bounding_box = bounding_box
+
+        @a = nil
+        @b = nil
+      end
+
+      def a=(leaf)
+        @a = leaf
+        @a.parent = self
+      end
+
+      def b=(leaf)
+        @b = leaf
+        @b.parent = self
+      end
+
+      def leaf?
+        @object
+      end
+
+      def insert_subtree(leaf)
+        if leaf?
+          new_node = AABBNode.new(parent: nil, object: nil, bounding_box: @bounding_box.union(leaf.bounding_box))
+
+          new_node.a = self
+          new_node.b = leaf
+
+          new_node
+        else
+          cost_a = @a.bounding_box.volume + @b.bounding_box.union(leaf.bounding_box).volume
+          cost_b = @b.bounding_box.volume + @a.bounding_box.union(leaf.bounding_box).volume
+
+          if cost_a == cost_b
+            cost_a = @a.proximity(leaf)
+            cost_b = @b.proximity(leaf)
+          end
+
+          if cost_b < cost_a
+            self.b = @b.insert_subtree(leaf)
+          else
+            self.a = @a.insert_subtree(leaf)
+          end
+
+          @bounding_box = @bounding_box.union(leaf.bounding_box)
+
+          self
+        end
+      end
+
+      def search_subtree(collider, items = [])
+        if @bounding_box.intersect?(collider)
+          if leaf?
+            items << self
+          else
+            @a.search_subtree(collider, items)
+            @b.search_subtree(collider, items)
+          end
+        end
+
+        items
+      end
+
+      def remove_subtree(leaf)
+        if leaf
+          self
+        elsif leaf.parent == self
+          other_child = other(leaf)
+          other_child.parent = @parent
+          other_child
+        else
+          leaf.parent.disown_child(leaf)
+          self
+        end
+      end
+
+      def other(leaf)
+        @a == leaf ? @b : @a
+      end
+
+      def disown_child(leaf)
+        value = other(leaf)
+        raise "Can not replace child of a leaf!" if @parent.leaf?
+        raise "Node is not a child of parent!" unless leaf.child_of?(@parent)
+
+        if @parent.a == self
+          @parent.a = value
+        else
+          @parent.b = value
+        end
+
+        @parent.update_bounding_box
+      end
+
+      def child_of?(leaf)
+        self == leaf.a || self == leaf.b
+      end
+
+      def proximity(leaf)
+        (@bounding_box - leaf.bounding_box).sum.abs
+      end
+
+      def update_bounding_box
+        node = self
+
+        unless node.leaf?
+          node.bounding_box = node.a.bounding_box.union(node.b.bounding_box)
+
+          while (node = node.parent)
+            node.bounding_box = node.a.bounding_box.union(node.b.bounding_box)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/cyberarm_engine/trees/aabb_tree.rb

@@ -1,55 +1,55 @@
-# frozen_string_literal: true
-
-module CyberarmEngine
-  class AABBTree
-    include AABBTreeDebug
-
-    attr_reader :root, :objects, :branches, :leaves
-
-    def initialize
-      @objects = {}
-      @root = nil
-      @branches = 0
-      @leaves   = 0
-    end
-
-    def insert(object, bounding_box)
-      raise "BoundingBox can't be nil!" unless bounding_box
-      raise "Object can't be nil!" unless object
-      # raise "Object already in tree!" if @objects[object] # FIXME
-
-      leaf = AABBNode.new(parent: nil, object: object, bounding_box: bounding_box.dup)
-      @objects[object] = leaf
-
-      insert_leaf(leaf)
-    end
-
-    def insert_leaf(leaf)
-      @root = @root ? @root.insert_subtree(leaf) : leaf
-    end
-
-    def update(object, bounding_box)
-      leaf = remove(object)
-      leaf.bounding_box = bounding_box
-      insert_leaf(leaf)
-    end
-
-    # Returns a list of all objects that collided with collider
-    def search(collider, return_nodes = false)
-      items = []
-      if @root
-        items = @root.search_subtree(collider)
-        items.map!(&:object) unless return_nodes
-      end
-
-      items
-    end
-
-    def remove(object)
-      leaf  = @objects.delete(object)
-      @root = @root.remove_subtree(leaf) if leaf
-
-      leaf
-    end
-  end
-end
+# frozen_string_literal: true
+
+module CyberarmEngine
+  class AABBTree
+    include AABBTreeDebug
+
+    attr_reader :root, :objects, :branches, :leaves
+
+    def initialize
+      @objects = {}
+      @root = nil
+      @branches = 0
+      @leaves   = 0
+    end
+
+    def insert(object, bounding_box)
+      raise "BoundingBox can't be nil!" unless bounding_box
+      raise "Object can't be nil!" unless object
+      # raise "Object already in tree!" if @objects[object] # FIXME
+
+      leaf = AABBNode.new(parent: nil, object: object, bounding_box: bounding_box.dup)
+      @objects[object] = leaf
+
+      insert_leaf(leaf)
+    end
+
+    def insert_leaf(leaf)
+      @root = @root ? @root.insert_subtree(leaf) : leaf
+    end
+
+    def update(object, bounding_box)
+      leaf = remove(object)
+      leaf.bounding_box = bounding_box
+      insert_leaf(leaf)
+    end
+
+    # Returns a list of all objects that collided with collider
+    def search(collider, return_nodes = false)
+      items = []
+      if @root
+        items = @root.search_subtree(collider)
+        items.map!(&:object) unless return_nodes
+      end
+
+      items
+    end
+
+    def remove(object)
+      leaf  = @objects.delete(object)
+      @root = @root.remove_subtree(leaf) if leaf
+
+      leaf
+    end
+  end
+end

data/lib/cyberarm_engine/trees/aabb_tree_debug.rb

@@ -1,29 +1,29 @@
-# frozen_string_literal: true
-
-module CyberarmEngine
-  # Gets included into AABBTree
-  module AABBTreeDebug
-    def inspect
-      @branches = 0
-      @leaves = 0
-      if @root
-        node = @root
-
-        debug_search(node.a)
-        debug_search(node.b)
-      end
-
-      puts "<#{self.class}:#{object_id}> has #{@branches} branches and #{@leaves} leaves"
-    end
-
-    def debug_search(node)
-      if node.leaf?
-        @leaves += 1
-      else
-        @branches += 1
-        debug_search(node.a)
-        debug_search(node.b)
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+module CyberarmEngine
+  # Gets included into AABBTree
+  module AABBTreeDebug
+    def inspect
+      @branches = 0
+      @leaves = 0
+      if @root
+        node = @root
+
+        debug_search(node.a)
+        debug_search(node.b)
+      end
+
+      puts "<#{self.class}:#{object_id}> has #{@branches} branches and #{@leaves} leaves"
+    end
+
+    def debug_search(node)
+      if node.leaf?
+        @leaves += 1
+      else
+        @branches += 1
+        debug_search(node.a)
+        debug_search(node.b)
+      end
+    end
+  end
+end

data/lib/cyberarm_engine/ui/border_canvas.rb

@@ -1,102 +1,102 @@
-module CyberarmEngine
-  class BorderCanvas
-    attr_reader :element, :top, :right, :bottom, :left
-
-    def initialize(element:)
-      @element = element
-
-      @top    = Background.new
-      @right  = Background.new
-      @bottom = Background.new
-      @left   = Background.new
-    end
-
-    def color=(color)
-      if color.is_a?(Numeric)
-        @top.background    = color
-        @right.background  = color
-        @bottom.background = color
-        @left.background   = color
-
-      elsif color.is_a?(Gosu::Color)
-        @top.background    = color
-        @right.background  = color
-        @bottom.background = color
-        @left.background   = color
-
-      elsif color.is_a?(Array)
-        if color.size == 1
-          color = color.first
-
-        elsif color.size == 2
-          @top.background    = color.first
-          @right.background  = color.first
-          @bottom.background = color.last
-          @left.background   = color.last
-
-        elsif color.size == 4
-          @top.background    = color[0]
-          @right.background  = color[1]
-          @bottom.background = color[2]
-          @left.background   = color[3]
-        else
-          raise ArgumentError, "color array was empty or had wrong number of elements (expected 2 or 4 elements)"
-        end
-
-      elsif color.is_a?(Hash)
-        @top.background    = color[:top]
-        @right.background  = color[:right]
-        @bottom.background = color[:bottom]
-        @left.background   = color[:left]
-      else
-        raise ArgumentError, "color '#{color}' of type '#{color.class}' was not able to be processed"
-      end
-    end
-
-    def draw
-      @top.draw
-      @right.draw
-      @bottom.draw
-      @left.draw
-    end
-
-    def update
-      # TOP
-      @top.x = @element.x + @element.style.border_thickness_left
-      @top.y = @element.y
-      @top.z = @element.z
-
-      @top.width  = @element.width - @element.style.border_thickness_left
-      @top.height = @element.style.border_thickness_top
-
-      # RIGHT
-      @right.x = @element.x + @element.width
-      @right.y = @element.y + @element.style.border_thickness_top
-      @right.z = @element.z
-
-      @right.width  = -@element.style.border_thickness_right
-      @right.height = @element.height - @element.style.border_thickness_top
-
-      # BOTTOM
-      @bottom.x = @element.x
-      @bottom.y = @element.y + @element.height
-      @bottom.z = @element.z
-
-      @bottom.width  = @element.width - @element.style.border_thickness_right
-      @bottom.height = -@element.style.border_thickness_bottom
-
-      # LEFT
-      @left.x = @element.x
-      @left.y = @element.y
-      @left.z = @element.z
-
-      @left.width  = @element.style.border_thickness_left
-      @left.height = @element.height - @element.style.border_thickness_bottom
-
-      @top.update
-      @right.update
-      @bottom.update
-      @left.update
-    end
-  end
-end
+module CyberarmEngine
+  class BorderCanvas
+    attr_reader :element, :top, :right, :bottom, :left
+
+    def initialize(element:)
+      @element = element
+
+      @top    = Background.new
+      @right  = Background.new
+      @bottom = Background.new
+      @left   = Background.new
+    end
+
+    def color=(color)
+      if color.is_a?(Numeric)
+        @top.background    = color
+        @right.background  = color
+        @bottom.background = color
+        @left.background   = color
+
+      elsif color.is_a?(Gosu::Color)
+        @top.background    = color
+        @right.background  = color
+        @bottom.background = color
+        @left.background   = color
+
+      elsif color.is_a?(Array)
+        if color.size == 1
+          color = color.first
+
+        elsif color.size == 2
+          @top.background    = color.first
+          @right.background  = color.first
+          @bottom.background = color.last
+          @left.background   = color.last
+
+        elsif color.size == 4
+          @top.background    = color[0]
+          @right.background  = color[1]
+          @bottom.background = color[2]
+          @left.background   = color[3]
+        else
+          raise ArgumentError, "color array was empty or had wrong number of elements (expected 2 or 4 elements)"
+        end
+
+      elsif color.is_a?(Hash)
+        @top.background    = color[:top]
+        @right.background  = color[:right]
+        @bottom.background = color[:bottom]
+        @left.background   = color[:left]
+      else
+        raise ArgumentError, "color '#{color}' of type '#{color.class}' was not able to be processed"
+      end
+    end
+
+    def draw
+      @top.draw
+      @right.draw
+      @bottom.draw
+      @left.draw
+    end
+
+    def update
+      # TOP
+      @top.x = @element.x + @element.styled(:margin_left) + @element.styled(:border_thickness_left)
+      @top.y = @element.y + @element.styled(:margin_top)
+      @top.z = @element.z
+
+      @top.width  = @element.width - @element.styled(:border_thickness_left)
+      @top.height = @element.styled(:border_thickness_top)
+
+      # RIGHT
+      @right.x = @element.x + @element.styled(:margin_left) + @element.width
+      @right.y = @element.y + @element.styled(:margin_top) + @element.styled(:border_thickness_top)
+      @right.z = @element.z
+
+      @right.width  = -@element.styled(:border_thickness_right)
+      @right.height = @element.height - @element.styled(:border_thickness_top)
+
+      # BOTTOM
+      @bottom.x = @element.x + @element.styled(:margin_left)
+      @bottom.y = @element.y + @element.styled(:margin_top) + @element.height
+      @bottom.z = @element.z
+
+      @bottom.width  = @element.width - @element.styled(:border_thickness_right)
+      @bottom.height = -@element.styled(:border_thickness_bottom)
+
+      # LEFT
+      @left.x = @element.x + @element.styled(:margin_left)
+      @left.y = @element.y + @element.styled(:margin_top)
+      @left.z = @element.z
+
+      @left.width  = @element.styled(:border_thickness_left)
+      @left.height = @element.height - @element.styled(:border_thickness_bottom)
+
+      @top.update
+      @right.update
+      @bottom.update
+      @left.update
+    end
+  end
+end

data/lib/cyberarm_engine/ui/dialog.rb

@@ -0,0 +1,24 @@
+module CyberarmEngine
+  class Dialog < CyberarmEngine::GuiState
+    def draw
+      previous_state&.draw
+
+      Gosu.flush
+
+      super
+    end
+
+    def update
+      super
+
+      return unless window.current_state == self
+
+      window.states.reverse.each do |state|
+        # Don't update ourselves, forever
+        next if state == self && state.is_a?(CyberarmEngine::GuiState)
+
+        state.update
+      end
+    end
+  end
+end