cyberarm_engine 0.24.4 → 0.24.5

data/assets/shaders/vertex/g_buffer.glsl

@@ -1,28 +1,28 @@
-# version 330 core
-
-layout(location = 0) in vec3 in_position;
-layout(location = 1) in vec3 in_color;
-layout(location = 2) in vec3 in_normal;
-layout(location = 3) in vec3 in_uv;
-
-uniform mat4 projection, view, model;
-uniform int has_texture;
-uniform vec3 camera_pos;
-
-out vec3 out_position, out_color, out_normal, out_uv;
-out vec3 out_frag_pos, out_view_pos, out_camera_pos;
-flat out int out_has_texture;
-
-void main() {
-  // projection * view * model * position
-  out_position = in_position;
-  out_color = in_color;
-  out_normal= normalize(transpose(inverse(mat3(model))) * in_normal);
-  out_uv    = in_uv;
-  out_has_texture = has_texture;
-  out_camera_pos = camera_pos;
-
-  out_frag_pos = vec3(model * vec4(in_position, 1.0));
-
-  gl_Position = projection * view * model * vec4(in_position, 1.0);
-}
+#version 330 core
+
+layout(location = 0) in vec3 in_position;
+layout(location = 1) in vec3 in_color;
+layout(location = 2) in vec3 in_normal;
+layout(location = 3) in vec3 in_uv;
+
+uniform mat4 projection, view, model;
+uniform int has_texture;
+uniform vec3 camera_pos;
+
+out vec3 out_position, out_color, out_normal, out_uv;
+out vec3 out_frag_pos, out_view_pos, out_camera_pos;
+flat out int out_has_texture;
+
+void main() {
+  // projection * view * model * position
+  out_position = in_position;
+  out_color = in_color;
+  out_normal= normalize(transpose(inverse(mat3(model))) * in_normal);
+  out_uv    = in_uv;
+  out_has_texture = has_texture;
+  out_camera_pos = camera_pos;
+
+  out_frag_pos = vec3(model * vec4(in_position, 1.0));
+
+  gl_Position = projection * view * model * vec4(in_position, 1.0);
+}

data/assets/shaders/vertex/lighting.glsl

@@ -1,24 +1,24 @@
-#version 330 core
-@include "light_struct"
-
-layout (location = 0) in vec3 in_position;
-layout (location = 1) in vec2 in_tex_coords;
-
-uniform sampler2D diffuse, position, texcoord, normal, depth;
-uniform int light_count;
-uniform Light lights[7];
-
-out vec2 out_tex_coords;
-flat out int out_light_count;
-flat out Light out_lights[7];
-
-void main() {
-  gl_Position = vec4(in_position.x, in_position.y, in_position.z, 1.0);
-  out_tex_coords = in_tex_coords;
-  out_light_count = light_count;
-
-  for(int i = 0; i < light_count; i++)
-  {
-    out_lights[i] = lights[i];
-  }
-}
+#version 330 core
+@include "light_struct"
+
+layout (location = 0) in vec3 in_position;
+layout (location = 1) in vec2 in_tex_coords;
+
+uniform sampler2D diffuse, position, texcoord, normal, depth;
+uniform int light_count;
+uniform Light lights[7];
+
+out vec2 out_tex_coords;
+flat out int out_light_count;
+flat out Light out_lights[7];
+
+void main() {
+  gl_Position = vec4(in_position.x, in_position.y, in_position.z, 1.0);
+  out_tex_coords = in_tex_coords;
+  out_light_count = light_count;
+
+  for(int i = 0; i < light_count; i++)
+  {
+    out_lights[i] = lights[i];
+  }
+}

data/bin/console

@@ -1,14 +1,14 @@
-#!/usr/bin/env ruby
-
-require "bundler/setup"
-require "cyberarm_engine"
-
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
-
-# (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
-
-require "irb"
-IRB.start(__FILE__)
+#!/usr/bin/env ruby
+
+require "bundler/setup"
+require "cyberarm_engine"
+
+# You can add fixtures and/or initialization code here to make experimenting
+# with your gem easier. You can also use a different console, if you like.
+
+# (If you use this, don't forget to add pry to your Gemfile!)
+# require "pry"
+# Pry.start
+
+require "irb"
+IRB.start(__FILE__)

data/bin/setup

