cyberarm_engine 0.24.4 → 0.24.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7d1ca43bcfb5385b9c2666d4917ac44683fcb22c44fa18b918643fab9ec16ef9
-  data.tar.gz: 62d712e673772e19f74c14d1b6a54318776848d51ac0fbf82e3b4dc581ea58bf
+  metadata.gz: 7c44575f9a8fbd0035a9c3c29f5300b346fdc9cb739342c1b6208cb8add1a676
+  data.tar.gz: '090cd515e5af9c480afb1314cddf56721a5dda85f3c7c8a7fe4c97b8faeb19f1'
 SHA512:
-  metadata.gz: '09c5d9c2d88444021f625e35bef5d4eeb06bc5791f76e80d5560b2b347212f01c6be6bee26a782ca4aea1bfdeca535b4b8020cbce08e028980faec9a55b3ce89'
-  data.tar.gz: 8e2185d8f47e3af2f0fc42106718bd64d722066a38fdfc3cf0777c3dbd4be7239443ac3f0552e26399c9791cf8297ca0ebd0066f6c1181c01553e6b01f3d74be
+  metadata.gz: 35613cc87423553e0976471dfa63559623c528d57826441eceb32bfdb58f3e7e0abeb1505895a8c9b5e2b7f1fa8814c482579a293d9816f944100c8bf01ebd46
+  data.tar.gz: 247a5aa8f53dab456b6847f1c7918e2f4ac9a42748b3cdd64c6e99ca132dbd8ae4db5c5fcd522584266ccb1c46fbad3793d8b2ad51ceeeb4499574444a764823

data/.gitignore

@@ -1,8 +1,8 @@
-/.bundle/
-/.yardoc
-/_yardoc/
-/coverage/
-/doc/
-/pkg/
-/spec/reports/
-/tmp/
+/.bundle/
+/.yardoc
+/_yardoc/
+/coverage/
+/doc/
+/pkg/
+/spec/reports/
+/tmp/

data/.rubocop.yml

@@ -1,8 +1,8 @@
-Style/StringLiterals:
-  EnforcedStyle: double_quotes
-
-Metrics/MethodLength:
-  Max: 40
-
-Style/EmptyMethod:
+Style/StringLiterals:
+  EnforcedStyle: double_quotes
+
+Metrics/MethodLength:
+  Max: 40
+
+Style/EmptyMethod:
   EnforcedStyle: expanded

data/.travis.yml

@@ -1,5 +1,5 @@
-sudo: false
-language: ruby
-rvm:
-  - 2.5.0
-before_install: gem install bundler -v 1.16.1
+sudo: false
+language: ruby
+rvm:
+  - 2.5.0
+before_install: gem install bundler -v 1.16.1

data/Gemfile

@@ -1,6 +1,6 @@
-source "https://rubygems.org"
-
-git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
-
-# Specify your gem's dependencies in cyberarm_engine.gemspec
-gemspec
+source "https://rubygems.org"
+
+git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
+
+# Specify your gem's dependencies in cyberarm_engine.gemspec
+gemspec

data/Gemfile.lock

@@ -0,0 +1,24 @@
+PATH
+  remote: .
+  specs:
+    cyberarm_engine (0.24.4)
+      gosu (~> 1.1)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    gosu (1.4.6)
+    minitest (5.25.5)
+    rake (13.2.1)
+
+PLATFORMS
+  x64-mingw-ucrt
+
+DEPENDENCIES
+  bundler (~> 2.2)
+  cyberarm_engine!
+  minitest (~> 5.0)
+  rake (~> 13.0)
+
+BUNDLED WITH
+   2.5.3

data/LICENSE.txt

@@ -1,21 +1,21 @@
-The MIT License (MIT)
-
-Copyright (c) 2018 Cyberarm
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+The MIT License (MIT)
+
+Copyright (c) 2018 Cyberarm
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/README.md

