mittsu 0.3.1 → 0.4.0

data/lib/mittsu/extras/geometries/torus_geometry.rb

@@ -3,7 +3,7 @@ require 'mittsu/math'
 
 module Mittsu
   class TorusGeometry < Geometry
-    def initialize(radius = 100.0, tube = 40.0, radial_segments = 8, tubular_segments = 6, arc = (Math::PI * 2.0))
+    def initialize(radius = 100.0, tube = 40.0, radial_segments = 8, tubular_segments = 6, arc = (::Math::PI * 2.0))
       super()
 
       @type = 'TorusGeometry'
@@ -23,15 +23,15 @@ module Mittsu
       for j in 0..radial_segments do
         for i in 0..tubular_segments do
           u = i.to_f / tubular_segments * arc
-          v = j.to_f / radial_segments * Math::PI * 2.0
+          v = j.to_f / radial_segments * ::Math::PI * 2.0
 
-          center.x = radius * Math.cos(u)
-          center.y = radius * Math.sin(u)
+          center.x = radius * ::Math.cos(u)
+          center.y = radius * ::Math.sin(u)
 
           vertex = Vector3.new
-          vertex.x = (radius + tube * Math.cos(v)) * Math.cos(u)
-          vertex.y = (radius + tube * Math.cos(v)) * Math.sin(u)
-          vertex.z = tube * Math.sin(v)
+          vertex.x = (radius + tube * ::Math.cos(v)) * ::Math.cos(u)
+          vertex.y = (radius + tube * ::Math.cos(v)) * ::Math.sin(u)
+          vertex.z = tube * ::Math.sin(v)
 
           @vertices << vertex
 

data/lib/mittsu/extras/geometries/torus_knot_buffer_geometry.rb

@@ -37,7 +37,7 @@ module Mittsu
 
       for i in 0..tubular_segments do
         # the radian "u" is used to calculate the position on the torus curve of the current tubular segement
-        u = i.to_f / tubular_segments.to_f * p_val.to_f * Math::PI * 2.0
+        u = i.to_f / tubular_segments.to_f * p_val.to_f * ::Math::PI * 2.0
 
         # now we calculate two points. P1 is our current position on the curve, P2 is a little farther ahead.
         # these points are used to create a special "coordinate space", which is necessary to calculate the correct vertex positions
@@ -57,9 +57,9 @@ module Mittsu
         for j in 0..radial_segments do
           # now calculate the vertices. they are nothing more than an extrusion of the torus curve.
           # because we extrude a shape in the xy-plane, there is no need to calculate a z-value.
-          v = j.to_f / radial_segments.to_f * Math::PI * 2.0
-          cx = -tube * Math.cos(v)
-          cy = tube * Math.sin(v)
+          v = j.to_f / radial_segments.to_f * ::Math::PI * 2.0
+          cx = -tube * ::Math.cos(v)
+          cy = tube * ::Math.sin(v)
 
           # now calculate the final vertex position.
           # first we orient the extrusion with our basis vectos, then we add it to the current position on the curve
@@ -107,14 +107,14 @@ module Mittsu
     private
 
     def calculate_position_on_curve(u, p_val, q_val, radius, position)
-      cu = Math.cos(u)
-      su = Math.sin(u)
+      cu = ::Math.cos(u)
+      su = ::Math.sin(u)
       qu_over_p = q_val.to_f / p_val.to_f * u
-      cs = Math.cos(qu_over_p)
+      cs = ::Math.cos(qu_over_p)
 
       position.x = radius * (2.0 + cs) * 0.5 * cu
       position.y = radius * (2.0 + cs) * su * 0.5
-      position.z = radius * Math.sin(qu_over_p) * 0.5
+      position.z = radius * ::Math.sin(qu_over_p) * 0.5
     end
   end
-end
+end

data/lib/mittsu/extras/helpers/camera_helper.rb

@@ -15,58 +15,58 @@ module Mittsu
 
       # colors
 
-      @hex_frustrum = 0xffaa00
-      @hex_cone = 0xff0000
-      @hex_up = 0x00aaff
-      @hex_target = 0xffffff
-      @hex_cross = 0x333333
+      hex_frustrum = 0xffaa00
+      hex_cone = 0xff0000
+      hex_up = 0x00aaff
+      hex_target = 0xffffff
+      hex_cross = 0x333333
 
       # near
 
-      add_line(:n1, :n2, @hex_frustrum)
-      add_line(:n2, :n4, @hex_frustrum)
-      add_line(:n4, :n3, @hex_frustrum)
-      add_line(:n3, :n1, @hex_frustrum)
+      add_line(:n1, :n2, hex_frustrum)
+      add_line(:n2, :n4, hex_frustrum)
+      add_line(:n4, :n3, hex_frustrum)
+      add_line(:n3, :n1, hex_frustrum)
 
       # far
 
