mittsu 0.3.1 → 0.4.0

data/lib/mittsu/math/triangle.rb

@@ -1,5 +1,3 @@
-require 'mittsu/math'
-
 module Mittsu
   class Triangle
     attr_accessor :a, :b, :c
@@ -73,7 +71,7 @@ module Mittsu
 
       result_length_sq = target.length_sq
       if (result_length_sq > 0)
-        target.multiply_scalar(1.0 / Math.sqrt(result_length_sq))
+        target.multiply_scalar(1.0 / ::Math.sqrt(result_length_sq))
       else
         target.set(0.0, 0.0, 0.0)
       end

data/lib/mittsu/math/vector.rb

@@ -160,7 +160,7 @@ module Mittsu
     end
 
     def length
-      Math.sqrt(length_sq)
+      ::Math.sqrt(length_sq)
     end
 
     def normalize
@@ -211,11 +211,11 @@ module Mittsu
       theta = self.dot(v) / (self.length * v.length)
 
       # clamp, to handle numerical problems
-      Math.acos(Math.clamp(theta, -1.0, 1.0))
+      ::Math.acos(Math.clamp(theta, -1.0, 1.0))
     end
 
     def distance_to(v)
-      Math.sqrt(self.distance_to_squared(v))
+      ::Math.sqrt(self.distance_to_squared(v))
     end
 
     def ==(v)

data/lib/mittsu/math/vector2.rb

@@ -1,4 +1,3 @@
-require 'mittsu/math'
 require 'mittsu/math/vector'
 
 module Mittsu

data/lib/mittsu/math/vector3.rb

@@ -1,4 +1,3 @@
-require 'mittsu/math'
 require 'mittsu/math/vector'
 
 module Mittsu
@@ -188,6 +187,114 @@ module Mittsu
       self
     end
 
+    def set_scalar(scalar)
+      set(scalar, scalar, scalar)
+
+      self
+    end
+
+    def set_component(index, value)
+      _x, _y, _z = *@elements
+
+      case index
+      when 0
+        set(value, _y, _z)
+      when 1
+        set(_x, value, _z)
+      when 2
+        set(_x, _y, value)
+      else
+        raise ArgumentError, "index is out of range: #{index}"
+      end
+
+      self
+    end
+
+    def get_component(index)
+      _x, _y, _z = *@elements
+
+      case index
+      when 0
+        return _x
+      when 1
+        return _y
+      when 2
+        return _z
+      else
+        raise ArgumentError, "index is out of range: #{index}"
+      end
+    end
+
+    def add_scaled_vector(vector, scalar)
+      set(vector.x * scalar, vector.y * scalar, vector.z * scalar)
+
+      self
+    end
+
+    def set_from_spherical(sphere)
+      set_from_spherical_coords(sphere.radius, sphere.phi, sphere.theta)
+    end
+
+    def set_from_spherical_coords(radius, phi, theta)
+      sin_phi_radius = ::Math.sin(phi) * radius
+      set(sin_phi_radius * ::Math.sin(theta), ::Math.cos(phi) * radius, sin_phi_radius * ::Math.cos(theta))
+
+      self
+    end
+
+    def set_from_cylindrical(cylinder)
+      set_from_cylindrical_coords(cylinder.radius, cylinder.theta, cylinder.y)
+    end
+
+    def set_from_cylindrical_coords(radius, theta, y)
+      set(radius * ::Math.sin(theta), y, radius * ::Math.sin(theta))
+
+      self
+    end
+
+    def set_from_matrix3_column(matrix, index)
+      from_array(matrix.elements, index * 3)
+    end
+
+    def equals(vector)
+      _x, _y, _z = *@elements
+
+      ((vector.x == _x) && (vector.y == _y) && (vector.z == _z ))
+    end
+
+    def from_buffer_attribute(attribute, index)
+      set(attribute.get_x(index), attribute.get_y(index), attribute.get_z(index))
+
+      self
+    end
+
+    def clamp_length(min, max)
+      divide_scalar(length || 1).multiply_scalar([min, [max, length].min].max)
+    end
+
+    def manhattan_distance_to(vector)
+      _x, _y, _z = *@elements
+
+      (_x - vector.x).abs + (_y - vector.y).abs + (_z - vector.z).abs
+    end
+
+    # TODO: maybe add range 3 values as arguments (range_x, range_y, range_z) to this method
+    def random()
+      set(Random.new.rand, Random.new.rand, Random.new.rand)
+
+      self
+    end
+
+    def random_direction()
+      u = (Random.new.rand - 0.5) *2
+      t = Random.new.rand * ::Math::PI * 2
+      f = ::Math.sqrt(1 - u ** 2)
+
+      set(f * ::Math.cos(t), f * ::Math.sin(t), u)
+
+      self
+    end
+
     def from_attribute(attribute, index, offset = 0)
       index = index * attribute.itemSize + offset
 

