cyberarm_engine 0.24.5 → 0.25.0

data/lib/cyberarm_engine/game_state.rb

@@ -1,124 +1,124 @@
-module CyberarmEngine
-  class GameState
-    include Common
-
-    attr_accessor :options, :global_pause
-    attr_reader :game_objects
-
-    def initialize(options = {})
-      @options = options
-      @game_objects = []
-      @global_pause = false
-      window.text_input = nil unless options[:preserve_text_input]
-
-      @down_keys = {}
-    end
-
-    def setup
-    end
-
-    # Called immediately after setup returns.
-    # GuiState uses this to set current_theme for ToolTip
-    def post_setup
-    end
-
-    def draw
-      @game_objects.each(&:draw)
-    end
-
-    def update
-      @game_objects.each(&:update)
-    end
-
-    def needs_redraw?
-      true
-    end
-
-    def needs_repaint?
-      true
-    end
-
-    def drop(filename)
-    end
-
-    def gamepad_connected(index)
-    end
-
-    def gamepad_disconnected(index)
-    end
-
-    def gain_focus
-    end
-
-    def lose_focus
-    end
-
-    def button_down(id)
-      @down_keys[id] = true
-
-      @game_objects.each do |o|
-        o.button_down(id)
-      end
-    end
-
-    def button_up(id)
-      @down_keys.delete(id)
-
-      @game_objects.each do |o|
-        o.button_up(id)
-      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
-  end
-end
+module CyberarmEngine
+  class GameState
+    include Common
+
+    attr_accessor :options, :global_pause
+    attr_reader :game_objects
+
+    def initialize(options = {})
+      @options = options
+      @game_objects = []
+      @global_pause = false
+      window.text_input = nil unless options[:preserve_text_input]
+
+      @down_keys = {}
+    end
+
+    def setup
+    end
+
+    # Called immediately after setup returns.
+    # GuiState uses this to set current_theme for ToolTip
+    def post_setup
+    end
+
+    def draw
+      @game_objects.each(&:draw)
+    end
+
+    def update
+      @game_objects.each(&:update)
+    end
+
+    def needs_redraw?
+      true
+    end
+
+    def needs_repaint?
+      true
+    end
+
+    def drop(filename)
+    end
+
+    def gamepad_connected(index)
+    end
+
+    def gamepad_disconnected(index)
+    end
+
+    def gain_focus
+    end
+
+    def lose_focus
+    end
+
+    def button_down(id)
+      @down_keys[id] = true
+
+      @game_objects.each do |o|
+        o.button_down(id)
+      end
+    end
+
+    def button_up(id)
+      @down_keys.delete(id)
+
+      @game_objects.each do |o|
+        o.button_up(id)
+      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
+  end
+end

data/lib/cyberarm_engine/gosu_ext/draw_arc.rb