-      add_line(:f1, :f2, @hex_frustrum)
-      add_line(:f2, :f4, @hex_frustrum)
-      add_line(:f4, :f3, @hex_frustrum)
-      add_line(:f3, :f1, @hex_frustrum)
+      add_line(:f1, :f2, hex_frustrum)
+      add_line(:f2, :f4, hex_frustrum)
+      add_line(:f4, :f3, hex_frustrum)
+      add_line(:f3, :f1, hex_frustrum)
 
       # sides
 
-      add_line(:n1, :f1, @hex_frustrum)
-      add_line(:n2, :f2, @hex_frustrum)
-      add_line(:n3, :f3, @hex_frustrum)
-      add_line(:n4, :f4, @hex_frustrum)
+      add_line(:n1, :f1, hex_frustrum)
+      add_line(:n2, :f2, hex_frustrum)
+      add_line(:n3, :f3, hex_frustrum)
+      add_line(:n4, :f4, hex_frustrum)
 
       # cone
 
-      add_line(:p, :n1, @hex_frustrum)
-      add_line(:p, :n2, @hex_frustrum)
-      add_line(:p, :n3, @hex_frustrum)
-      add_line(:p, :n4, @hex_frustrum)
+      add_line(:p, :n1, hex_cone)
+      add_line(:p, :n2, hex_cone)
+      add_line(:p, :n3, hex_cone)
+      add_line(:p, :n4, hex_cone)
 
       # up
 
-      add_line(:u1, :u2, @hex_frustrum)
-      add_line(:u2, :u3, @hex_frustrum)
-      add_line(:u3, :u1, @hex_frustrum)
+      add_line(:u1, :u2, hex_up)
+      add_line(:u2, :u3, hex_up)
+      add_line(:u3, :u1, hex_up)
 
       # target
 
-      add_line(:c, :t, @hex_frustrum)
-      add_line(:p, :c, @hex_frustrum)
+      add_line(:c, :t, hex_target)
+      add_line(:p, :c, hex_cross)
 
       # cross
 
-      add_line(:cn1, :cn2, @hex_frustrum)
-      add_line(:cn3, :cn4, @hex_frustrum)
+      add_line(:cn1, :cn2, hex_cross)
+      add_line(:cn3, :cn4, hex_cross)
 
-      add_line(:cf1, :cf2, @hex_frustrum)
-      add_line(:cf3, :cf4, @hex_frustrum)
+      add_line(:cf1, :cf2, hex_cross)
+      add_line(:cf3, :cf4, hex_cross)
 
       super(@geometry, @material, LinePieces)
 
@@ -101,10 +101,10 @@ module Mittsu
 
       # far
 
-      set_point(:f1, -w, -h, -1.0)
-      set_point(:f2,  w, -h, -1.0)
-      set_point(:f3, -w,  h, -1.0)
-      set_point(:f4,  w,  h, -1.0)
+      set_point(:f1, -w, -h, 1.0)
+      set_point(:f2,  w, -h, 1.0)
+      set_point(:f3, -w,  h, 1.0)
+      set_point(:f4,  w,  h, 1.0)
 
       # up
 
@@ -119,10 +119,10 @@ module Mittsu
       set_point(:cf3, 0.0,  -h, 1.0)
       set_point(:cf4, 0.0,   h, 1.0)
 
-      set_point(:cn1,  -w, 0.0, 1.0)
-      set_point(:cn2,   w, 0.0, 1.0)
-      set_point(:cn3, 0.0,  -h, 1.0)
-      set_point(:cn4, 0.0,   h, 1.0)
+      set_point(:cn1,  -w, 0.0, -1.0)
+      set_point(:cn2,   w, 0.0, -1.0)
+      set_point(:cn3, 0.0,  -h, -1.0)
+      set_point(:cn4, 0.0,   h, -1.0)
 
       @geometry.vertices_need_update = true
     end

data/lib/mittsu/extras/image_utils.rb

@@ -76,7 +76,7 @@ module Mittsu
       end
 
       def normalize(a)
-        l = Math.sqrt(a[0] * a[0] + a[1] * a[1] + a[2] * a[2])
+        l = ::Math.sqrt(a[0] * a[0] + a[1] * a[1] + a[2] * a[2])
         [a[0] / l, a[1] / l, a[2] / l]
       end
     end

data/lib/mittsu/lights/directional_light.rb

@@ -120,12 +120,16 @@ module Mittsu
       light.shadow_cascade_offset.copy(@shadow_cascade_offset)
       light.shadow_cascade_count = @shadow_cascade_count
 
