cyberarm_engine 0.19.0 → 0.19.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
-
-      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
-
-      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
-
-      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
-
-      temp
-    end
-
-    def +(other)
-      box = BoundingBox.new
-      box.min = min + other.min
-      box.min = max + other.max
-
-      box
-    end
-
-    def -(other)
-      box = BoundingBox.new
-      box.min = min - other.min
-      box.min = max - other.max
-
-      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
+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
+
+      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
+
+      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
+
+      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
+
+      temp
+    end
+
+    def +(other)
+      box = BoundingBox.new
+      box.min = min + other.min
+      box.min = max + other.max
+
+      box
+    end
+
+    def -(other)
+      box = BoundingBox.new
+      box.min = min - other.min
+      box.min = max - other.max
+
+      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/builtin/intro_state.rb

@@ -1,131 +1,131 @@
-module CyberarmEngine
-  class IntroState < CyberarmEngine::GameState
-    def setup
-      @display_width  = 800
-      @display_height = 600
-
-      @title_size = 56
-      @caption_size = 24
-
-      @title = CyberarmEngine::Text.new("", size: @title_size, shadow_color: 0xaa_222222)
-      @caption = CyberarmEngine::Text.new("", size: @caption_size, shadow_color: 0xaa_222222)
-
-      @spacer_width = 256
-      @spacer_height = 6
-      @padding = 6
-
-      @cyberarm_engine_logo = get_image "#{CYBERARM_ENGINE_ROOT_PATH}/assets/textures/logo.png"
-
-      @gosu_logo = generate_proxy("Gosu",     "Game Library",         0xff_111111)
-      @ruby_logo = generate_proxy("Ruby",     "Programming Language", 0xff_880000)
-      @opengl_logo = generate_proxy("OpenGL", "Graphics API",         0xff_5586a4) if defined?(OpenGL)
-
-      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
-      ]
-    end
-
-    def draw
-      Gosu.draw_rect(0, 0, window.width, window.height, 0xff_222222)
-
-      scale = (@display_width - @padding * 2).to_f / @cyberarm_engine_logo.width * @animators.last.transition
-
-      @cyberarm_engine_logo.draw_rot(
-        window.width / 2,
-        (window.height) / 2 - @cyberarm_engine_logo.height / 2 - @padding * 2,
-        2,
-        0,
-        0.5,
-        0.5,
-        scale,
-        scale
-      )
-
-      Gosu.draw_rect(
-        window.width / 2 - (@display_width / 2 + @padding),
-        window.height / 2 - @spacer_height / 2,
-        @display_width + @padding,
-        @spacer_height * @animators[0].transition,
-        Gosu::Color::WHITE
-      )
-
-      @title.x = window.width / 2 - @title.text_width / 2
-      @title.y = (window.height / 2 + (@spacer_height / 2) + @padding) * @animators[1].transition
-      @title.text = "Powered By"
-
-      Gosu.clip_to(0, window.height / 2 + (@spacer_height / 2), window.width, @title.height) do
-        @title.draw
-      end
-
-      y = @title.y + @title.height * 2
-
-      Gosu.clip_to(0, y, window.width, @gosu_logo.height) do
-        Gosu.translate(@opengl_logo.nil? ? @ruby_logo.width / 2 : 0, 0) do
-          @gosu_logo.draw(
-            window.width.to_f / 2 - @ruby_logo.width / 2 - (@ruby_logo.width - @padding),
-            y * @animators[2].transition,
-            2
-          )
-          @ruby_logo.draw(
-            window.width.to_f / 2 - @ruby_logo.width / 2,
-            y * @animators[3].transition,
-            2
-          )
-          @opengl_logo&.draw(
-            window.width.to_f / 2 - @ruby_logo.width / 2 + (@ruby_logo.width - @padding),
-            y * @animators[4].transition,
-            2
-          )
-        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
-      @animators.each(&:update)
-
-      return unless Gosu.milliseconds - @born_time >= @continue_after
-
-      pop_state
-      push_state(@options[:forward], @options[:forward_options] || {}) if @options[:forward]
-    end
-
-    def button_down(_id)
-      @continue_after = 0
-    end
-
-    def generate_proxy(title, caption, color_hint)
-      @title.text = title
-      @caption.text = caption
-
-      width = @spacer_width + 2 * @padding
-      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.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.y = @padding + @title_size + @padding + @spacer_height + @padding
-        @caption.draw
-      end
-    end
-  end
+module CyberarmEngine
+  class IntroState < CyberarmEngine::GameState
+    def setup
+      @display_width  = 800
+      @display_height = 600
+
+      @title_size = 56
+      @caption_size = 24
+
+      @title = CyberarmEngine::Text.new("", size: @title_size, shadow_color: 0xaa_222222)
+      @caption = CyberarmEngine::Text.new("", size: @caption_size, shadow_color: 0xaa_222222)
+
+      @spacer_width = 256
+      @spacer_height = 6
+      @padding = 6
+
+      @cyberarm_engine_logo = get_image "#{CYBERARM_ENGINE_ROOT_PATH}/assets/textures/logo.png"
+
+      @gosu_logo = generate_proxy("Gosu",     "Game Library",         0xff_111111)
+      @ruby_logo = generate_proxy("Ruby",     "Programming Language", 0xff_880000)
+      @opengl_logo = generate_proxy("OpenGL", "Graphics API",         0xff_5586a4) if defined?(OpenGL)
+
+      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
+      ]
+    end
+
+    def draw
+      Gosu.draw_rect(0, 0, window.width, window.height, 0xff_222222)
+
+      scale = (@display_width - @padding * 2).to_f / @cyberarm_engine_logo.width * @animators.last.transition
+
+      @cyberarm_engine_logo.draw_rot(
+        window.width / 2,
+        (window.height) / 2 - @cyberarm_engine_logo.height / 2 - @padding * 2,
+        2,
+        0,
+        0.5,
+        0.5,
+        scale,
+        scale
+      )
+
+      Gosu.draw_rect(
+        window.width / 2 - (@display_width / 2 + @padding),
+        window.height / 2 - @spacer_height / 2,
+        @display_width + @padding,
+        @spacer_height * @animators[0].transition,
+        Gosu::Color::WHITE
+      )
+
+      @title.x = window.width / 2 - @title.text_width / 2
+      @title.y = (window.height / 2 + (@spacer_height / 2) + @padding) * @animators[1].transition
+      @title.text = "Powered By"
+
+      Gosu.clip_to(0, window.height / 2 + (@spacer_height / 2), window.width, @title.height) do
+        @title.draw
+      end
+
+      y = @title.y + @title.height * 2
+
+      Gosu.clip_to(0, y, window.width, @gosu_logo.height) do
+        Gosu.translate(@opengl_logo.nil? ? @ruby_logo.width / 2 : 0, 0) do
+          @gosu_logo.draw(
+            window.width.to_f / 2 - @ruby_logo.width / 2 - (@ruby_logo.width - @padding),
+            y * @animators[2].transition,
+            2
+          )
+          @ruby_logo.draw(
+            window.width.to_f / 2 - @ruby_logo.width / 2,
+            y * @animators[3].transition,
+            2
+          )
+          @opengl_logo&.draw(
+            window.width.to_f / 2 - @ruby_logo.width / 2 + (@ruby_logo.width - @padding),
+            y * @animators[4].transition,
+            2
+          )
+        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
+      @animators.each(&:update)
+
+      return unless Gosu.milliseconds - @born_time >= @continue_after
+
+      pop_state
+      push_state(@options[:forward], @options[:forward_options] || {}) if @options[:forward]
+    end
+
+    def button_down(_id)
+      @continue_after = 0
+    end
+
+    def generate_proxy(title, caption, color_hint)
+      @title.text = title
+      @caption.text = caption
+
+      width = @spacer_width + 2 * @padding
+      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.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.y = @padding + @title_size + @padding + @spacer_height + @padding
+        @caption.draw
+      end
+    end
+  end
 end