data/lib/mittsu/math/vector4.rb

@@ -1,4 +1,3 @@
-require 'mittsu/math'
 require 'mittsu/math/vector'
 
 module Mittsu
@@ -50,8 +49,8 @@ module Mittsu
     def set_axis_angle_from_quaternion(q)
       # http:#www.euclideanspace.com/maths/geometry/rotations/conversions/quaternionToAngle/index.htm
       # q is assumed to be normalized
-      @elements[3] = 2.0 * Math.acos(q.w)
-      s = Math.sqrt(1.0 - q.w * q.w)
+      @elements[3] = 2.0 * ::Math.acos(q.w)
+      s = ::Math.sqrt(1.0 - q.w * q.w)
       if s < 0.0001
          @elements[0] = 1.0
          @elements[1] = 0.0
@@ -89,7 +88,7 @@ module Mittsu
           return self # zero angle, arbitrary axis
         end
         # otherwise self singularity is angle = 180
-        angle = Math::PI
+        angle = ::Math::PI
         xx = (m11 + 1.0) / 2.0
         yy = (m22 + 1.0) / 2.0
         zz = (m33 + 1.0) / 2.0
@@ -102,7 +101,7 @@ module Mittsu
             y1 = 0.707106781
             z1 = 0.707106781
           else
-            x1 = Math.sqrt(xx)
+            x1 = ::Math.sqrt(xx)
             y1 = xy / x1
             z1 = xz / x1
           end
@@ -112,7 +111,7 @@ module Mittsu
             y1 = 0.0
             z1 = 0.707106781
           else
-            y1 = Math.sqrt(yy)
+            y1 = ::Math.sqrt(yy)
             x1 = xy / y1
             z1 = yz / y1
           end
@@ -122,7 +121,7 @@ module Mittsu
             y1 = 0.707106781
             z1 = 0.0
           else
-            z1 = Math.sqrt(zz)
+            z1 = ::Math.sqrt(zz)
             x1 = xz / z1
             y1 = yz / z1
           end
@@ -131,7 +130,7 @@ module Mittsu
         return self # return 180 deg rotation
       end
       # as we have reached here there are no singularities so we can handle normally
