cyberarm_engine 0.25.0 → 0.30.0

data/assets/shaders/include/material_struct.glsl

@@ -1,16 +1,16 @@
-struct Material {
-  vec3 color;
-  vec3 roughness;
-  vec3 metalic;
-  vec3 specular;
-
-  bool use_color_texture;
-  bool use_roughness_texture;
-  bool use_metalic_texture;
-  bool use_specular_texture;
-
-  sampler2D color_tex;
-  sampler2D roughness_tex;
-  sampler2D metalic_tex;
-  sampler2D specular_tex;
-};
+struct Material {
+  vec3 color;
+  vec3 roughness;
+  vec3 metalic;
+  vec3 specular;
+
+  bool use_color_texture;
+  bool use_roughness_texture;
+  bool use_metalic_texture;
+  bool use_specular_texture;
+
+  sampler2D color_tex;
+  sampler2D roughness_tex;
+  sampler2D metalic_tex;
+  sampler2D specular_tex;
+};

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,35 @@
-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_development_dependency "bundler", "~> 4"
+  spec.add_development_dependency "minitest", "~> 5.0"
+  spec.add_development_dependency "rake", "~> 13.0"
+end