-    	light.shadow_cascade_bias = @shadow_cascade_bias.dup
-    	light.shadow_cascade_width = @shadow_cascade_width.dup
-    	light.shadow_cascade_height = @shadow_cascade_height.dup
+      light.shadow_cascade_bias = @shadow_cascade_bias.dup
+      light.shadow_cascade_width = @shadow_cascade_width.dup
+      light.shadow_cascade_height = @shadow_cascade_height.dup
 
-    	light.shadow_cascade_near_z = @shadow_cascade_near_z.dup
-    	light.shadow_cascade_far_z  = @shadow_cascade_far_z.dup
+      light.shadow_cascade_near_z = @shadow_cascade_near_z.dup
+      light.shadow_cascade_far_z  = @shadow_cascade_far_z.dup
+    end
+
+    def virtual?
+      false
     end
 
     protected

data/lib/mittsu/lights/spot_light.rb

@@ -20,7 +20,7 @@ module Mittsu
                   :shadow_camera,
                   :shadow_matrix
 
-    def initialize(color = nil, intensity = 1.0, distance = 0.0, angle = (Math::PI / 3.0), exponent = 10.0, decay = 1.0)
+    def initialize(color = nil, intensity = 1.0, distance = 0.0, angle = (::Math::PI / 3.0), exponent = 10.0, decay = 1.0)
       super(color)
 
       @type = 'SpotLight'

data/lib/mittsu/loaders/loader.rb

@@ -151,8 +151,8 @@ module Mittsu
     private
 
     def nearest_pow2(n)
-      l = Math.log(n) / Math::LN2
-      Math.pow(2, Math.round(l))
+      l = ::Math.log(n) / Math::LN2
+      ::Math.pow(2, ::Math.round(l))
     end
 
     def create_texture(where, name, source_file, repeat, offset, wrap, anisotropy)

data/lib/mittsu/loaders/obj_loader.rb

@@ -23,6 +23,10 @@ module Mittsu
 
     def initialize(manager = DefaultLoadingManager)
       @manager = manager
+      @object = nil
+      @mesh = nil
+      @material = nil
+      @_listeners = {}
     end
 
     def load(url)

data/lib/mittsu/materials/material.rb

@@ -1,5 +1,4 @@
 require 'securerandom'
-require 'mittsu'
 
 module Mittsu
   class Material
@@ -7,9 +6,13 @@ module Mittsu
 
     attr_reader :id, :uuid, :type
 
-    attr_accessor :name, :side, :opacity, :transparent, :blending, :blend_src, :blend_dst, :blend_equation, :blend_src_alpha, :blend_dst_alpha, :blend_equation_alpha, :depth_test, :depth_write, :color_write, :polygon_offset, :polygon_offset_factor, :polygon_offset_units, :alpha_test, :overdraw, :visible, :attributes, :shading, :program
+    attr_accessor :name, :side, :opacity, :transparent, :blending, :blend_src, :blend_dst, :blend_equation, :blend_src_alpha,
+      :blend_dst_alpha, :blend_equation_alpha, :depth_test, :depth_write, :color_write, :polygon_offset, :polygon_offset_factor,
+      :polygon_offset_units, :alpha_test, :overdraw, :visible, :attributes, :shading, :program
 
-    attr_accessor :map, :env_map, :light_map, :light_map, :normal_map, :specular_map, :alpha_map, :combine, :vertex_colors, :fog, :size_attenuation, :skinning, :morph_targets, :morph_normals, :metal, :wrap_around, :defines, :lights, :color, :bump_map, :reflectivity, :refraction_ratio, :wireframe, :default_attribute_values, :uniforms, :vertex_shader, :fragment_shader
+    attr_accessor :map, :env_map, :light_map, :normal_map, :specular_map, :alpha_map, :combine, :vertex_colors, :fog,
+      :size_attenuation, :skinning, :morph_targets, :morph_normals, :metal, :wrap_around, :defines, :lights, :color, :bump_map,
+      :reflectivity, :refraction_ratio, :wireframe, :default_attribute_values, :uniforms, :vertex_shader, :fragment_shader
 
     def initialize
       super

data/lib/mittsu/math/box2.rb

@@ -1,5 +1,3 @@
-require 'mittsu/math'
-
 module Mittsu
   class Box2
     attr_accessor :min, :max

data/lib/mittsu/math/box3.rb

@@ -1,5 +1,3 @@
-require 'mittsu/math'
-
 module Mittsu
   class Box3
     attr_accessor :min, :max

data/lib/mittsu/math/color.rb

@@ -1,4 +1,3 @@
-require 'mittsu/math'
 require 'mittsu/math/vector3'
 
 module Mittsu
