cyberarm_engine 0.13.0 → 0.13.1

data/lib/cyberarm_engine/bounding_box.rb

@@ -1,150 +1,150 @@
-module CyberarmEngine
-  class BoundingBox
-    attr_accessor :min, :max
-
-    def initialize(*args)
-      case args.size
-      when 0
-        @min = Vector.new(0, 0, 0)
-        @max = Vector.new(0, 0, 0)
-      when 2
-        @min = args.first.clone
-        @max = args.last.clone
-      when 4
-        @min = Vector.new(args[0], args[1], 0)
-        @max = Vector.new(args[2], args[3], 0)
-      when 6
-        @min = Vector.new(args[0], args[1], args[2])
-        @max = Vector.new(args[3], args[4], args[5])
-      else
-        raise "Invalid number of arguments! Got: #{args.size}, expected: 0, 2, 4, or 6."
-      end
-    end
-
-    def ==(other)
-      @min == other.min &&
-      @max == other.max
-    end
-
-    # returns a new bounding box that includes both bounding boxes
-    def union(other)
-      temp = BoundingBox.new
-      temp.min.x = [@min.x, other.min.x].min
-      temp.min.y = [@min.y, other.min.y].min
-      temp.min.z = [@min.z, other.min.z].min
-
-      temp.max.x = [@max.x, other.max.x].max
-      temp.max.y = [@max.y, other.max.y].max
-      temp.max.z = [@max.z, other.max.z].max
-
-      return temp
-    end
-
-    # returns the difference between both bounding boxes
-    def difference(other)
-      temp = BoundingBox.new
-      temp.min = @min - other.min
-      temp.max = @max - other.max
-
-      return temp
-    end
-
-    # returns whether bounding box intersects other
-    def intersect?(other)
-      if other.is_a?(Ray)
-        other.intersect?(self)
-      elsif other.is_a?(BoundingBox)
-        (@min.x <= other.max.x && @max.x >= other.min.x) &&
-        (@min.y <= other.max.y && @max.y >= other.min.y) &&
-        (@min.z <= other.max.z && @max.z >= other.min.z)
-      else
-        raise "Unknown collider: #{other.class}"
-      end
-    end
-
-    # does this bounding box envelop other bounding box? (inclusive of border)
-    def contains?(other)
-      other.min.x >= min.x && other.min.y >= min.y && other.min.z >= min.z &&
-      other.max.x <= max.x && other.max.y <= max.y && other.max.z <= max.z
-    end
-
-    # returns whether the 3D vector is inside of the bounding box
-    def inside?(vector)
-      (vector.x.between?(@min.x, @max.x) || vector.x.between?(@max.x, @min.x)) &&
-      (vector.y.between?(@min.y, @max.y) || vector.y.between?(@max.y, @min.y)) &&
-      (vector.z.between?(@min.z, @max.z) || vector.z.between?(@max.z, @min.z))
-    end
-
-    # returns whether the 2D vector is inside of the bounding box
-    def point?(vector)
-      (vector.x.between?(@min.x, @max.x) || vector.x.between?(@max.x, @min.x)) &&
-      (vector.y.between?(@min.y, @max.y) || vector.y.between?(@max.y, @min.y))
-    end
-
-    def volume
-      width * height * depth
-    end
-
-    def width
-      @max.x - @min.x
-    end
-
-    def height
-      @max.y - @min.y
-    end
-
-    def depth
-      @max.z - @min.z
-    end
-
-    def normalize(entity)
-      temp = BoundingBox.new
-      temp.min.x = @min.x.to_f * entity.scale.x
-      temp.min.y = @min.y.to_f * entity.scale.y
-      temp.min.z = @min.z.to_f * entity.scale.z
-
-      temp.max.x = @max.x.to_f * entity.scale.x
-      temp.max.y = @max.y.to_f * entity.scale.y
-      temp.max.z = @max.z.to_f * entity.scale.z
-
-      return temp
-    end
-
-    def normalize_with_offset(entity)
-      temp = BoundingBox.new
-      temp.min.x = @min.x.to_f * entity.scale.x + entity.position.x
-      temp.min.y = @min.y.to_f * entity.scale.y + entity.position.y
-      temp.min.z = @min.z.to_f * entity.scale.z + entity.position.z
-
-      temp.max.x = @max.x.to_f * entity.scale.x + entity.position.x
-      temp.max.y = @max.y.to_f * entity.scale.y + entity.position.y
-      temp.max.z = @max.z.to_f * entity.scale.z + entity.position.z
-
-      return temp
-    end
-
-    def +(other)
-      box = BoundingBox.new
-      box.min = self.min + other.min
-      box.min = self.max + other.max
-
-      return box
-    end
-
-    def -(other)
-      box = BoundingBox.new
-      box.min = self.min - other.min
-      box.min = self.max - other.max
-
-      return box
-    end
-
-    def sum
-      @min.sum + @max.sum
-    end
-
-    def clone
-      BoundingBox.new(@min.x, @min.y, @min.z, @max.x, @max.y, @max.z)
-    end
-  end
+module CyberarmEngine
+  class BoundingBox
+    attr_accessor :min, :max
+
+    def initialize(*args)
+      case args.size
+      when 0
+        @min = Vector.new(0, 0, 0)
+        @max = Vector.new(0, 0, 0)
+      when 2
+        @min = args.first.clone
+        @max = args.last.clone
+      when 4
+        @min = Vector.new(args[0], args[1], 0)
+        @max = Vector.new(args[2], args[3], 0)
+      when 6
+        @min = Vector.new(args[0], args[1], args[2])
+        @max = Vector.new(args[3], args[4], args[5])
+      else
+        raise "Invalid number of arguments! Got: #{args.size}, expected: 0, 2, 4, or 6."
+      end
+    end
+
+    def ==(other)
+      @min == other.min &&
+      @max == other.max
+    end
+
+    # returns a new bounding box that includes both bounding boxes
+    def union(other)
+      temp = BoundingBox.new
+      temp.min.x = [@min.x, other.min.x].min
+      temp.min.y = [@min.y, other.min.y].min
+      temp.min.z = [@min.z, other.min.z].min
+
+      temp.max.x = [@max.x, other.max.x].max
+      temp.max.y = [@max.y, other.max.y].max
+      temp.max.z = [@max.z, other.max.z].max
+
+      return temp
+    end
+
+    # returns the difference between both bounding boxes
+    def difference(other)
+      temp = BoundingBox.new
+      temp.min = @min - other.min
+      temp.max = @max - other.max
+
+      return temp
+    end
+
+    # returns whether bounding box intersects other
+    def intersect?(other)
+      if other.is_a?(Ray)
+        other.intersect?(self)
+      elsif other.is_a?(BoundingBox)
+        (@min.x <= other.max.x && @max.x >= other.min.x) &&
+        (@min.y <= other.max.y && @max.y >= other.min.y) &&
+        (@min.z <= other.max.z && @max.z >= other.min.z)
+      else
+        raise "Unknown collider: #{other.class}"
+      end
+    end
+
+    # does this bounding box envelop other bounding box? (inclusive of border)
+    def contains?(other)
+      other.min.x >= min.x && other.min.y >= min.y && other.min.z >= min.z &&
+      other.max.x <= max.x && other.max.y <= max.y && other.max.z <= max.z
+    end
+
+    # returns whether the 3D vector is inside of the bounding box
+    def inside?(vector)
+      (vector.x.between?(@min.x, @max.x) || vector.x.between?(@max.x, @min.x)) &&
+      (vector.y.between?(@min.y, @max.y) || vector.y.between?(@max.y, @min.y)) &&
+      (vector.z.between?(@min.z, @max.z) || vector.z.between?(@max.z, @min.z))
+    end
+
+    # returns whether the 2D vector is inside of the bounding box
+    def point?(vector)
+      (vector.x.between?(@min.x, @max.x) || vector.x.between?(@max.x, @min.x)) &&
+      (vector.y.between?(@min.y, @max.y) || vector.y.between?(@max.y, @min.y))
+    end
+
+    def volume
+      width * height * depth
+    end
+
+    def width
+      @max.x - @min.x
+    end
+
+    def height
+      @max.y - @min.y
+    end
+
+    def depth
+      @max.z - @min.z
+    end
+
+    def normalize(entity)
+      temp = BoundingBox.new
+      temp.min.x = @min.x.to_f * entity.scale.x
+      temp.min.y = @min.y.to_f * entity.scale.y
+      temp.min.z = @min.z.to_f * entity.scale.z
+
+      temp.max.x = @max.x.to_f * entity.scale.x
+      temp.max.y = @max.y.to_f * entity.scale.y
+      temp.max.z = @max.z.to_f * entity.scale.z
+
+      return temp
+    end
+
+    def normalize_with_offset(entity)
+      temp = BoundingBox.new
+      temp.min.x = @min.x.to_f * entity.scale.x + entity.position.x
+      temp.min.y = @min.y.to_f * entity.scale.y + entity.position.y
+      temp.min.z = @min.z.to_f * entity.scale.z + entity.position.z
+
+      temp.max.x = @max.x.to_f * entity.scale.x + entity.position.x
+      temp.max.y = @max.y.to_f * entity.scale.y + entity.position.y
+      temp.max.z = @max.z.to_f * entity.scale.z + entity.position.z
+
+      return temp
+    end
+
+    def +(other)
+      box = BoundingBox.new
+      box.min = self.min + other.min
+      box.min = self.max + other.max
+
+      return box
+    end
+
+    def -(other)
+      box = BoundingBox.new
+      box.min = self.min - other.min
+      box.min = self.max - other.max
+
+      return box
+    end
+
+    def sum
+      @min.sum + @max.sum
+    end
+
+    def clone
+      BoundingBox.new(@min.x, @min.y, @min.z, @max.x, @max.y, @max.z)
+    end
+  end
 end