@@ -1,98 +1,111 @@
-module Gosu
-  # Draw an arc around the point x and y.
-  #
-  # Color accepts the following: *Gosu::Color*, *Array* (with 2 colors), or a *Hash* with keys: _from:_ and _to:_ both colors.
-  #
-  # With a *Gosu::Color* the arc will be painted with color
-  #
-  # With an *Array* the first *Gosu::Color* with be the innermost color and the last *Gosu::Color* with be the outermost color
-  #
-  # With a *Hash* the arc will smoothly transition from the start of the arc to the end
-  # @example
-  #   # Using a Hash
-  #   Gosu.draw_arc(100, 100, 50, 0.5, 128, 4, {from: Gosu::Color::BLUE, to: Gosu::Color::GREEN}, 0, :default)
-  #
-  #   # Using an Array
-  #   Gosu.draw_arc(100, 100, 50, 0.5, 128, 4, [Gosu::Color::BLUE, Gosu::Color::GREEN], 0, :default)
-  #
-  #   # Using a Gosu::Color
-  #   Gosu.draw_arc(100, 100, 50, 0.5, 128, 4, Gosu::Color::BLUE, 0, :default)
-  #
-  #
-  # @param x X position.
-  # @param y Y position.
-  # @param radius radius of arc, in pixels.
-  # @param percentage how complete the segment is, _0.0_ is 0% and _1.0_ is 100%.
-  # @param segments how many segments for arc, more will appear smoother, less will appear jagged.
-  # @param thickness how thick arc will be.
-  # @param color [Gosu::Color, Array<Gosu::Color, Gosu::Color>, Hash{from: start_color, to: end_color}] color or colors to draw the arc with.
-  # @param z Z position.
-  # @param mode blend mode.
-  #
-  # @note _thickness_ is subtracted from radius, meaning that the arc will grow towards the origin, not away from it.
-  #
-  # @return [void]
-  def self.draw_arc(x, y, radius, percentage = 1.0, segments = 128, thickness = 4, color = Gosu::Color::WHITE, z = 0, mode = :default)
-    segments = 360.0 / segments
-
-    return if percentage == 0.0
-
-    0.step((359 * percentage), percentage > 0 ? segments : -segments) do |angle|
-      angle2 = angle + segments
-
-      point_a_left_x = x + Gosu.offset_x(angle, radius - thickness)
-      point_a_left_y = y + Gosu.offset_y(angle, radius - thickness)
-
-      point_a_right_x = x + Gosu.offset_x(angle2, radius - thickness)
-      point_a_right_y = y + Gosu.offset_y(angle2, radius - thickness)
-
-      point_b_left_x = x + Gosu.offset_x(angle, radius)
-      point_b_left_y = y + Gosu.offset_y(angle, radius)
-
-      point_b_right_x = x + Gosu.offset_x(angle2, radius)
-      point_b_right_y = y + Gosu.offset_y(angle2, radius)
-
-      if color.is_a?(Array)
-        Gosu.draw_quad(
-          point_a_left_x, point_a_left_y, color.first,
-          point_b_left_x, point_b_left_y, color.last,
-          point_a_right_x, point_a_right_y, color.first,
-          point_b_right_x, point_b_right_y, color.last,
-          z, mode
-        )
-      elsif color.is_a?(Hash)
-        start_color = color[:from]
-        end_color = color[:to]
-
-        color_a = Gosu::Color.rgba(
-          (end_color.red - start_color.red) * (angle / 360.0) + start_color.red,
-          (end_color.green - start_color.green) * (angle / 360.0) + start_color.green,
-          (end_color.blue - start_color.blue) * (angle / 360.0) + start_color.blue,
-          (end_color.alpha - start_color.alpha) * (angle / 360.0) + start_color.alpha,
-        )
-        color_b = Gosu::Color.rgba(
-          (end_color.red - start_color.red) * (angle2 / 360.0) + start_color.red,
-          (end_color.green - start_color.green) * (angle2 / 360.0) + start_color.green,
-          (end_color.blue - start_color.blue) * (angle2 / 360.0) + start_color.blue,
-          (end_color.alpha - start_color.alpha) * (angle2 / 360.0) + start_color.alpha,
-        )
-
-        Gosu.draw_quad(
-          point_a_left_x, point_a_left_y, color_a,
-          point_b_left_x, point_b_left_y, color_a,
-          point_a_right_x, point_a_right_y, color_b,
-          point_b_right_x, point_b_right_y, color_b,
-          z, mode
-        )
-      else
-        Gosu.draw_quad(
-          point_a_left_x, point_a_left_y, color,
-          point_b_left_x, point_b_left_y, color,
-          point_a_right_x, point_a_right_y, color,
-          point_b_right_x, point_b_right_y, color,
-          z, mode
-        )
-      end
-    end
-  end
-end
+module Gosu
+  # Draw an arc around the point x and y.
+  #
+  # Color accepts the following: *Gosu::Color*, *Array* (with 2 colors), or a *Hash* with keys: _from:_ and _to:_ both colors.
+  #
+  # With a *Gosu::Color* the arc will be painted with color
+  #
+  # With an *Array* the first *Gosu::Color* with be the innermost color and the last *Gosu::Color* with be the outermost color
+  #
+  # With a *Hash* the arc will smoothly transition from the start of the arc to the end
+  # @example
+  #   # Using a Hash
+  #   Gosu.draw_arc(100, 100, 50, 0.5, 128, 4, {from: Gosu::Color::BLUE, to: Gosu::Color::GREEN}, 0, :default)
+  #
+  #   # Using an Array
+  #   Gosu.draw_arc(100, 100, 50, 0.5, 128, 4, [Gosu::Color::BLUE, Gosu::Color::GREEN], 0, :default)
+  #
+  #   # Using a Gosu::Color
+  #   Gosu.draw_arc(100, 100, 50, 0.5, 128, 4, Gosu::Color::BLUE, 0, :default)
+  #
+  #
+  # @param x X position.
+  # @param y Y position.
+  # @param radius radius of arc, in pixels.
+  # @param percentage how complete the segment is, _0.0_ is 0% and _1.0_ is 100%.
+  # @param segments how many segments for arc, more will appear smoother, less will appear jagged.
+  # @param thickness how thick arc will be.
+  # @param color [Gosu::Color, Array<Gosu::Color, Gosu::Color>, Hash{from: start_color, to: end_color}] color or colors to draw the arc with.
+  # @param z Z position.
+  # @param mode blend mode.
+  #
+  # @note _thickness_ is subtracted from radius, meaning that the arc will grow towards the origin, not away from it.
+  #
+  # @return [void]
+  def self.draw_arc(x, y, radius, percentage = 1.0, segments = 128, thickness = 4, color = Gosu::Color::WHITE, z = 0, mode = :default)
+    return if percentage == 0.0
+
+    angle_per_segment = 360.0 / segments
+    arc_completion = 360 * percentage
+    next_segment_angle = angle_per_segment
+
+    angle = 0
+    loop do
+      break if angle >= arc_completion
+
+      if angle + angle_per_segment > arc_completion
+        next_segment_angle = arc_completion - angle
+      else
+        next_segment_angle = angle_per_segment
+      end
+
+      angle2 = angle + next_segment_angle
+
+      point_a_left_x = x + Gosu.offset_x(angle, radius - thickness)
+      point_a_left_y = y + Gosu.offset_y(angle, radius - thickness)
+
+      point_a_right_x = x + Gosu.offset_x(angle2, radius - thickness)
+      point_a_right_y = y + Gosu.offset_y(angle2, radius - thickness)
+
+      point_b_left_x = x + Gosu.offset_x(angle, radius)
+      point_b_left_y = y + Gosu.offset_y(angle, radius)
+
+      point_b_right_x = x + Gosu.offset_x(angle2, radius)
+      point_b_right_y = y + Gosu.offset_y(angle2, radius)
+
+      if color.is_a?(Array)
+        Gosu.draw_quad(
+          point_a_left_x, point_a_left_y, color.first,
+          point_b_left_x, point_b_left_y, color.last,
+          point_a_right_x, point_a_right_y, color.first,
+          point_b_right_x, point_b_right_y, color.last,
+          z, mode
+        )
+      elsif color.is_a?(Hash)
+        start_color = color[:from]
+        end_color = color[:to]
+
+        color_a = Gosu::Color.rgba(
+          (end_color.red - start_color.red) * (angle / 360.0) + start_color.red,
+          (end_color.green - start_color.green) * (angle / 360.0) + start_color.green,
+          (end_color.blue - start_color.blue) * (angle / 360.0) + start_color.blue,
+          (end_color.alpha - start_color.alpha) * (angle / 360.0) + start_color.alpha,
+        )
+        color_b = Gosu::Color.rgba(
+          (end_color.red - start_color.red) * (angle2 / 360.0) + start_color.red,
+          (end_color.green - start_color.green) * (angle2 / 360.0) + start_color.green,
+          (end_color.blue - start_color.blue) * (angle2 / 360.0) + start_color.blue,
+          (end_color.alpha - start_color.alpha) * (angle2 / 360.0) + start_color.alpha,
+        )
+
+        Gosu.draw_quad(
+          point_a_left_x, point_a_left_y, color_a,
+          point_b_left_x, point_b_left_y, color_a,
+          point_a_right_x, point_a_right_y, color_b,
+          point_b_right_x, point_b_right_y, color_b,
+          z, mode
+        )
+      else
+        Gosu.draw_quad(
+          point_a_left_x, point_a_left_y, color,
+          point_b_left_x, point_b_left_y, color,
+          point_a_right_x, point_a_right_y, color,
+          point_b_right_x, point_b_right_y, color,
+          z, mode
+        )
+      end
+
+      angle += next_segment_angle
+    end
+  end
+end

