cyberarm_engine 0.25.1 → 0.30.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 684e4ba3ba113566003f54546d230b73a2e114de9ffb37a61c82459399fed368
-  data.tar.gz: ed6d16a4e889f8d7c744aff3c75b3688adeaae6ae63c670d43fc2416af3cc5c3
+  metadata.gz: adf885ec549b6b0550708d2b037ebdf15f4ad45a90a6b600bbffb6ca0b2dc9b1
+  data.tar.gz: d5f249516e9979e54dbbcbee37e78a5993559e4322f3a18bc734f02c44b7944b
 SHA512:
-  metadata.gz: 9210c849bb6c757930f887f4af71c4782e199d3b46583da9152d3daead65887c34286fc7ebdce52226cebf342d23fd9434f6f99f441ecad1e8cfed7c37d64093
-  data.tar.gz: fa421d854aec6c8ef906b7e6882ec443d070517daf40650cd11abc98513db9ae7d412492de15467516ac8bb9abe3838f3bf5434577092e419195128311734301
+  metadata.gz: 92337be7d3ffe70bd5b3ea87ea7ec4232c92ab60afcf5beb8e3dd9bb62c201afdac06c9da8f1bb21e673b9160a18ac41bdd5b01172c317f86a561d3d62343a6b
+  data.tar.gz: 9ca3a2377f3faa7555bb3a8c49cee3b652c356a2ac6c725815e0b9526ab0021f139da24c5cff313a00c01596ea4f98bd35dd781513c71c6cf9de535a35d21bc3

data/.gitignore

@@ -1,3 +1,4 @@
+/.idea
 /.bundle/
 /.yardoc
 /_yardoc/

data/Gemfile.lock

@@ -1,25 +1,37 @@
 PATH
   remote: .
   specs:
-    cyberarm_engine (0.24.5)
+    cyberarm_engine (0.30.0)
       gosu (~> 1.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    gosu (1.4.6)
-    minitest (5.25.5)
-    rake (13.2.1)
+    ffi (1.17.4-x86_64-linux-gnu)
+    ffi (1.17.4-x86_64-linux-musl)
+    gosu (1.5.0-x86_64-linux)
+      ffi (~> 1.12)
+    minitest (5.27.0)
+    rake (13.4.2)
 
 PLATFORMS
-  x64-mingw-ucrt
-  x86_64-linux
+  x86_64-linux-gnu
+  x86_64-linux-musl
 
 DEPENDENCIES
-  bundler (~> 2.2)
+  bundler (~> 4)
   cyberarm_engine!
   minitest (~> 5.0)
   rake (~> 13.0)
 
+CHECKSUMS
+  bundler (4.1.0.beta1) sha256=8a2dac8ca276ff4eff5efc2c6457b0044080fc1e431534ad7c5cc6187232b800
+  cyberarm_engine (0.30.0)
+  ffi (1.17.4-x86_64-linux-gnu) sha256=9d3db14c2eae074b382fa9c083fe95aec6e0a1451da249eab096c34002bc752d
+  ffi (1.17.4-x86_64-linux-musl) sha256=3fdf9888483de005f8ef8d1cf2d3b20d86626af206cbf780f6a6a12439a9c49e
+  gosu (1.5.0-x86_64-linux)
+  minitest (5.27.0) sha256=2d3b17f8a36fe7801c1adcffdbc38233b938eb0b4966e97a6739055a45fa77d5
+  rake (13.4.2) sha256=cb825b2bd5f1f8e91ca37bddb4b9aaf345551b4731da62949be002fa89283701
+
 BUNDLED WITH
-   2.6.8
+  4.1.0.beta1

data/README.md

@@ -35,7 +35,7 @@ class Hello < CyberarmEngine::GuiState
     background Gosu::Color::GRAY
 
     stack do
-      label "Hello World!"
+      banner "Hello World!"
 
       button "close" do
         window.close

data/cyberarm_engine.gemspec

@@ -28,9 +28,8 @@ Gem::Specification.new do |spec|
   spec.require_paths = %w[lib assets]
 
   spec.add_dependency "gosu", "~> 1.1"
-  # spec.add_dependency "ffi", :platforms => [:mswin, :mingw] # Required by Clipboard on Windows
 
-  spec.add_development_dependency "bundler", "~> 2.2"
+  spec.add_development_dependency "bundler", "~> 4"
   spec.add_development_dependency "minitest", "~> 5.0"
   spec.add_development_dependency "rake", "~> 13.0"
 end

data/lib/cyberarm_engine/background.rb

@@ -21,19 +21,27 @@ module CyberarmEngine
     end
 
     def draw
-      Gosu.clip_to(@x, @y, @width, @height) do
-        Gosu.draw_quad(
-          @top_left.x,     @top_left.y,     @paint.top_left,
-          @top_right.x,    @top_right.y,    @paint.top_right,
-          @bottom_right.x, @bottom_right.y, @paint.bottom_right,
-          @bottom_left.x,  @bottom_left.y,  @paint.bottom_left,
-          @z
-        )
+      if @angle.zero?
+        render
+      else
+        Gosu.clip_to(@x, @y, @width, @height) do
+          render
+        end
       end
 
       debug_outline if @debug
     end
 
+    def render
+      Gosu.draw_quad(
+        @top_left.x,     @top_left.y,     @paint.top_left,
+        @top_right.x,    @top_right.y,    @paint.top_right,
+        @bottom_right.x, @bottom_right.y, @paint.bottom_right,
+        @bottom_left.x,  @bottom_left.y,  @paint.bottom_left,
+        @z
+      )
+    end
+
     def update
       @top_left.x     = @x
       @top_left.y     = @y
@@ -146,13 +154,3 @@ module CyberarmEngine
     end
   end
 end
-
-# Add <=> method to support Range based gradients
-# NOTE: Disabled, causes stack overflow 🙃
-# module Gosu
-#   class Color
-#     def <=>(_other)
-#       self
-#     end
-#   end
-# end

data/lib/cyberarm_engine/background_nine_slice.rb

@@ -1,10 +1,13 @@
 module CyberarmEngine
   class BackgroundNineSlice
     include CyberarmEngine::Common
-    attr_accessor :x, :y, :z, :width, :height, :left, :top, :right, :bottom, :mode, :color
-    attr_reader :image
 
-    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)
+    CACHE = {}
+
+    attr_accessor :x, :y, :z, :width, :height, :mode, :color, :render_mode
+    attr_reader :image, :left, :top, :right, :bottom
+
+    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, render_mode: :default)
       @image = get_image(image_path) if image_path
 
       @x = x