@@ -1,74 +1,74 @@
-![CyberarmEngine](https://raw.githubusercontent.com/cyberarm/cyberarm_engine/master/assets/textures/logo.png)
-
-Yet Another Game Engine On Top Of Gosu
-
-## Features
-* [Shoes-like](http://shoesrb.com) GUI support
-* OpenGL Shader support (requires [opengl-bindings](https://github.com/vaiorabbit/ruby-opengl) gem)
-* Includes classes for handling Vectors, Rays, Bounding Boxes, and Transforms
-* GameState system
-* Monolithic GameObjects
-
-## Installation
-
-Add this line to your application's Gemfile:
-
-```ruby
-gem 'cyberarm_engine'
-```
-
-And then execute:
-
-    $ bundle
-
-Or install it yourself as:
-
-    $ gem install cyberarm_engine
-
-## Usage
-
-```ruby
-require "cyberarm_engine"
-
-class Hello < CyberarmEngine::GuiState
-  def setup
-    background Gosu::Color::GRAY
-
-    stack do
-      label "Hello World!"
-
-      button "close" do
-        window.close
-      end
-    end
-  end
-end
-
-class Window < CyberarmEngine::Window
-  def setup
-    self.show_cursor = true
-
-    push_state(Hello)
-  end
-end
-
-Window.new(width: 800, height: 600, fullscreen: false, resizable: true).show
-```
-
-## Development
-
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake test` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
-
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
-
-## Contributing
-
-Bug reports and pull requests are welcome on GitHub at https://github.com/cyberarm/cyberarm_engine.
-
-## License
-
-The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).
-
-## Code of Conduct
-
-Everyone interacting in the CyberarmEngine project’s codebases, issue trackers, chat rooms and mailing lists is expected to follow the ruby moto of "Matz is nice so we are nice."
+![CyberarmEngine](https://raw.githubusercontent.com/cyberarm/cyberarm_engine/master/assets/textures/logo.png)
+
+Yet Another Game Engine On Top Of Gosu
+
+## Features
+* [Shoes-like](http://shoesrb.com) GUI support
+* OpenGL Shader support (requires [opengl-bindings](https://github.com/vaiorabbit/ruby-opengl) gem)
+* Includes classes for handling Vectors, Rays, Bounding Boxes, and Transforms
+* GameState system
+* Monolithic GameObjects
+
+## Installation
+
+Add this line to your application's Gemfile:
+
+```ruby
+gem 'cyberarm_engine'
+```
+
+And then execute:
+
+    $ bundle
+
+Or install it yourself as:
+
+    $ gem install cyberarm_engine
+
+## Usage
+
+```ruby
+require "cyberarm_engine"
+
+class Hello < CyberarmEngine::GuiState
+  def setup
+    background Gosu::Color::GRAY
+
+    stack do
+      label "Hello World!"
+
+      button "close" do
+        window.close
+      end
+    end
+  end
+end
+
+class Window < CyberarmEngine::Window
+  def setup
+    self.show_cursor = true
+
+    push_state(Hello)
+  end
+end
+
+Window.new(width: 800, height: 600, fullscreen: false, resizable: true).show
+```
+
+## Development
+
+After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake test` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+
+To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+
+## Contributing
+
+Bug reports and pull requests are welcome on GitHub at https://github.com/cyberarm/cyberarm_engine.
+
+## License
+
+The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).
+
+## Code of Conduct
+
+Everyone interacting in the CyberarmEngine project’s codebases, issue trackers, chat rooms and mailing lists is expected to follow the ruby moto of "Matz is nice so we are nice."

data/Rakefile

@@ -1,10 +1,10 @@
-require "bundler/gem_tasks"
-require "rake/testtask"
-
-Rake::TestTask.new(:test) do |t|
-  t.libs << "test"
-  t.libs << "lib"
-  t.test_files = FileList["test/**/*_test.rb"]
-end
-
-task default: :test
+require "bundler/gem_tasks"
+require "rake/testtask"
+
+Rake::TestTask.new(:test) do |t|
+  t.libs << "test"
+  t.libs << "lib"
+  t.test_files = FileList["test/**/*_test.rb"]
+end
+
+task default: :test

data/assets/shaders/fragment/g_buffer.glsl

@@ -1,30 +1,30 @@
-# version 330 core
-
-layout(location  = 0) out vec3 fragPosition;
-layout (location = 1) out vec4 fragColor;
-layout (location = 2) out vec3 fragNormal;
-layout (location = 3) out vec3 fragUV;
-
-in vec3 out_position, out_color, out_normal, out_uv, out_frag_pos, out_camera_pos;
-out vec4 outputFragColor;
-flat in int out_has_texture;
-
-uniform sampler2D diffuse_texture;
-
-void main() {
-  vec3 result;
-
-  if (out_has_texture == 0) {
-    result = out_color;
-  } else {
-    result = texture(diffuse_texture, out_uv.xy).xyz + 0.25;
-  }
-
-  fragPosition = out_position;
-  fragColor = vec4(result, 1.0);
-  fragNormal = out_normal;
-  fragUV = out_uv;
-
-  float gamma = 2.2;
-  outputFragColor.rgb = pow(fragColor.rgb, vec3(1.0 / gamma));
-}
+# version 330 core
+
+layout(location  = 0) out vec3 fragPosition;
+layout (location = 1) out vec4 fragColor;
+layout (location = 2) out vec3 fragNormal;
+layout (location = 3) out vec3 fragUV;
+
+in vec3 out_position, out_color, out_normal, out_uv, out_frag_pos, out_camera_pos;
+out vec4 outputFragColor;
+flat in int out_has_texture;
+
+uniform sampler2D diffuse_texture;
+
+void main() {
+  vec3 result;
+
+  if (out_has_texture == 0) {
+    result = out_color;
+  } else {
+    result = texture(diffuse_texture, out_uv.xy).xyz + 0.25;
+  }
+
+  fragPosition = out_position;
+  fragColor = vec4(result, 1.0);
+  fragNormal = out_normal;
+  fragUV = out_uv;
+
+  float gamma = 2.2;
+  outputFragColor.rgb = pow(fragColor.rgb, vec3(1.0 / gamma));
+}

data/assets/shaders/fragment/lighting.glsl

@@ -1,69 +1,115 @@
-#version 330 core
-out vec4 frag_color;
-
-@include "light_struct"
-const int DIRECTIONAL = 0;
-const int POINT = 1;
-const int SPOT = 2;
-
-flat in Light out_lights[7];
-in vec2 out_tex_coords;
-flat in int out_light_count;
-
-uniform sampler2D diffuse, position, texcoord, normal, depth;
-
-vec4 directionalLight(Light light) {
-  vec3 norm = normalize(texture(normal, out_tex_coords).rgb);
-  vec3 diffuse_color = texture(diffuse, out_tex_coords).rgb;
-  vec3 frag_pos = texture(position, out_tex_coords).rgb;
-
-  vec3 lightDir = normalize(light.position - frag_pos);
-  float diff = max(dot(norm, lightDir), 0);
-
-  vec3 _ambient = light.ambient;
-  vec3 _diffuse = light.diffuse * diff;
-  vec3 _specular = light.specular;
-
-  return vec4(_diffuse + _ambient + _specular, 1.0);
-}
-
-vec4 pointLight(Light light) {
-  return vec4(0.25, 0.25, 0.25, 1);
-}
-
-vec4 spotLight(Light light) {
-  return vec4(0.5, 0.5, 0.5, 1);
-}
-
-vec4 calculateLighting(Light light) {
-  vec4 result;
-
-  // switch(light.type) {
-  //   case DIRECTIONAL: {
-  //     result = directionalLight(light);
-  //   }
-  //   case SPOT: {
-  //     result = spotLight(light);
-  //   }
-  //   default: {
-  //     result = pointLight(light);
-  //   }
-  // }
-
-  if (light.type == DIRECTIONAL) {
-    result = directionalLight(light);
-  } else {
-    result = pointLight(light);
-  }
-
-  return result;
-}
-
-void main() {
-  frag_color = vec4(0.0);
-
-  for(int i = 0; i < out_light_count; i++)
-  {
-    frag_color += texture(diffuse, out_tex_coords) * calculateLighting(out_lights[i]);
-  }
-}
+#version 330 core
+@include "light_struct"
+
+out vec4 frag_color;
+
+const int DIRECTIONAL = 0;
+const int POINT = 1;
+const int SPOT = 2;
+
+in vec2 out_tex_coords;
+flat in int out_light_count;
+flat in Light out_lights[7];
+
+uniform sampler2D diffuse, position, texcoord, normal, depth;
+
+vec4 directionalLight(Light light) {
+  vec3 norm = normalize(texture(normal, out_tex_coords).rgb);
+  vec3 diffuse_color = texture(diffuse, out_tex_coords).rgb;
+  vec3 frag_pos = texture(position, out_tex_coords).rgb;
+
+  vec3 lightDir = normalize(light.position - frag_pos);
+  float diff = max(dot(norm, lightDir), 0);
+
+  vec3 _ambient = light.ambient;
+  vec3 _diffuse = light.diffuse * diff;
+  vec3 _specular = light.specular;
+
+  return vec4(_diffuse + _ambient + _specular, 1.0);
+}
+
+void main() {
+  Light light;
+  light.type = DIRECTIONAL;
+
+  light.position = vec3(100, 100, 100);
+
+  light.diffuse = vec3(0.5, 0.5, 0.5);
+  light.ambient = vec3(0.8, 0.8, 0.8);
+  light.specular = vec3(0.2, 0.2, 0.2);
+
+  light.intensity = 1.0;
+
+  frag_color = texture(diffuse, out_tex_coords) * directionalLight(light);
+}
+
+// #version 330 core
+// @include "light_struct"
+
+// out vec4 frag_color;
+
+// const int DIRECTIONAL = 0;
+// const int POINT = 1;
+// const int SPOT = 2;
+
+// in vec2 out_tex_coords;
+// flat in int out_light_count;
+// flat in Light out_lights[7];
+
+// uniform sampler2D diffuse, position, texcoord, normal, depth;
+
+// vec4 directionalLight(Light light) {
+//   vec3 norm = normalize(texture(normal, out_tex_coords).rgb);
+//   vec3 diffuse_color = texture(diffuse, out_tex_coords).rgb;
+//   vec3 frag_pos = texture(position, out_tex_coords).rgb;
+
+//   vec3 lightDir = normalize(light.position - frag_pos);
+//   float diff = max(dot(norm, lightDir), 0);
+
+//   vec3 _ambient = light.ambient;
+//   vec3 _diffuse = light.diffuse * diff;
+//   vec3 _specular = light.specular;
+
+//   return vec4(_diffuse + _ambient + _specular, 1.0);
+// }
+
+// vec4 pointLight(Light light) {
+//   return vec4(0.25, 0.25, 0.25, 1);
+// }
+
+// vec4 spotLight(Light light) {
+//   return vec4(0.5, 0.5, 0.5, 1);
+// }
+
+// vec4 calculateLighting(Light light) {
+//   vec4 result;
+
+//   // switch(light.type) {
+//   //   case DIRECTIONAL: {
+//   //     result = directionalLight(light);
+//   //   }
+//   //   case SPOT: {
+//   //     result = spotLight(light);
+//   //   }
+//   //   default: {
+//   //     result = pointLight(light);
+//   //   }
+//   // }
+
+//   if (light.type == DIRECTIONAL) {
+//     result = directionalLight(light);
+//   } else {
+//     result = pointLight(light);
+//   }
+
+//   return result;
+// }
+
+// void main() {
+//   frag_color = vec4(0.0);
+
+//   for(int i = 0; i < out_light_count; i++)
+//   {
+//     frag_color += texture(diffuse, out_tex_coords) * calculateLighting(out_lights[i]);
+//   }
+// }

data/assets/shaders/include/light_struct.glsl

@@ -1,11 +1,11 @@
-struct Light {
-  int  type;
-  vec3 direction;
-  vec3 position;
-
-  vec3 diffuse;
-  vec3 ambient;
-  vec3 specular;
-
-  float intensity;
-};
+struct Light {
+  int  type;
+  vec3 direction;
+  vec3 position;
+
+  vec3 diffuse;
+  vec3 ambient;
+  vec3 specular;
+
+  float intensity;
+};

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;
+};