-      s = Math.sqrt((m32 - m23) * (m32 - m23) +
+      s = ::Math.sqrt((m32 - m23) * (m32 - m23) +
         (m13 - m31) * (m13 - m31) +
         (m21 - m12) * (m21 - m12)) # used to normalize
       s = 1.0 if (s.abs < 0.001)
@@ -140,7 +139,7 @@ module Mittsu
       @elements[0] = (m32 - m23) / s
       @elements[1] = (m13 - m31) / s
       @elements[2] = (m21 - m12) / s
-      @elements[3] = Math.acos((m11 + m22 + m33 - 1.0) / 2.0)
+      @elements[3] = ::Math.acos((m11 + m22 + m33 - 1.0) / 2.0)
       self
     end
 

data/lib/mittsu/math.rb

@@ -17,13 +17,8 @@ require 'mittsu/math/vector2'
 require 'mittsu/math/vector3'
 require 'mittsu/math/vector4'
 
-BuiltInMath = Math
-
 module Mittsu
   module Math
-    extend BuiltInMath
-    include BuiltInMath
-    BuiltInMath.methods.each { |m| public_class_method m }
 
     def self.sign(x)
       return Float::NAN unless x.is_a? Numeric

data/lib/mittsu/objects/line.rb

@@ -54,7 +54,6 @@ module Mittsu
           offsets.each_with_index do |offset, oi|
             start = offset[:start]
             count = offset[:count]
-            index = offset[:index]
 
             (start...(count-1)).step(step).each do |i|
               v_start.from_array(positions, a * 3)

data/lib/mittsu/renderers/glfw_lib.rb

@@ -25,17 +25,38 @@ module Mittsu
     end
 
     class Windows < GenericLib::Base
+      def file
+        'glfw3.dll'
+      end
     end
 
     class MacOS < GenericLib::Base
+      SEARCH_GLOBS = ['/usr/local/lib/**',
+                      '/usr/lib/**',
+                      '/opt/homebrew/**']
+
       def path
-        '/usr/local/lib'
+        File.dirname(match)
       end
 
       def file
-        matches = Dir.glob('/usr/local/lib/libglfw*.dylib').map { |path| File.basename(path) }
-        return matches.find { |m| m == 'libglfw3.dylib' || m == 'libglfw.3.dylib' } || matches.first
+        File.basename(match)
       end
+
+      private
+
+        def match
+          @match ||= find_match
+        end
+
+        def find_match
+          SEARCH_GLOBS.each do |glob|
+            matches = Dir.glob("#{glob}/libglfw*.dylib")
+            next if matches.empty?
+
+            return matches.find { |m| m.end_with?('libglfw3.dylib') || m.end_with?('libglfw.3.dylib') } || matches.first
+          end
+        end
     end
   end
 end

data/lib/mittsu/renderers/glfw_window.rb

@@ -1,7 +1,7 @@
 require 'opengl'
 require 'glfw'
 
-require 'mittsu'
+require 'mittsu/utils'
 require 'mittsu/renderers/glfw_lib'
 glfw_lib = Mittsu::GLFWLib.discover
 GLFW.load_lib(ENV["MITTSU_LIBGLFW_FILE"] || glfw_lib.file, ENV["MITTSU_LIBGLFW_PATH"] || glfw_lib.path) unless Mittsu.test?
@@ -13,7 +13,7 @@ module Mittsu
     class Window
       attr_accessor :key_press_handler, :key_release_handler, :key_repeat_handler, :char_input_handler, :cursor_pos_handler, :mouse_button_press_handler, :mouse_button_release_handler, :scroll_handler, :framebuffer_size_handler
 
-      def initialize(width, height, title)
+      def initialize(width, height, title, antialias: 0)
         glfwInit
 
         glfwWindowHint GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE
@@ -22,6 +22,10 @@ module Mittsu
         glfwWindowHint GLFW_CONTEXT_VERSION_MINOR, 3
         glfwWindowHint GLFW_CONTEXT_REVISION, 0
 
+        if antialias > 0
+          glfwWindowHint GLFW_SAMPLES, antialias
+        end
+
         @width, @height, @title = width, height, title
         @handle = glfwCreateWindow(@width, @height, @title, nil, nil)
         if @handle.null?

data/lib/mittsu/renderers/opengl/core/object_3d.rb

@@ -1,6 +1,6 @@
 module Mittsu
   class Object3D
-    attr_accessor :morph_target_influences, :renderer
+    attr_accessor :morph_target_influences, :renderer, :initted
     attr_reader :model_view_matrix
     attr_writer :active
 

data/lib/mittsu/renderers/opengl/lights/spot_light.rb

@@ -35,7 +35,7 @@ module Mittsu
       directions[offset + 1] = @_direction.y
       directions[offset + 2] = @_direction.z
 
-      @cache.angles_cos[index] = Math.cos(angle)
+      @cache.angles_cos[index] = ::Math.cos(angle)
       @cache.exponents[index] = exponent;
       @cache.decays[index] = distance.zero? ? 0.0 : decay
     end

data/lib/mittsu/renderers/opengl/opengl_geometry_group.rb

@@ -20,6 +20,7 @@ module Mittsu
       @num_morph_normals = num_morph_normals
 
       @renderer = renderer
+      @custom_attributes_list = []
     end
 
     def create_mesh_buffers

data/lib/mittsu/renderers/opengl/opengl_program.rb

@@ -1,10 +1,9 @@
 require 'erb'
-
 require 'mittsu/renderers/opengl/opengl_shader'
 
 module Mittsu
   class OpenGLProgram
-    attr_reader :id, :program, :uniforms, :attributes
+    attr_reader :id, :program, :uniforms
     attr_accessor :code, :used_times, :attributes, :vertex_shader, :fragment_shader
 
     def initialize(renderer, code, material, parameters)

data/lib/mittsu/renderers/opengl/textures/texture.rb

@@ -61,14 +61,14 @@ module Mittsu
         glTexParameteri(texture_type, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE)
 
         if wrap_s != ClampToEdgeWrapping || wrap_t != ClampToEdgeWrapping
-          puts "WARNING: Mittsu::Texture: Texture is not power of two. Texture.wrap_s and Texture.wrap_t should be set to Mittsu::ClampToEdgeWrapping. (#{texture.source_file})"
+          puts "WARNING: Mittsu::Texture: Texture is not power of two. Texture.wrap_s and Texture.wrap_t should be set to Mittsu::ClampToEdgeWrapping. (#{source_file})"
         end
 
         glTexParameteri(texture_type, GL_TEXTURE_MAG_FILTER, filter_fallback(mag_filter))
         glTexParameteri(texture_type, GL_TEXTURE_MIN_FILTER, filter_fallback(min_filter))
 
         if min_filter != NearestFilter && min_filter != LinearFilter
-          puts "WARNING: Mittsu::Texture: Texture is not a power of two. Texture.min_filter should be set to Mittsu::NearestFilter or Mittsu::LinearFilter. (#{texture.source_file})"
+          puts "WARNING: Mittsu::Texture: Texture is not a power of two. Texture.min_filter should be set to Mittsu::NearestFilter or Mittsu::LinearFilter. (#{source_file})"
         end
 
         # TODO: anisotropic extension ???

data/lib/mittsu/renderers/opengl_renderer.rb

@@ -2,12 +2,10 @@ require 'opengl'
 require 'glfw'
 require 'fiddle'
 
-
 require 'mittsu/renderers/opengl/opengl_lib'
 opengl_lib = Mittsu::OpenGLLib.discover
 OpenGL.load_lib(ENV["MITTSU_LIBGL_FILE"] || opengl_lib.file, ENV["MITTSU_LIBGL_PATH"] || opengl_lib.path)
 
-require 'mittsu'
 require 'mittsu/renderers/glfw_window'
 require 'mittsu/renderers/opengl/opengl_implementations'
 require 'mittsu/renderers/opengl/opengl_debug'
@@ -30,12 +28,14 @@ require 'mittsu/renderers/opengl/opengl_mittsu_params'
 
 module Mittsu
   class OpenGLRenderer
-    attr_accessor :auto_clear, :auto_clear_color, :auto_clear_depth, :auto_clear_stencil, :sort_objects, :gamma_factor, :gamma_input, :gamma_output, :shadow_map_enabled, :shadow_map_type, :shadow_map_cull_face, :shadow_map_debug, :shadow_map_cascade, :max_morph_targets, :max_morph_normals, :info, :pixel_ratio, :window, :width, :height, :state
+    attr_accessor :auto_clear, :auto_clear_color, :auto_clear_depth, :auto_clear_stencil, :sort_objects, :gamma_factor, :gamma_input,
+      :gamma_output, :shadow_map_enabled, :shadow_map_type, :shadow_map_cull_face, :shadow_map_debug, :shadow_map_cascade,
+      :max_morph_targets, :max_morph_normals, :info, :pixel_ratio, :window, :width, :height, :state
 
-    attr_reader :logarithmic_depth_buffer, :max_morph_targets, :max_morph_normals, :shadow_map_type, :shadow_map_debug, :shadow_map_cascade, :programs, :light_renderer, :proj_screen_matrix
+    attr_reader :logarithmic_depth_buffer, :programs, :light_renderer, :proj_screen_matrix
 
     def initialize(parameters = {})
-      puts "OpenGLRenderer (Revision #{REVISION})"
+      puts "Mittsu OpenGL Renderer #{VERSION}"
 
       fetch_parameters(parameters)
 
@@ -81,11 +81,6 @@ module Mittsu
 
     # TODO: get_context ???
     # TODO: force_context_loss ???
-
-    def supports_vertex_textures?
-      @_supports_vertex_textures
-    end
-
     # TODO: supports_float_textures? ???
     # TODO: supports[half|standard|compressed|blend min max] ... ???
 
@@ -940,14 +935,14 @@ module Mittsu
       @_alpha = parameters.fetch(:alpha, false)
       @_depth = parameters.fetch(:depth, true)
       @_stencil = parameters.fetch(:stencil, true)
-      @_antialias = parameters.fetch(:antialias, false)
       @_premultiplied_alpha = parameters.fetch(:premultiplied_alpha, true)
       @_preserve_drawing_buffer = parameters.fetch(:preserve_drawing_buffer, false)
       @logarithmic_depth_buffer = parameters.fetch(:logarithmic_depth_buffer, false)
 
       @width = parameters.fetch(:width, 800)
       @height = parameters.fetch(:height, 600)
-      @title = parameters.fetch(:title, "Mittsu #{REVISION}")
+      @title = parameters.fetch(:title, "Mittsu #{VERSION}")
+      @antialias = parameters.fetch(:antialias, 0)
     end
 
     def get_gpu_capabilities
@@ -979,7 +974,7 @@ module Mittsu
       #   preserve_drawing_buffer: _preserve_drawing_buffer
       # }
 
-      @window = GLFW::Window.new(@width, @height, @title)
+      @window = GLFW::Window.new(@width, @height, @title, antialias: @antialias)
 
       default_target.set_viewport_size(*(@window.framebuffer_size))
 
@@ -1006,7 +1001,7 @@ module Mittsu
       glUniformMatrix4fv(uniforms['projectionMatrix'], 1, GL_FALSE, array_to_ptr_easy(camera.projection_matrix.elements))
 
       if @logarithmic_depth_buffer
-        glUniform1f(uniforms['logDepthBuffFC'], 2.0 / Math.log(camera.far + 1.0) / Math::LN2)
+        glUniform1f(uniforms['logDepthBuffFC'], 2.0 / ::Math.log(camera.far + 1.0) / Math::LN2)
       end
 
       if material.needs_camera_position_uniform? && !uniforms['cameraPosition'].nil?

data/lib/mittsu/scenes/scene.rb

@@ -1,5 +1,3 @@
-require 'mittsu'
-
 module Mittsu
   class Scene < Object3D
 

data/lib/mittsu/textures/texture.rb

@@ -10,9 +10,10 @@ module Mittsu
     DEFAULT_IMAGE = nil
     DEFAULT_MAPPING = UVMapping
 
-    attr_reader :id, :uuid, :type
+    attr_reader :id, :uuid
 
-    attr_accessor :image, :name, :source_file, :mipmaps, :offset, :repeat, :generate_mipmaps, :premultiply_alpha, :filp_y, :unpack_alignment, :on_update, :mipmaps, :mapping, :wrap_s, :wrap_t, :mag_filter, :min_filter, :anisotropy, :format, :type
+    attr_accessor :image, :name, :source_file, :mipmaps, :offset, :repeat, :generate_mipmaps, :premultiply_alpha, :filp_y,
+      :unpack_alignment, :on_update, :mapping, :wrap_s, :wrap_t, :mag_filter, :min_filter, :anisotropy, :format, :type
 
     def initialize(image = DEFAULT_IMAGE, mapping = DEFAULT_MAPPING, wrap_s = ClampToEdgeWrapping, wrap_t = ClampToEdgeWrapping, mag_filter = LinearFilter, min_filter = LinearMipMapLinearFilter, format = RGBAFormat, type = UnsignedByteType, anisotropy = 1)
       super()
@@ -42,6 +43,7 @@ module Mittsu
 
       @_needs_update = false
       @on_update = nil
+      @_listeners = {}
     end
 
     def needs_update?

data/lib/mittsu/utils.rb

@@ -0,0 +1,15 @@
+module Mittsu
+  DEBUG = ENV["DEBUG"] == "true"
+
+  def self.debug?
+    DEBUG
+  end
+
+  def self.env
+    ENV["MITTSU_ENV"]
+  end
+
+  def self.test?
+    env == 'test'
+  end
+end

data/lib/mittsu/version.rb

@@ -1,4 +1,3 @@
 module Mittsu
-  VERSION = "0.3.1"
-  REVISION = "71"
+  VERSION = "0.4.0"
 end

data/lib/mittsu.rb

@@ -1,19 +1,4 @@
-module Mittsu
-  DEBUG = ENV["DEBUG"] == "true"
-
-  def self.debug?
-    DEBUG
-  end
-
-  def self.env
-    ENV["MITTSU_ENV"]
-  end
-
-  def self.test?
-    env == 'test'
-  end
-end
-
+require "mittsu/utils"
 require "mittsu/version"
 require "mittsu/math"
 require "mittsu/core"

data/mittsu.gemspec

@@ -6,15 +6,15 @@ require 'mittsu/version'
 Gem::Specification.new do |spec|
   spec.name          = "mittsu"
   spec.version       = Mittsu::VERSION
-  spec.authors       = ["Daniel Smith"]
-  spec.email         = ["jellymann@gmail.com"]
+  spec.authors       = ["Danielle Smith"]
+  spec.email         = ["danini@hey.com"]
 
   spec.summary       = %q{3D Graphics Library for Ruby}
   spec.description   = %q{Mittsu makes 3D graphics easier by providing an abstraction over OpenGL, and is based heavily off of THREE.js. No more weird pointers and wondering about the difference between a VAO and a VBO (besides the letter). Simply think of something awesome and make it!}
-  spec.homepage      = "https://github.com/jellymann/mittsu"
+  spec.homepage      = "https://github.com/danini-the-panini/mittsu"
   spec.license       = "MIT"
   spec.metadata = {
-    "bug_tracker" => "https://github.com/jellymann/mittsu/issues"
+    "bug_tracker" => "https://github.com/danini-the-panini/mittsu/issues"
   }
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{(^(test|examples)/|\.sh$)}) }
@@ -23,14 +23,15 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = '>= 2.0.0'
   spec.requirements << 'OpenGL 3.3+ capable hardware and drivers'
 
-  spec.add_runtime_dependency 'opengl-bindings', "~> 1.5"
-  spec.add_runtime_dependency 'ffi', "~> 1.9"
-  spec.add_runtime_dependency 'chunky_png', "~> 1.3"
+  spec.add_runtime_dependency 'opengl-bindings'
+  spec.add_runtime_dependency 'ffi'
+  spec.add_runtime_dependency 'chunky_png'
 
-  spec.add_development_dependency "bundler", "~> 1.9"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency 'minitest', '~> 5.7'
-  spec.add_development_dependency 'minitest-reporters', '~> 1.1'
-  spec.add_development_dependency 'pry', '~> 0.10'
-  spec.add_development_dependency 'benchmark-ips', '~> 2.3'
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency 'minitest'
+  spec.add_development_dependency 'minitest-reporters'
+  spec.add_development_dependency 'pry'
+  spec.add_development_dependency 'benchmark-ips'
+  spec.add_development_dependency 'simplecov', '0.17.1'
 end