mittsu 0.2.3 → 0.3.3

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

@@ -0,0 +1,120 @@
+module Mittsu
+  class TorusKnotBufferGeometry < BufferGeometry
+    def initialize(radius = 100.0, tube = 40.0, radial_segments = 64, tubular_segments = 8, p_val = 2, q_val = 3)
+      super()
+
+      @type = 'TorusKnotBufferGeometry'
+
+      @parameters = {
+        radius:           radius,
+        tube:             tube,
+        radial_segments:  radial_segments,
+        tubular_segments: tubular_segments,
+        p_val:            p_val,
+        q_val:            q_val
+      }
+
+      # buffers
+
+      indices = []
+      vertices = []
+      normals = []
+      uvs = []
+
+      # helper variables
+
+      vertex = Vector3.new
+      normal = Vector3.new
+
+      p1 = Vector3.new
+      p2 = Vector3.new
+
+      b = Vector3.new
+      t = Vector3.new
+      n = Vector3.new
+
+      # generate vertices, normals and uvs
+
+      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
+
+        # 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
+        calculate_position_on_curve(u,        p_val, q_val, radius, p1)
+        calculate_position_on_curve(u + 0.01, p_val, q_val, radius, p2)
+
+        # calculate orthonormal basis
+        t.sub_vectors(p2, p1)
+        n.add_vectors(p2, p1)
+        b.cross_vectors(t, n)
+        n.cross_vectors(b, t)
+
+        # normalize B, N. T can be ignored, we don't use it
+        b.normalize
+        n.normalize
+
+        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)
+
+          # 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
+          vertex.x = p1.x + (cx * n.x + cy * b.x)
+          vertex.y = p1.y + (cx * n.y + cy * b.y)
+          vertex.z = p1.z + (cx * n.z + cy * b.z)
+
+          vertices += vertex.elements
+
+          # normal (P1 is always the center/origin of the extrusion, thus we can use it to calculate the normal)
+          normal.sub_vectors(vertex, p1).normalize
+          
+          normals += normal.elements
+
+          # uv
+          uvs << i.to_f / tubular_segments.to_f
+          uvs << j.to_f / radial_segments.to_f
+        end
+      end
+
+      # generate indices
+
+      for j in 1..tubular_segments do
+        for i in 1..radial_segments do
+          # indices
+          a = (radial_segments + 1) * (j - 1) + (i - 1)
+          b = (radial_segments + 1) * j + (i - 1)
+          c = (radial_segments + 1) * j + i
+          d = (radial_segments + 1) * (j - 1) + i
+
+          # faces
+          indices += [a, b, d]
+          indices += [b, c, d]
+        end
+      end
+
+      # build geometry
+
+      self[:index]    = BufferAttribute.new(indices, 1)
+      self[:position] = BufferAttribute.new(vertices, 3)
+      self[:normal]   = BufferAttribute.new(normals, 3)
+      self[:uv]       = BufferAttribute.new(uvs, 2)
+    end
+
+    private
+
+    def calculate_position_on_curve(u, p_val, q_val, radius, position)
+      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)
+
+      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
+    end
+  end
+end

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

@@ -0,0 +1,25 @@
+require 'mittsu/core'
+require 'mittsu/math'
+require 'mittsu/extras/geometries/torus_knot_buffer_geometry'
+
+module Mittsu
+  class TorusKnotGeometry < Geometry
+    def initialize(radius = 100.0, tube = 40.0, radial_segments = 64, tubular_segments = 8, p_val = 2, q_val = 3)
+      super()
+
+      @type = 'TorusKnotGeometry'
+
+      @parameters = {
+        radius:           radius,
+        tube:             tube,
+        radial_segments:  radial_segments,
+        tubular_segments: tubular_segments,
+        p_val:            p_val,
+        q_val:            q_val
+      }
+
+      from_buffer_geometry(TorusKnotBufferGeometry.new(radius, tube, tubular_segments, radial_segments, p_val, q_val))
+      merge_vertices
+    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.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/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