cyberarm_engine 0.24.3 → 0.24.5

data/lib/cyberarm_engine/opengl/texture.rb

@@ -1,69 +1,69 @@
-module CyberarmEngine
-  class Texture
-    DEFAULT_TEXTURE = "#{CYBERARM_ENGINE_ROOT_PATH}/assets/textures/default.png".freeze
-
-    CACHE = {}
-
-    def self.release_textures
-      CACHE.values.each do |id|
-        glDeleteTextures(id)
-      end
-    end
-
-    def self.from_cache(path, retro)
-      CACHE.dig("#{path}?retro=#{retro}")
-    end
-
-    attr_reader :id
-
-    def initialize(path: nil, image: nil, retro: false)
-      raise "keyword :path or :image must be provided!" if path.nil? && image.nil?
-
-      @retro = retro
-      @path = path
-
-      if @path
-        unless File.exist?(@path)
-          warn "Missing texture at: #{@path}"
-          @retro = true # override retro setting
-          @path = DEFAULT_TEXTURE
-        end
-
-        if texture = Texture.from_cache(@path, @retro)
-          @id = texture.id
-          return
-        end
-
-        image = load_image(@path)
-        @id = create_from_image(image)
-      else
-        @id = create_from_image(image)
-      end
-    end
-
-    def load_image(path)
-      CACHE["#{path}?retro=#{@retro}"] = self
-      Gosu::Image.new(path, retro: @retro)
-    end
-
-    def create_from_image(image)
-      array_of_pixels = image.to_blob
-
-      tex_names_buf = " " * 4
-      glGenTextures(1, tex_names_buf)
-      texture_id = tex_names_buf.unpack1("L2")
-
-      glBindTexture(GL_TEXTURE_2D, texture_id)
-      glTexImage2D(GL_TEXTURE_2D, 0, GL_SRGB_ALPHA, image.width, image.height, 0, GL_RGBA, GL_UNSIGNED_BYTE, array_of_pixels)
-      glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT)
-      glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT)
-      glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST) if @retro
-      glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR) unless @retro
-      glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR)
-      glGenerateMipmap(GL_TEXTURE_2D)
-      gl_error?
-
-      texture_id
-    end
-  end
-end
+module CyberarmEngine
+  class Texture
+    DEFAULT_TEXTURE = "#{CYBERARM_ENGINE_ROOT_PATH}/assets/textures/default.png".freeze
+
+    CACHE = {}
+
+    def self.release_textures
+      CACHE.values.each do |id|
+        glDeleteTextures(id)
+      end
+    end
+
+    def self.from_cache(path, retro)
+      CACHE.dig("#{path}?retro=#{retro}")
+    end
+
+    attr_reader :id
+
+    def initialize(path: nil, image: nil, retro: false)
+      raise "keyword :path or :image must be provided!" if path.nil? && image.nil?
+
+      @retro = retro
+      @path = path
+
+      if @path
+        unless File.exist?(@path)
+          warn "Missing texture at: #{@path}"
+          @retro = true # override retro setting
+          @path = DEFAULT_TEXTURE
+        end
+
+        if texture = Texture.from_cache(@path, @retro)
+          @id = texture.id
+          return
+        end
+
+        image = load_image(@path)
+        @id = create_from_image(image)
+      else
+        @id = create_from_image(image)
+      end
+    end
+
+    def load_image(path)
+      CACHE["#{path}?retro=#{@retro}"] = self
+      Gosu::Image.new(path, retro: @retro)
+    end
+
+    def create_from_image(image)
+      array_of_pixels = image.to_blob
+
+      tex_names_buf = " " * 4
+      glGenTextures(1, tex_names_buf)
+      texture_id = tex_names_buf.unpack1("L2")
+
+      glBindTexture(GL_TEXTURE_2D, texture_id)
+      glTexImage2D(GL_TEXTURE_2D, 0, GL_SRGB_ALPHA, image.width, image.height, 0, GL_RGBA, GL_UNSIGNED_BYTE, array_of_pixels)
+      glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT)
+      glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT)
+      glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST) if @retro
+      glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR) unless @retro
+      glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR)
+      glGenerateMipmap(GL_TEXTURE_2D)
+      gl_error?
+
+      texture_id
+    end
+  end
+end