data/lib/cyberarm_engine/gosu_ext/draw_circle.rb

@@ -1,31 +1,31 @@
-module Gosu
-  ##
-  # Draw a filled circled around point X and Y.
-  #
-  # @param x X position.
-  # @param y Y position.
-  # @param radius radius of circle, in pixels.
-  # @param step_size resolution of circle, more steps will apear smoother, less will appear jagged.
-  # @param color color to draw circle with.
-  # @param mode blend mode.
-  #
-  # @return [void]
-  def self.draw_circle(x, y, radius, step_size = 36, color = Gosu::Color::WHITE, z = 0, mode = :default)
-    step_size = (360.0 / step_size).floor
-
-    0.step(359, step_size) do |angle|
-      angle2 = angle + step_size
-
-      point_lx = x + Gosu.offset_x(angle, radius)
-      point_ly = y + Gosu.offset_y(angle, radius)
-      point_rx = x + Gosu.offset_x(angle2, radius)
-      point_ry = y + Gosu.offset_y(angle2, radius)
-
-      Gosu.draw_triangle(
-        point_lx, point_ly, color,
-	      point_rx, point_ry, color,
-	      x, y, color, z, mode
-      )
-    end
-  end
+module Gosu
+  ##
+  # Draw a filled circled around point X and Y.
+  #
+  # @param x X position.
+  # @param y Y position.
+  # @param radius radius of circle, in pixels.
+  # @param step_size resolution of circle, more steps will apear smoother, less will appear jagged.
+  # @param color color to draw circle with.
+  # @param mode blend mode.
+  #
+  # @return [void]
+  def self.draw_circle(x, y, radius, step_size = 36, color = Gosu::Color::WHITE, z = 0, mode = :default)
+    step_size = (360.0 / step_size).floor
+
+    0.step(359, step_size) do |angle|
+      angle2 = angle + step_size
+
+      point_lx = x + Gosu.offset_x(angle, radius)
+      point_ly = y + Gosu.offset_y(angle, radius)
+      point_rx = x + Gosu.offset_x(angle2, radius)
+      point_ry = y + Gosu.offset_y(angle2, radius)
+
+      Gosu.draw_triangle(
+        point_lx, point_ly, color,
+	      point_rx, point_ry, color,
+	      x, y, color, z, mode
+      )
+    end
+  end
 end