@@ -121,9 +120,9 @@ module Mittsu
     end
 
     def convert_linear_to_gamma
-      self.r = Math.sqrt(self.r)
-      self.g = Math.sqrt(self.g)
-      self.b = Math.sqrt(self.b)
+      self.r = ::Math.sqrt(self.r)
+      self.g = ::Math.sqrt(self.g)
+      self.b = ::Math.sqrt(self.b)
       self
     end
 

data/lib/mittsu/math/euler.rb

@@ -1,5 +1,3 @@
-require 'mittsu/math'
-
 module Mittsu
   class Euler
     RotationOrders = [ 'XYZ', 'YZX', 'ZXY', 'XZY', 'YXZ', 'ZYX' ]
@@ -9,6 +7,7 @@ module Mittsu
 
     def initialize(x = 0.0, y = 0.0, z = 0.0, order = DefaultOrder)
       @x, @y, @z, @order = x.to_f, y.to_f, z.to_f, order
+      @on_change_callback = nil
     end
 
     def set(x, y, z, order = nil)
@@ -57,57 +56,57 @@ module Mittsu
       m31 = te[2]; m32 = te[6]; m33 = te[10]
       order = order || @order
       if order == 'XYZ'
-        @y = Math.asin(Math.clamp(m13, -1.0, 1.0))
+        @y = ::Math.asin(Math.clamp(m13, -1.0, 1.0))
         if m13.abs < 0.99999
-          @x = Math.atan2(- m23, m33)
-          @z = Math.atan2(- m12, m11)
+          @x = ::Math.atan2(- m23, m33)
+          @z = ::Math.atan2(- m12, m11)
         else
-          @x = Math.atan2(m32, m22)
+          @x = ::Math.atan2(m32, m22)
           @z = 0.0
         end
       elsif order == 'YXZ'
-        @x = Math.asin(- Math.clamp(m23, -1.0, 1.0))
+        @x = ::Math.asin(- Math.clamp(m23, -1.0, 1.0))
         if m23.abs < 0.99999
-          @y = Math.atan2(m13, m33)
-          @z = Math.atan2(m21, m22)
+          @y = ::Math.atan2(m13, m33)
+          @z = ::Math.atan2(m21, m22)
         else
-          @y = Math.atan2(- m31, m11)
+          @y = ::Math.atan2(- m31, m11)
           @z = 0.0
         end
       elsif order == 'ZXY'
-        @x = Math.asin(Math.clamp(m32, -1.0, 1.0))
+        @x = ::Math.asin(Math.clamp(m32, -1.0, 1.0))
         if m32.abs < 0.99999
-          @y = Math.atan2(- m31, m33)
-          @z = Math.atan2(- m12, m22)
+          @y = ::Math.atan2(- m31, m33)
+          @z = ::Math.atan2(- m12, m22)
         else
           @y = 0.0
-          @z = Math.atan2(m21, m11)
+          @z = ::Math.atan2(m21, m11)
         end
       elsif order == 'ZYX'
-        @y = Math.asin(- Math.clamp(m31, -1.0, 1.0))
+        @y = ::Math.asin(- Math.clamp(m31, -1.0, 1.0))
         if m31.abs < 0.99999
-          @x = Math.atan2(m32, m33)
-          @z = Math.atan2(m21, m11)
+          @x = ::Math.atan2(m32, m33)
+          @z = ::Math.atan2(m21, m11)
         else
           @x = 0.0
-          @z = Math.atan2(- m12, m22)
+          @z = ::Math.atan2(- m12, m22)
         end
       elsif order == 'YZX'
-        @z = Math.asin(Math.clamp(m21, -1.0, 1.0))
+        @z = ::Math.asin(Math.clamp(m21, -1.0, 1.0))
         if m21.abs < 0.99999
-          @x = Math.atan2(- m23, m22)
-          @y = Math.atan2(- m31, m11)
+          @x = ::Math.atan2(- m23, m22)
+          @y = ::Math.atan2(- m31, m11)
         else
           @x = 0.0
-          @y = Math.atan2(m13, m33)
+          @y = ::Math.atan2(m13, m33)
         end
       elsif order == 'XZY'
-        @z = Math.asin(- Math.clamp(m12, -1.0, 1.0))
+        @z = ::Math.asin(- Math.clamp(m12, -1.0, 1.0))
         if m12.abs < 0.99999
-          @x = Math.atan2(m32, m22)
-          @y = Math.atan2(m13, m11)
+          @x = ::Math.atan2(m32, m22)
+          @y = ::Math.atan2(m13, m11)
         else
-          @x = Math.atan2(- m23, m33)
+          @x = ::Math.atan2(- m23, m33)
           @y = 0.0
         end
       else

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)