@@ -22,6 +25,7 @@ module CyberarmEngine
       @bottom = bottom
 
       @color = color
+      @render_mode = render_mode
 
       nine_slice if @image
     end
@@ -32,8 +36,43 @@ module CyberarmEngine
       nine_slice if @image && old_image != @image
     end
 
+    def set_edges(left: @left, right: @right, top: @top, bottom: @bottom)
+      changed = [left == @left, right == @right, top == @top, bottom == @bottom].any?(false)
+
+      @left = left
+      @top = top
+      @right = right
+      @bottom = bottom
+
+      nine_slice if changed
+    end
+
+    def left=(n)
+      nine_slice if n != @left
+      @left = n
+      n
+    end
+
+    def right=(n)
+      nine_slice if n != @right
+      @right = n
+      n
+    end
+
+    def top=(n)
+      nine_slice if n != @top
+      @top = n
+      n
+    end
+
+    def bottom=(n)
+      nine_slice if n != @bottom
+      @bottom = n
+      n
+    end
+
     def nine_slice
-      # pp [@left, @top, @right, @bottom, @image.width]
+      # pp [@left, @top, @right, @bottom, @image.width, @image.height]
 
       @segment_top_left = @image.subimage(0, 0, @left, @top)
       @segment_top_right = @image.subimage(@image.width - @right, 0, @right, @top)
@@ -83,57 +122,58 @@ module CyberarmEngine
     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, 1, 1, @color, @render_mode)
+      @segment_top.draw(@x + @segment_top_left.width, @y, @z, width_scale, 1, @color, @render_mode) # SCALE X
+      @segment_top_right.draw((@x + @width) - @segment_top_right.width, @y, @z, 1, 1, @color, @render_mode)
+
+      @segment_right.draw((@x + @width) - @segment_right.width, @y + @top, @z, 1, height_scale, @color, @render_mode) # SCALE Y
+      @segment_bottom_right.draw((@x + @width) - @segment_bottom_right.width, @y + @height - @segment_bottom_right.height, @z, 1, 1, @color, @render_mode)
+      @segment_bottom.draw(@x + @segment_bottom_left.width, (@y + @height) - @segment_bottom.height, @z, width_scale, 1, @color, @render_mode) # SCALE X
+      @segment_bottom_left.draw(@x, (@y + @height) - @segment_bottom_left.height, @z, 1, 1, @color, @render_mode)
+      @segment_left.draw(@x, @y + @top, @z, 1, height_scale, @color, @render_mode) # SCALE Y
 