@@ -1,8 +1,8 @@
-#!/usr/bin/env bash
-set -euo pipefail
-IFS=$'\n\t'
-set -vx
-
-bundle install
-
-# Do any other automated setup that you need to do here
+#!/usr/bin/env bash
+set -euo pipefail
+IFS=$'\n\t'
+set -vx
+
+bundle install
+
+# Do any other automated setup that you need to do here

data/cyberarm_engine.gemspec

@@ -1,36 +1,36 @@
-lib = File.expand_path("lib", __dir__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require "cyberarm_engine/version"
-
-Gem::Specification.new do |spec|
-  spec.name          = "cyberarm_engine"
-  spec.version       = CyberarmEngine::VERSION
-  spec.authors       = ["Cyberarm"]
-  spec.email         = ["matthewlikesrobots@gmail.com"]
-
-  spec.summary       = "Make games quickly and easily with gosu"
-  spec.description   = "Yet another game making framework around gosu"
-  spec.homepage      = "https://github.com/cyberarm/cyberarm_engine"
-  spec.license       = "MIT"
-
-  if spec.respond_to?(:metadata)
-    spec.metadata["allowed_push_host"] = "https://rubygems.org"
-  else
-    raise "RubyGems 2.0 or newer is required to protect against " \
-      "public gem pushes."
-  end
-
-  spec.files = `git ls-files -z`.split("\x0").reject do |f|
-    f.match(%r{^(test|spec|features)/})
-  end
-  spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  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 "minitest", "~> 5.0"
-  spec.add_development_dependency "rake", "~> 13.0"
-end
+lib = File.expand_path("lib", __dir__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require "cyberarm_engine/version"
+
+Gem::Specification.new do |spec|
+  spec.name          = "cyberarm_engine"
+  spec.version       = CyberarmEngine::VERSION
+  spec.authors       = ["Cyberarm"]
+  spec.email         = ["matthewlikesrobots@gmail.com"]
+
+  spec.summary       = "Make games quickly and easily with gosu"
+  spec.description   = "Yet another game making framework around gosu"
+  spec.homepage      = "https://github.com/cyberarm/cyberarm_engine"
+  spec.license       = "MIT"
+
+  if spec.respond_to?(:metadata)
+    spec.metadata["allowed_push_host"] = "https://rubygems.org"
+  else
+    raise "RubyGems 2.0 or newer is required to protect against " \
+      "public gem pushes."
+  end
+
+  spec.files = `git ls-files -z`.split("\x0").reject do |f|
+    f.match(%r{^(test|spec|features)/})
+  end
+  spec.bindir        = "exe"
+  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  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 "minitest", "~> 5.0"
+  spec.add_development_dependency "rake", "~> 13.0"
+end

data/lib/cyberarm_engine/animator.rb

@@ -1,219 +1,219 @@
-module CyberarmEngine
-  class Animator
-    def initialize(start_time:, duration:, from:, to:, tween: :linear, &block)
-      @start_time = start_time
-      @duration = duration
-      @from = from.dup
-      @to = to.dup
-      @tween = tween
-      @block = block
-    end
-
-    def update
-      @block.call(self, @from, @to) if @block
-    end
-
-    def progress
-      ((Gosu.milliseconds - @start_time) / @duration.to_f).clamp(0.0, 1.0)
-    end
-
-    def complete?
-      progress >= 1.0
-    end
-
-    def transition(from = @from, to = @to, tween = @tween)
-      from + (to - from) * send("tween_#{tween}", progress)
-    end
-
-    def color_transition(from = @from, to = @to, _tween = @tween)
-      r = transition(from.red, to.red)
-      g = transition(from.green, to.green)
-      b = transition(from.blue, to.blue)
-      a = transition(from.alpha, to.alpha)
-
-      Gosu::Color.rgba(r, g, b, a)
-    end
-
-    def color_hsv_transition(from = @from, to = @to, tween = @tween)
-      hue = transition(from.hue, to.hue, tween)
-      saturation = transition(from.saturation, to.saturation, tween)
-      value = transition(from.value, to.value, tween)
-      alpha = transition(from.alpha, to.alpha, tween)
-
-      Gosu::Color.from_ahsv(alpha, hue, saturation, value)
-    end
-
-    # Tween functions based on those provided here: https://github.com/danro/easing-js/blob/master/easing.js
-    # Under MIT / BSD
-
-    def tween_linear(t)
-      t
-    end
-
-    def tween_ease_in_quad(t)
-      t ** 2
-    end
-
-    def tween_ease_out_quad(t)
-      -((t - 1) ** 2) -1
-    end
-
-    def tween_ease_in_out_quad(t)
-      return 0.5 * (t ** 2) if (t /= 0.5) < 1
-      return -0.5 * ((t -= 2) * t - 2)
-    end
-
-    def tween_ease_in_cubic(t)
-      t ** 3
-    end
-
-    def tween_ease_out_cubic(t)
-      ((t - 1) ** 3) + 1
-    end
-
-    def tween_ease_in_out_cubic(t)
-      return 0.5 * (t ** 3) if ((t /= 0.5) < 1)
-      return 0.5 * ((t - 2) ** 3) + 2
-    end
-
-    def tween_ease_in_quart(t)
-      t ** 4
-    end
-
-    def tween_ease_out_quart(t)
-      -((t - 1) ** 4) - 1
-    end
-
-    def tween_ease_in_out_quart(t)
-      return 0.5 * (t ** 4) if ((t /= 0.5) < 1)
-      return -0.5 * ((t -= 2) * (t ** 3) - 2)
-    end
-
-    def tween_ease_in_quint(t)
-      t ** 5
-    end
-
-    def tween_ease_out_quint(t)
-      ((t - 1) ** 5) + 1
-    end
-
-    def tween_ease_in_out_quint(t)
-      return 0.5 * (t ** 5) if ((t /= 0.5) < 1)
-      return 0.5 * ((t - 2) ** 5) + 2
-    end
-
-    def tween_ease_in(t) # sine
-      -Math.cos(t * (Math::PI / 2)) + 1
-    end
-
-    def tween_ease_out(t) # sine
-      Math.sin(t * (Math::PI / 2))
-    end
-
-    def tween_ease_in_out(t) # sine
-      (-0.5 * (Math.cos(Math::PI * t) - 1))
-    end
-
-    def tween_ease_in_expo(t)
-      (t == 0) ? 0 : 2 ** 10 * (t - 1)
-    end
-
-    def tween_ease_out_expo(t)
-      (t == 1) ? 1 : -(2 ** -10 * t) + 1
-    end
-
-    def tween_ease_in_out_expo(t)
-      return 0 if (t == 0)
-      return 1 if (t == 1)
-      return 0.5 * (2 ** 10 * (t - 1)) if ((t /= 0.5) < 1)
-      return 0.5 * (-(2 ** -10 * (t -= 1)) + 2)
-    end
-
-    def tween_ease_in_circ(t)
-      -(Math.sqrt(1 - (t * t)) - 1)
-    end
-
-    def tween_ease_out_circ(t)
-      Math.sqrt(1 - ((t - 1) ** 2))
-    end
-
-    def tween_ease_in_out_circ(t)
-      return -0.5 * (Math.sqrt(1 - t * t) - 1) if ((t /= 0.5) < 1)
-      return 0.5 * (Math.sqrt(1 - (t -= 2) * t) + 1)
-    end
-
-    def tween_ease_in_back(t)
-      s = 1.70158
-      t * t * ((s + 1) * t - s)
-    end
-
-    def tween_ease_out_back(t)
-      s = 1.70158
-      (t = t - 1) * t * ((s + 1) * t + s) + 1
-    end
-
-    def tween_ease_in_out_back(t)
-      s = 1.70158
-      return 0.5 * (t * t * (((s *= (1.525)) + 1) * t - s)) if ((t /= 0.5) < 1)
-      return 0.5 * ((t -= 2) * t * (((s *= (1.525)) + 1) * t + s) + 2)
-    end
-
-    def tween_elastic(t)
-      -1 * (4 ** (-8 * t)) * Math.sin((t * 6 - 1) * (2 * Math::PI) / 2) + 1
-    end
-
-    def tween_swing_from_to(t)
-      s = 1.70158
-      return 0.5 * (t * t * (((s *= (1.525)) + 1) * t - s)) if (t /= 0.5) < 1
-      return 0.5 * ((t -= 2) * t * (((s *= (1.525)) + 1) * t + s) + 2)
-    end
-
-    def tween_swing_from(t)
-      s = 1.70158;
-      t * t * ((s + 1) * t - s)
-    end
-
-    def tween_swing_to(t)
-      s = 1.70158
-      (t -= 1) * t * ((s + 1) * t + s) + 1
-    end
-
-    def tween_bounce(t)
-      if (t < (1 / 2.75))
-        (7.5625 * t * t)
-      elsif (t < (2 / 2.75))
-        (7.5625 * (t -= (1.5 / 2.75)) * t + 0.75)
-      elsif (t < (2.5 / 2.75))
-        (7.5625 * (t -= (2.25 / 2.75)) * t + 0.9375)
-      else
-        (7.5625 * (t -= (2.625 / 2.75)) * t + 0.984375)
-      end
-    end
-
-    def tween_bounce_past(t)
-      if (t < (1 / 2.75))
-        # missing "2 -"?
-        (7.5625 * t * t)
-      elsif (t < (2 / 2.75))
-        2 - (7.5625 * (t -= (1.5 / 2.75)) * t + 0.75)
-      elsif (t < (2.5 / 2.75))
-        2 - (7.5625 * (t -= (2.25 / 2.75)) * t + 0.9375)
-      else
-        2 - (7.5625 * (t -= (2.625 / 2.75)) * t + 0.984375)
-      end
-    end
-
-    def tween_ease_from_to(t)
-      return 0.5 * (t ** 4) if ((t /= 0.5) < 1)
-      return -0.5 * ((t -= 2) * (t ** 3) - 2)
-    end
-
-    def tween_ease_from(t)
-      t ** 4
-    end
-
-    def tween_ease_to(t)
-      t ** 0.25
-    end
-  end
-end
+module CyberarmEngine
+  class Animator
+    def initialize(start_time:, duration:, from:, to:, tween: :linear, &block)
+      @start_time = start_time
+      @duration = duration
+      @from = from.dup
+      @to = to.dup
+      @tween = tween
+      @block = block
+    end
+
+    def update
+      @block.call(self, @from, @to) if @block
+    end
+
+    def progress
+      ((Gosu.milliseconds - @start_time) / @duration.to_f).clamp(0.0, 1.0)
+    end
+
+    def complete?
+      progress >= 1.0
+    end
+
+    def transition(from = @from, to = @to, tween = @tween)
+      from + (to - from) * send("tween_#{tween}", progress)
+    end
+
+    def color_transition(from = @from, to = @to, _tween = @tween)
+      r = transition(from.red, to.red)
+      g = transition(from.green, to.green)
+      b = transition(from.blue, to.blue)
+      a = transition(from.alpha, to.alpha)
+
+      Gosu::Color.rgba(r, g, b, a)
+    end
+
+    def color_hsv_transition(from = @from, to = @to, tween = @tween)
+      hue = transition(from.hue, to.hue, tween)
+      saturation = transition(from.saturation, to.saturation, tween)
+      value = transition(from.value, to.value, tween)
+      alpha = transition(from.alpha, to.alpha, tween)
+
+      Gosu::Color.from_ahsv(alpha, hue, saturation, value)
+    end
+
+    # Tween functions based on those provided here: https://github.com/danro/easing-js/blob/master/easing.js
+    # Under MIT / BSD
+
+    def tween_linear(t)
+      t
+    end
+
+    def tween_ease_in_quad(t)
+      t ** 2
+    end
+
+    def tween_ease_out_quad(t)
+      -((t - 1) ** 2) -1
+    end
+
+    def tween_ease_in_out_quad(t)
+      return 0.5 * (t ** 2) if (t /= 0.5) < 1
+      return -0.5 * ((t -= 2) * t - 2)
+    end
+
+    def tween_ease_in_cubic(t)
+      t ** 3
+    end
+
+    def tween_ease_out_cubic(t)
+      ((t - 1) ** 3) + 1
+    end
+
+    def tween_ease_in_out_cubic(t)
+      return 0.5 * (t ** 3) if ((t /= 0.5) < 1)
+      return 0.5 * ((t - 2) ** 3) + 2
+    end
+
+    def tween_ease_in_quart(t)
+      t ** 4
+    end
+
+    def tween_ease_out_quart(t)
+      -((t - 1) ** 4) - 1
+    end
+
+    def tween_ease_in_out_quart(t)
+      return 0.5 * (t ** 4) if ((t /= 0.5) < 1)
+      return -0.5 * ((t -= 2) * (t ** 3) - 2)
+    end
+
+    def tween_ease_in_quint(t)
+      t ** 5
+    end
+
+    def tween_ease_out_quint(t)
+      ((t - 1) ** 5) + 1
+    end
+
+    def tween_ease_in_out_quint(t)
+      return 0.5 * (t ** 5) if ((t /= 0.5) < 1)
+      return 0.5 * ((t - 2) ** 5) + 2
+    end
+
+    def tween_ease_in(t) # sine
+      -Math.cos(t * (Math::PI / 2)) + 1
+    end
+
+    def tween_ease_out(t) # sine
+      Math.sin(t * (Math::PI / 2))
+    end
+
+    def tween_ease_in_out(t) # sine
+      (-0.5 * (Math.cos(Math::PI * t) - 1))
+    end
+
+    def tween_ease_in_expo(t)
+      (t == 0) ? 0 : 2 ** 10 * (t - 1)
+    end
+
+    def tween_ease_out_expo(t)
+      (t == 1) ? 1 : -(2 ** -10 * t) + 1
+    end
+
+    def tween_ease_in_out_expo(t)
+      return 0 if (t == 0)
+      return 1 if (t == 1)
+      return 0.5 * (2 ** 10 * (t - 1)) if ((t /= 0.5) < 1)
+      return 0.5 * (-(2 ** -10 * (t -= 1)) + 2)
+    end
+
+    def tween_ease_in_circ(t)
+      -(Math.sqrt(1 - (t * t)) - 1)
+    end
+
+    def tween_ease_out_circ(t)
+      Math.sqrt(1 - ((t - 1) ** 2))
+    end
+
+    def tween_ease_in_out_circ(t)
+      return -0.5 * (Math.sqrt(1 - t * t) - 1) if ((t /= 0.5) < 1)
+      return 0.5 * (Math.sqrt(1 - (t -= 2) * t) + 1)
+    end
+
+    def tween_ease_in_back(t)
+      s = 1.70158
+      t * t * ((s + 1) * t - s)
+    end
+
+    def tween_ease_out_back(t)
+      s = 1.70158
+      (t = t - 1) * t * ((s + 1) * t + s) + 1
+    end
+
+    def tween_ease_in_out_back(t)
+      s = 1.70158
+      return 0.5 * (t * t * (((s *= (1.525)) + 1) * t - s)) if ((t /= 0.5) < 1)
+      return 0.5 * ((t -= 2) * t * (((s *= (1.525)) + 1) * t + s) + 2)
+    end
+
+    def tween_elastic(t)
+      -1 * (4 ** (-8 * t)) * Math.sin((t * 6 - 1) * (2 * Math::PI) / 2) + 1
+    end
+
+    def tween_swing_from_to(t)
+      s = 1.70158
+      return 0.5 * (t * t * (((s *= (1.525)) + 1) * t - s)) if (t /= 0.5) < 1
+      return 0.5 * ((t -= 2) * t * (((s *= (1.525)) + 1) * t + s) + 2)
+    end
+
+    def tween_swing_from(t)
+      s = 1.70158;
+      t * t * ((s + 1) * t - s)
+    end
+
+    def tween_swing_to(t)
+      s = 1.70158
+      (t -= 1) * t * ((s + 1) * t + s) + 1
+    end
+
+    def tween_bounce(t)
+      if (t < (1 / 2.75))
+        (7.5625 * t * t)
+      elsif (t < (2 / 2.75))
+        (7.5625 * (t -= (1.5 / 2.75)) * t + 0.75)
+      elsif (t < (2.5 / 2.75))
+        (7.5625 * (t -= (2.25 / 2.75)) * t + 0.9375)
+      else
+        (7.5625 * (t -= (2.625 / 2.75)) * t + 0.984375)
+      end
+    end
+
+    def tween_bounce_past(t)
+      if (t < (1 / 2.75))
+        # missing "2 -"?
+        (7.5625 * t * t)
+      elsif (t < (2 / 2.75))
+        2 - (7.5625 * (t -= (1.5 / 2.75)) * t + 0.75)
+      elsif (t < (2.5 / 2.75))
+        2 - (7.5625 * (t -= (2.25 / 2.75)) * t + 0.9375)
+      else
+        2 - (7.5625 * (t -= (2.625 / 2.75)) * t + 0.984375)
+      end
+    end
+
+    def tween_ease_from_to(t)
+      return 0.5 * (t ** 4) if ((t /= 0.5) < 1)
+      return -0.5 * ((t -= 2) * (t ** 3) - 2)
+    end
+
+    def tween_ease_from(t)
+      t ** 4
+    end
+
+    def tween_ease_to(t)
+      t ** 0.25
+    end
+  end
+end