data/lib/cyberarm_engine/opengl.rb

@@ -1,40 +1,53 @@
-begin
-  require "opengl"
-rescue LoadError
-  puts "Required gem is not installed, please install 'opengl-bindings' and try again."
-  exit(1)
-end
-
-module CyberarmEngine
-  def gl_error?
-    e = glGetError
-    if e != GL_NO_ERROR
-      warn "OpenGL error detected by handler at: #{caller[0]}"
-      warn "    #{gluErrorString(e)} (#{e})\n"
-      exit if Window.instance&.exit_on_opengl_error?
-    end
-  end
-
-  def preload_default_shaders
-    shaders = %w[g_buffer lighting]
-    shaders.each do |shader|
-      Shader.new(
-        name: shader,
-        includes_dir: "#{CYBERARM_ENGINE_ROOT_PATH}/assets/shaders/include",
-        vertex: "#{CYBERARM_ENGINE_ROOT_PATH}/assets/shaders/vertex/#{shader}.glsl",
-        fragment: "#{CYBERARM_ENGINE_ROOT_PATH}/assets/shaders/fragment/#{shader}.glsl"
-      )
-    end
-  end
-end
-
-require_relative "opengl/shader"
-require_relative "opengl/texture"
-require_relative "opengl/light"
-require_relative "opengl/perspective_camera"
-require_relative "opengl/orthographic_camera"
-
-require_relative "opengl/renderer/g_buffer"
-require_relative "opengl/renderer/bounding_box_renderer"
-require_relative "opengl/renderer/opengl_renderer"
-require_relative "opengl/renderer/renderer"
+begin
+  require "opengl"
+  require "glu"
+rescue LoadError
+  puts "Required gem is not installed, please install 'opengl-bindings' and try again."
+  exit(1)
+end
+
+module CyberarmEngine
+  def gl_error?
+    e = glGetError
+    if e != OpenGL::GL_NO_ERROR
+      warn "OpenGL error detected by handler at: #{caller[0]}"
+      warn "    #{gluErrorString(e)} (#{e})\n"
+      exit if Window.instance&.exit_on_opengl_error?
+    end
+  end
+
+  def preload_default_shaders
+    shaders = %w[g_buffer lighting]
+    shaders.each do |shader|
+      Shader.new(
+        name: shader,
+        includes_dir: "#{CYBERARM_ENGINE_ROOT_PATH}/assets/shaders/include",
+        vertex: "#{CYBERARM_ENGINE_ROOT_PATH}/assets/shaders/vertex/#{shader}.glsl",
+        fragment: "#{CYBERARM_ENGINE_ROOT_PATH}/assets/shaders/fragment/#{shader}.glsl"
+      )
+    end
+  end
+end
+
+require_relative "opengl/shader"
+require_relative "opengl/texture"
+require_relative "opengl/light"
+require_relative "opengl/perspective_camera"
+require_relative "opengl/orthographic_camera"
+
+require_relative "opengl/renderer/g_buffer"
+require_relative "opengl/renderer/bounding_box_renderer"
+require_relative "opengl/renderer/opengl_renderer"
+require_relative "opengl/renderer/renderer"
+
+require_relative "trees/aabb_tree_debug"
+require_relative "trees/aabb_node"
+require_relative "trees/aabb_tree"
+
+require_relative "model"
+require_relative "model_cache"
+require_relative "model/material"
+require_relative "model/mesh"
+require_relative "model/parser"
+require_relative "model/parsers/wavefront_parser"
+require_relative "model/parsers/collada_parser" if RUBY_ENGINE != "mruby" && defined?(Nokogiri)