-      @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_middle.draw(@x + @segment_top_left.width, @y + @segment_top.height, @z, width_scale, height_scale, @color, @render_mode) # SCALE X and SCALE Y
     end
 
     def draw_tiled
-      @segment_top_left.draw(@x, @y, @z, 1, 1, @color)
+      @segment_top_left.draw(@x, @y, @z, 1, 1, @color, @render_mode)
 
       # p [width_scale, height_scale]
 
       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, 1, 1, @color, @render_mode) # 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, 1, 1, @color, @render_mode)
 
       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, 1, 1, @color, @render_mode) # 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, 1, 1, @color, @render_mode)
 
       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, 1, 1, @color, @render_mode) # 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, 1, 1, @color, @render_mode)
 
       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, 1, 1, @color, @render_mode) # 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, 1, 1, @color, @render_mode) # SCALE X and SCALE Y
           end
         end
       end

data/lib/cyberarm_engine/common.rb

@@ -1,4 +1,6 @@
 module CyberarmEngine
+  GUI_DEBUG = false
+
   module Common
     ImageBlob = Data.define(:to_blob, :columns, :rows)
 

data/lib/cyberarm_engine/event_bus.rb

@@ -0,0 +1,39 @@
+module CyberarmEngine
+  class EventBus
+    Subscriber = Data.define(:event, :listener, :method, :callback)
+    @subscribers = []
+
+    def self.subscribe(event, listener = nil, method = nil, &block)
+      raise "Subscriber cannot have both a method AND a callback block" if method && block_given?
+
+      subscriber = Subscriber.new(event, listener, method, block)
+      @subscribers << subscriber
+
+      subscriber
+    end
+
+    def self.unsubscribe(event, listener_or_subscriber)
+      @subscribers.delete_if { |s| s.event == event && (s == listener_or_subscriber || s.listener == listener_or_subscriber) }
+    end
+
+    def self.unsubscribe!(event)
+      @subscribers.delete_if { |s| s.event == event }
+    end
+
+    def self.announce(event, *payload)
+      subscribers = @subscribers.select { |s| s.event == event }
+
+      subscribers.each do |subscriber|
+        subscriber&.listener&.send(subscriber.method, *payload) if subscriber&.method
+        subscriber.callback&.call(*payload)
+      rescue StandardError => e
+        # TODO
+        warn "Failed to deliver event (#{event}) to listener (#{subscriber.inspect}): #{e}"
+      end
+    end
+
+    def self.publish(*args)
+      announce(*args)
+    end
+  end
+end

data/lib/cyberarm_engine/game_state.rb

@@ -3,11 +3,12 @@ module CyberarmEngine
     include Common
 
     attr_accessor :options, :global_pause
-    attr_reader :game_objects
+    attr_reader :game_objects, :timers
 
     def initialize(options = {})
       @options = options
       @game_objects = []
+      @timers = []
       @global_pause = false
       window.text_input = nil unless options[:preserve_text_input]
 
@@ -28,6 +29,11 @@ module CyberarmEngine
 
     def update
       @game_objects.each(&:update)
+      @timers.each(&:update)
+      @timers.delete_if(&:dead?)
+    end
+
+    def fixed_update(dt)
     end
 
     def needs_redraw?
@@ -120,5 +126,9 @@ module CyberarmEngine
     def add_game_object(object)
       @game_objects << object
     end
+
+    def add_timer(timer)
+      @timers << timer
+    end
   end
 end

data/lib/cyberarm_engine/pathfinding/graph.rb

@@ -0,0 +1,64 @@
+module CyberarmEngine
+  module Pathfinding
+    class Graph
+      class Node
+        KEY_FORMAT = "%s:%s:%s".freeze
+
+        attr_reader :x, :y, :z, :cost, :key, :edge_nodes
+
+        def initialize(x:, y:, z: 0, cost: 0)
+          @x = x
+          @y = y
+          @z = z
+          @cost = cost
+
+          @key = format(KEY_FORMAT, @x, @y, @z).freeze
+
+          @edge_nodes = []
+        end
+
+        def add_edge_node(node)
+          index = @edge_nodes.find_index { |n| n.key == node.key }
+
+          return if index
+
+          @edge_nodes.push(node)
+        end
+
+        def remove_edge_node(node)
+          index = @edge_nodes.find_index { |n| n.key == node.key }
+
+          return unless index
+
+          @edge_nodes.delete(index)
+        end
+
+        def inspect
+          format "#<%<class>s:%<id>#018x @key=%<key>s @cost=%<cost>s @edge_nodes=%<edge_nodes>s>",
+                 class: self.class,
+                 id: object_id << 1,
+                 key: key.inspect,
+                 cost: cost.inspect,
+                 edge_nodes: edge_nodes.map { |n| n&.key }
+        end
+      end
+
+      def initialize(nodes: {})
+        @nodes = nodes
+      end
+
+      def node(key)
+        @nodes[key]
+      end
+
+      def node_at(x, y, z = 0)
+        key = format(Node::KEY_FORMAT, x, y, z)
+        @nodes[key]
+      end
+
+      def neighbors(node)
+        node.edge_nodes
+      end
+    end
+  end
+end

