mittsu 0.2.3 → 0.3.3

data/lib/mittsu/math/frustum.rb

@@ -1,5 +1,3 @@
-require 'mittsu/math'
-
 module Mittsu
   class Frustum
     attr_accessor :planes

data/lib/mittsu/math/line3.rb

@@ -1,5 +1,3 @@
-require 'mittsu/math'
-
 module Mittsu
   class Line3
     attr_accessor :start_point, :end_point

data/lib/mittsu/math/matrix3.rb

@@ -1,5 +1,3 @@
-require 'mittsu/math'
-
 module Mittsu
   class Matrix3
     attr_accessor :elements

data/lib/mittsu/math/matrix4.rb

@@ -1,5 +1,3 @@
-require 'mittsu/math'
-
 module Mittsu
   class Matrix4
     attr_accessor :elements
@@ -88,9 +86,9 @@ module Mittsu
     def make_rotation_from_euler(euler)
       te = self.elements
       x, y, z = euler.x, euler.y, euler.z
-      a, b = Math.cos(x), Math.sin(x)
-      c, d = Math.cos(y), Math.sin(y)
-      e, f = Math.cos(z), Math.sin(z)
+      a, b = ::Math.cos(x), ::Math.sin(x)
+      c, d = ::Math.cos(y), ::Math.sin(y)
+      e, f = ::Math.cos(z), ::Math.sin(z)
       if euler.order == 'XYZ'
         ae = a * e; af = a * f; be = b * e; bf = b * f
         te[0] = c * e
@@ -401,7 +399,7 @@ module Mittsu
       scale_x_sq = te[0] * te[0] + te[1] * te[1] + te[2] * te[2]
       scale_y_sq = te[4] * te[4] + te[5] * te[5] + te[6] * te[6]
       scale_z_sq = te[8] * te[8] + te[9] * te[9] + te[10] * te[10]
-      Math.sqrt([scale_x_sq, scale_y_sq, scale_z_sq].max)
+      ::Math.sqrt([scale_x_sq, scale_y_sq, scale_z_sq].max)
     end
 
     def make_translation(x, y, z)
@@ -415,7 +413,7 @@ module Mittsu
     end
 
     def make_rotation_x(theta)