data/lib/cyberarm_engine/ray.rb

@@ -1,56 +1,56 @@
-module CyberarmEngine
-  class Ray
-    def initialize(origin, direction, range = Float::INFINITY)
-      raise "Origin must be a Vector!" unless origin.is_a?(Vector)
-      raise "Direction must be a Vector!" unless direction.is_a?(Vector)
-
-      @origin = origin
-      @direction = direction
-      @range = range
-
-      @inverse_direction = @direction.inverse
-    end
-
-    def intersect?(intersectable)
-      if intersectable.is_a?(BoundingBox)
-        intersect_bounding_box?(intersectable)
-      else
-        raise NotImplementedError, "Ray intersection test for #{intersectable.class} not implemented."
-      end
-    end
-
-    # Based on: https://tavianator.com/fast-branchless-raybounding-box-intersections/
-    def intersect_bounding_box?(box)
-      tmin = -@range
-      tmax = @range
-
-      tx1 = (box.min.x - @origin.x) * @inverse_direction.x
-      tx2 = (box.max.x - @origin.x) * @inverse_direction.x
-
-      tmin = max(tmin, min(tx1, tx2))
-      tmax = min(tmax, max(tx1, tx2))
-
-      ty1 = (box.min.y - @origin.y) * @inverse_direction.y
-      ty2 = (box.max.y - @origin.y) * @inverse_direction.y
-
-      tmin = max(tmin, min(ty1, ty2))
-      tmax = min(tmax, max(ty1, ty2))
-
-      tz1 = (box.min.z - @origin.z) * @inverse_direction.z
-      tz2 = (box.max.z - @origin.z) * @inverse_direction.z
-
-      tmin = max(tmin, min(tz1, tz2))
-      tmax = min(tmax, max(tz1, tz2))
-
-      tmax >= max(tmin, 0.0)
-    end
-
-    def min(x, y)
-      ((x) < (y) ? x : y)
-    end
-
-    def max(x, y)
-      ((x) > (y) ? x : y)
-    end
-  end
-end
+module CyberarmEngine
+  class Ray
+    def initialize(origin, direction, range = Float::INFINITY)
+      raise "Origin must be a Vector!" unless origin.is_a?(Vector)
+      raise "Direction must be a Vector!" unless direction.is_a?(Vector)
+
+      @origin = origin
+      @direction = direction
+      @range = range
+
+      @inverse_direction = @direction.inverse
+    end
+
+    def intersect?(intersectable)
+      if intersectable.is_a?(BoundingBox)
+        intersect_bounding_box?(intersectable)
+      else
+        raise NotImplementedError, "Ray intersection test for #{intersectable.class} not implemented."
+      end
+    end
+
+    # Based on: https://tavianator.com/fast-branchless-raybounding-box-intersections/
+    def intersect_bounding_box?(box)
+      tmin = -@range
+      tmax = @range
+
+      tx1 = (box.min.x - @origin.x) * @inverse_direction.x
+      tx2 = (box.max.x - @origin.x) * @inverse_direction.x
+
+      tmin = max(tmin, min(tx1, tx2))
+      tmax = min(tmax, max(tx1, tx2))
+
+      ty1 = (box.min.y - @origin.y) * @inverse_direction.y
+      ty2 = (box.max.y - @origin.y) * @inverse_direction.y
+
+      tmin = max(tmin, min(ty1, ty2))
+      tmax = min(tmax, max(ty1, ty2))
+
+      tz1 = (box.min.z - @origin.z) * @inverse_direction.z
+      tz2 = (box.max.z - @origin.z) * @inverse_direction.z
+
+      tmin = max(tmin, min(tz1, tz2))
+      tmax = min(tmax, max(tz1, tz2))
+
+      tmax >= max(tmin, 0.0)
+    end
+
+    def min(x, y)
+      ((x) < (y) ? x : y)
+    end
+
+    def max(x, y)
+      ((x) > (y) ? x : y)
+    end
+  end
+end