data/lib/cyberarm_engine/pathfinding/graph_search.rb

@@ -0,0 +1,6 @@
+module CyberarmEngine
+  module Pathfinding
+    class GraphSearch
+    end
+  end
+end

data/lib/cyberarm_engine/pathfinding/graph_searches/astar_search.rb

@@ -0,0 +1,6 @@
+module CyberarmEngine
+  module Pathfinding
+    class AStarSearch < GraphSearch
+    end
+  end
+end

data/lib/cyberarm_engine/pathfinding/graph_searches/breadth_first_search.rb

@@ -0,0 +1,27 @@
+module CyberarmEngine
+  module Pathfinding
+    class BreadthFirstSearch < GraphSearch
+      def self.search(graph:, start:, goal: nil)
+        frontier = []
+        came_from = {}
+
+        frontier.push(start)
+        came_from[start.key] = start
+
+        while(current = frontier.shift)
+          # early exit if we reach our goal
+          break if current == goal
+
+          graph.neighbors(current).each do |neighbor|
+            next if came_from[neighbor.key]
+
+            frontier.push(neighbor)
+            came_from[neighbor.key] = current
+          end
+        end
+
+        came_from
+      end
+    end
+  end
+end

data/lib/cyberarm_engine/pathfinding/graph_searches/dijkstra_search.rb

@@ -0,0 +1,6 @@
+module CyberarmEngine
+  module Pathfinding
+    class DijkstraSearch < GraphSearch
+    end
+  end
+end

data/lib/cyberarm_engine/pathfinding/graphs/grid.rb

@@ -0,0 +1,52 @@
+module CyberarmEngine
+  module Pathfinding
+    class Grid < Graph
+      def add_node(x:, y:, z: 0, cost: 0, replace: false)
+        key = format(Node::KEY_FORMAT, x, y, z)
+        node = @nodes[key]
+
+        raise "Node at: #{key} already exists! (#{node})" if node && !replace
+
+        node = Node.new(x: x, y: y, z: z, cost: cost)
+        @nodes[key] = node
+
+        update_node_edge_nodes(node)
+        node
+      end
+
+      def remove_node(node)
+        update_node_edge_nodes(node, remove_node: true)
+
+        @nodes.delete(node.key)
+      end
+
+      def update_node_edge_nodes(node, remove_node: false)
+        x = node.x
+        y = node.y
+        z = node.z
+
+        # add node to neighbors
+        # 2D
+        left = @nodes[format(Node::KEY_FORMAT, x - 1, y, z)]
+        right = @nodes[format(Node::KEY_FORMAT, x + 1, y, z)]
+        top = @nodes[format(Node::KEY_FORMAT, x, y - 1, z)]
+        bottom = @nodes[format(Node::KEY_FORMAT, x, y + 1, z)]
+        # 3D
+        front = @nodes[format(Node::KEY_FORMAT, x, y, z - 1)]
+        back = @nodes[format(Node::KEY_FORMAT, x, y, z + 1)]
+
+        possible_edge_nodes = [left, right, top, bottom, front, back]
+
+        if remove_node
+          possible_edge_nodes.each { |n| n&.remove_edge_node(node) }
+        else
+          possible_edge_nodes.each { |n| n&.add_edge_node(node) }
+        end
+      end
+
+      def update_edge_nodes
+        @nodes.each { |k, n| update_node_edge_nodes(n) }
+      end
+    end
+  end
+end

data/lib/cyberarm_engine/result.rb

@@ -9,7 +9,7 @@ module CyberarmEngine
     end
 
     def okay?
-      !@error
+      !error?
     end
 
     def error?
@@ -17,4 +17,3 @@ module CyberarmEngine
     end
   end
 end
-