-      c, s = Math.cos(theta), Math.sin(theta)
+      c, s = ::Math.cos(theta), ::Math.sin(theta)
       self.set(
         1.0, 0.0,  0.0, 0.0,
         0.0,   c,   -s, 0.0,
@@ -426,7 +424,7 @@ module Mittsu
     end
 
     def make_rotation_y(theta)
-      c, s = Math.cos(theta), Math.sin(theta)
+      c, s = ::Math.cos(theta), ::Math.sin(theta)
       self.set(
            c, 0.0,   s, 0.0,
          0.0, 1.0, 0.0, 0.0,
@@ -437,7 +435,7 @@ module Mittsu
     end
 
     def make_rotation_z(theta)
-      c, s = Math.cos(theta), Math.sin(theta)
+      c, s = ::Math.cos(theta), ::Math.sin(theta)
       self.set(
           c,   -s, 0.0, 0.0,
           s,    c, 0.0, 0.0,
@@ -449,8 +447,8 @@ module Mittsu
 
     def make_rotation_axis(axis, angle)
       # Based on http:#www.gamedev.net/reference/articles/article1199.asp
-      c = Math.cos(angle)
-      s = Math.sin(angle)
+      c = ::Math.cos(angle)
+      s = ::Math.sin(angle)
       t = 1.0 - c
       x, y, z = axis.x, axis.y, axis.z
       tx, ty = t * x, t * y
@@ -536,7 +534,7 @@ module Mittsu
     def make_perspective(fov, aspect, near, far)
       fov, aspect, near, far =
         fov.to_f, aspect.to_f, near.to_f, far.to_f
-      ymax = near * Math.tan(Math.deg_to_rad(fov * 0.5))
+      ymax = near * ::Math.tan(Math.deg_to_rad(fov * 0.5))
       ymin = -ymax
       xmin = ymin * aspect
       xmax = ymax * aspect

data/lib/mittsu/math/plane.rb

@@ -1,5 +1,3 @@
-require 'mittsu/math'
-
 module Mittsu
   class Plane
     attr_accessor :normal, :constant

data/lib/mittsu/math/quaternion.rb

@@ -1,5 +1,3 @@
-require 'mittsu/math'
-
 module Mittsu
   class Quaternion
     EPS = 0.000001
@@ -8,6 +6,7 @@ module Mittsu
 
     def initialize(x = 0.0, y = 0.0, z = 0.0, w = 1.0)
       @x, @y, @z, @w = x, y, z, w
+      @on_change_callback = nil
     end
 
     def set(x, y, z, w)
@@ -52,12 +51,12 @@ module Mittsu
       # http:#www.mathworks.com/matlabcentral/fileexchange/
       #   20696-function-to-convert-between-dcm-euler-angles-quaternions-and-euler-vectors/
       #  content/SpinCalc.m
-      c1 = Math.cos(euler.x / 2.0)
-      c2 = Math.cos(euler.y / 2.0)
-      c3 = Math.cos(euler.z / 2.0)
-      s1 = Math.sin(euler.x / 2.0)
-      s2 = Math.sin(euler.y / 2.0)
-      s3 = Math.sin(euler.z / 2.0)
+      c1 = ::Math.cos(euler.x / 2.0)
+      c2 = ::Math.cos(euler.y / 2.0)
+      c3 = ::Math.cos(euler.z / 2.0)
+      s1 = ::Math.sin(euler.x / 2.0)
+      s2 = ::Math.sin(euler.y / 2.0)
+      s3 = ::Math.sin(euler.z / 2.0)
       if euler.order == 'XYZ'
         @x = s1 * c2 * c3 + c1 * s2 * s3
         @y = c1 * s2 * c3 - s1 * c2 * s3
@@ -97,11 +96,11 @@ module Mittsu
       # http:#www.euclideanspace.com/maths/geometry/rotations/conversions/angleToQuaternion/index.htm
       # assumes axis is normalized
       half_angle = angle / 2.0
-      s = Math.sin(half_angle)
+      s = ::Math.sin(half_angle)
       @x = axis.x * s
       @y = axis.y * s
       @z = axis.z * s
-      @w = Math.cos(half_angle)
+      @w = ::Math.cos(half_angle)
       self.on_change_callback
       self
     end
@@ -115,25 +114,25 @@ module Mittsu
       m31 = te[2]; m32 = te[6]; m33 = te[10]
       trace = m11 + m22 + m33
       if trace > 0
-        s = 0.5 / Math.sqrt(trace + 1.0)
+        s = 0.5 / ::Math.sqrt(trace + 1.0)
         @w = 0.25 / s
         @x = (m32 - m23) * s
         @y = (m13 - m31) * s
         @z = (m21 - m12) * s
       elsif m11 > m22 && m11 > m33
-        s = 2.0 * Math.sqrt(1.0 + m11 - m22 - m33)
+        s = 2.0 * ::Math.sqrt(1.0 + m11 - m22 - m33)
         @w = (m32 - m23) / s
         @x = 0.25 * s
         @y = (m12 + m21) / s
         @z = (m13 + m31) / s
       elsif m22 > m33
-        s = 2.0 * Math.sqrt(1.0 + m22 - m11 - m33)
+        s = 2.0 * ::Math.sqrt(1.0 + m22 - m11 - m33)
         @w = (m13 - m31) / s
         @x = (m12 + m21) / s
         @y = 0.25 * s
         @z = (m23 + m32) / s
       else
-        s = 2.0 * Math.sqrt(1.0 + m33 - m11 - m22)
+        s = 2.0 * ::Math.sqrt(1.0 + m33 - m11 - m22)
         @w = (m21 - m12) / s
         @x = (m13 + m31) / s
         @y = (m23 + m32) / s
@@ -188,7 +187,7 @@ module Mittsu
     end
 
     def length
-      Math.sqrt(@x * @x + @y * @y + @z * @z + @w * @w)
+      ::Math.sqrt(@x * @x + @y * @y + @z * @z + @w * @w)
     end
 
     def normalize
@@ -247,8 +246,8 @@ module Mittsu
         @z = _z
         return self
       end
-      half_theta = Math.acos(cos_half_theta)
-      sin_half_theta = Math.sqrt(1.0 - cos_half_theta * cos_half_theta)
+      half_theta = ::Math.acos(cos_half_theta)
+      sin_half_theta = ::Math.sqrt(1.0 - cos_half_theta * cos_half_theta)
       if sin_half_theta.abs < 0.001
         @w = 0.5 * (_w + @w)
         @x = 0.5 * (_x + @x)
@@ -256,8 +255,8 @@ module Mittsu
         @z = 0.5 * (_z + @z)
         return self
       end
-      ratio_a = Math.sin((1.0. - t) * half_theta) / sin_half_theta,
-      ratio_b = Math.sin(t * half_theta) / sin_half_theta
+      ratio_a = ::Math.sin((1.0. - t) * half_theta) / sin_half_theta,
+      ratio_b = ::Math.sin(t * half_theta) / sin_half_theta
       @w = (_w * ratio_a + @w * ratio_b)
       @x = (_x * ratio_a + @x * ratio_b)
       @y = (_y * ratio_a + @y * ratio_b)
@@ -304,6 +303,5 @@ module Mittsu
     def self.slerp(qa, qb, qm, t)
       qm.copy(qa).slerp(qb, t)
     end
-
   end
 end

data/lib/mittsu/math/ray.rb

@@ -1,5 +1,3 @@
-require 'mittsu/math'
-
 module Mittsu
   class Ray
     attr_accessor :origin, :direction
@@ -140,7 +138,7 @@ module Mittsu
       d2 = v1.dot(v1) - tca * tca
       radius2 = sphere.radius * sphere.radius
       return nil if d2 > radius2
-      thc = Math.sqrt(radius2 - d2)
+      thc = ::Math.sqrt(radius2 - d2)
       # t0 = first intersect point - entrance on front of sphere
       t0 = tca - thc
       # t1 = second intersect point - exit point on back of sphere

data/lib/mittsu/math/sphere.rb

@@ -1,5 +1,3 @@
-require 'mittsu/math'
-
 module Mittsu
   class Sphere
     attr_accessor :center, :radius
@@ -26,7 +24,7 @@ module Mittsu
       points.each do |point|
         max_radius_sq = [max_radius_sq, c.distance_to_squared(point)].max
       end
-      @radius = Math.sqrt(max_radius_sq)
+      @radius = ::Math.sqrt(max_radius_sq)
       self
     end
 

data/lib/mittsu/math/spline.rb

@@ -1,5 +1,3 @@
-require 'mittsu/math'
-
 module Mittsu
   class Spline
     Point = Struct.new(:x, :y, :z)

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

@@ -1,6 +1,6 @@
 module Mittsu
   class Vector
-    attr_accessor :elements
+    attr_accessor :elements, :uv, :index
 
     def initialize(elements)
       @elements = elements
@@ -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

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/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

@@ -34,7 +34,7 @@ module Mittsu
 
       def file
         matches = Dir.glob('/usr/local/lib/libglfw*.dylib').map { |path| File.basename(path) }
-        return matches.find('libglfw3.dylib') || matches.find('libglfw.3.dylib') || matches.first
+        return matches.find { |m| m == 'libglfw3.dylib' || m == 'libglfw.3.dylib' } || matches.first
       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?

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)