data/lib/cyberarm_engine/gosu_ext/draw_path.rb

@@ -1,17 +1,17 @@
-module Gosu
-  PathNode = Struct.new(:x, :y)
-
-  def self.draw_path(nodes, color = Gosu::Color::WHITE, z = 0, mode = :default)
-    last_node = nodes.first
-
-    nodes[1..nodes.size - 1].each do |current_node|
-      Gosu.draw_line(
-        last_node.x, last_node.y, color,
-        current_node.x, current_node.y, color,
-        z, mode
-      )
-
-      last_node = current_node
-    end
-  end
-end
+module Gosu
+  PathNode = Struct.new(:x, :y)
+
+  def self.draw_path(nodes, color = Gosu::Color::WHITE, z = 0, mode = :default)
+    last_node = nodes.first
+
+    nodes[1..nodes.size - 1].each do |current_node|
+      Gosu.draw_line(
+        last_node.x, last_node.y, color,
+        current_node.x, current_node.y, color,
+        z, mode
+      )
+
+      last_node = current_node
+    end
+  end
+end

data/lib/cyberarm_engine/model/material.rb

@@ -1,21 +1,21 @@
-module CyberarmEngine
-  class Model
-    class Material
-      attr_accessor :name, :ambient, :diffuse, :specular
-      attr_reader :texture_id
-
-      def initialize(name)
-        @name    = name
-        @ambient = Color.new(1, 1, 1, 1)
-        @diffuse = Color.new(1, 1, 1, 1)
-        @specular = Color.new(1, 1, 1, 1)
-        @texture = nil
-        @texture_id = nil
-      end
-
-      def set_texture(texture_path)
-        @texture_id = Texture.new(path: texture_path).id
-      end
-    end
-  end
-end
+module CyberarmEngine
+  class Model
+    class Material
+      attr_accessor :name, :ambient, :diffuse, :specular
+      attr_reader :texture_id
+
+      def initialize(name)
+        @name    = name
+        @ambient = Color.new(1, 1, 1, 1)
+        @diffuse = Color.new(1, 1, 1, 1)
+        @specular = Color.new(1, 1, 1, 1)
+        @texture = nil
+        @texture_id = nil
+      end
+
+      def set_texture(texture_path)
+        @texture_id = Texture.new(path: texture_path).id
+      end
+    end
+  end
+end