data/lib/cyberarm_engine/common.rb

@@ -1,96 +1,96 @@
-module CyberarmEngine
-  module Common
-    def push_state(klass, options={})
-      window.push_state(klass, options)
-    end
-
-    def current_state
-      window.current_state
-    end
-
-    def previous_state
-      window.previous_state
-    end
-
-    def pop_state
-      window.pop_state
-    end
-
-    def show_cursor
-      window.show_cursor
-    end
-
-    def show_cursor=boolean
-      window.show_cursor = boolean
-    end
-
-    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)
-      draw_rect(0, 0, window.width, window.height, color, z)
-    end
-
-    def lighten(color, amount = 25)
-      if defined?(color.alpha)
-        return Gosu::Color.rgba(color.red + amount, color.green + amount, color.blue + amount, color.alpha)
-      else
-        return Gosu::Color.rgb(color.red + amount, color.green + amount, color.blue + amount)
-      end
-    end
-
-    def darken(color, amount = 25)
-      if defined?(color.alpha)
-        return Gosu::Color.rgba(color.red - amount, color.green - amount, color.blue - amount, color.alpha)
-      else
-        return Gosu::Color.rgb(color.red - amount, color.green - amount, color.blue - amount)
-      end
-    end
-
-    def opacity(color, ratio = 1.0)
-      alpha = 255 * ratio
-
-      return Gosu::Color.rgba(color.red, color.green, color.blue, alpha)
-    end
-
-    def get_asset(path, hash, klass, retro = false, tileable = false)
-      asset = nil
-      hash.detect do |_asset, instance|
-        if _asset == path
-          asset = instance
-          true
-        end
-      end
-
-      unless asset
-        instance = nil
-        if klass == Gosu::Image
-          instance = klass.new(path, retro: retro, tileable: tileable)
-        else
-          instance = klass.new(path)
-        end
-        hash[path] = instance
-        asset = instance
-      end
-
-      return asset
-    end
-
-    def get_image(path, retro: false, tileable: false)
-      get_asset(path, Engine::IMAGES, Gosu::Image, retro, tileable)
-    end
-
-    def get_sample(path)
-      get_asset(path, Engine::SAMPLES, Gosu::Sample)
-    end
-
-    def get_song(path)
-      get_asset(path, Engine::SONGS, Gosu::Song)
-    end
-
-    def window
-      $window
-    end
-  end
-end
+module CyberarmEngine
+  module Common
+    def push_state(klass, options={})
+      window.push_state(klass, options)
+    end
+
+    def current_state
+      window.current_state
+    end
+
+    def previous_state
+      window.previous_state
+    end
+
+    def pop_state
+      window.pop_state
+    end
+
+    def show_cursor
+      window.show_cursor
+    end
+
+    def show_cursor=boolean
+      window.show_cursor = boolean
+    end
+
+    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)
+      draw_rect(0, 0, window.width, window.height, color, z)
+    end
+
+    def lighten(color, amount = 25)
+      if defined?(color.alpha)
+        return Gosu::Color.rgba(color.red + amount, color.green + amount, color.blue + amount, color.alpha)
+      else
+        return Gosu::Color.rgb(color.red + amount, color.green + amount, color.blue + amount)
+      end
+    end
+
+    def darken(color, amount = 25)
+      if defined?(color.alpha)
+        return Gosu::Color.rgba(color.red - amount, color.green - amount, color.blue - amount, color.alpha)
+      else
+        return Gosu::Color.rgb(color.red - amount, color.green - amount, color.blue - amount)
+      end
+    end
+
+    def opacity(color, ratio = 1.0)
+      alpha = 255 * ratio
+
+      return Gosu::Color.rgba(color.red, color.green, color.blue, alpha)
+    end
+
+    def get_asset(path, hash, klass, retro = false, tileable = false)
+      asset = nil
+      hash.detect do |_asset, instance|
+        if _asset == path
+          asset = instance
+          true
+        end
+      end
+
+      unless asset
+        instance = nil
+        if klass == Gosu::Image
+          instance = klass.new(path, retro: retro, tileable: tileable)
+        else
+          instance = klass.new(path)
+        end
+        hash[path] = instance
+        asset = instance
+      end
+
+      return asset
+    end
+
+    def get_image(path, retro: false, tileable: false)
+      get_asset(path, Engine::IMAGES, Gosu::Image, retro, tileable)
+    end
+
+    def get_sample(path)
+      get_asset(path, Engine::SAMPLES, Gosu::Sample)
+    end
+
+    def get_song(path)
+      get_asset(path, Engine::SONGS, Gosu::Song)
+    end
+
+    def window
+      $window
+    end
+  end
+end