mittsu 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 39e01ae0fe72f4d908f00512bcbe537ad5277f5c
-  data.tar.gz: a2430f7af5ba20c763c876037fca369307c9ae9f
+  metadata.gz: a116d4e3970e8c01c66d77f51eae67c987240017
+  data.tar.gz: ee8cf7cd8bbeeb6936b6609777d1c767a72b48fd
 SHA512:
-  metadata.gz: 8909e0371cbc10c1d43798d34f12d76494014d20cad3fe7cc1f721ec1622242e881b88b25e213a328c7e9ef7bb5158887bd710f20ec7c1b83efdce2bff037eb1
-  data.tar.gz: f78ec69a08d2c18853e3b6b5ad6754123711a44f857a6def2d7e288534c5d511b472c4abe0a0db2f4835a87cdaa11c460094ae9858bf4b8f64b85ff2b87b9ce2
+  metadata.gz: 0fff4b0a5cba6d3088677d89434e7e2af7223d597dd10b438fd92eeb52aa6ab587fd3cb8e406e4a984d8b178d09bf97b9a1325b139ec200bfbf13ad0eecaeab3
+  data.tar.gz: fed0e180de0ae1f9e91af33817c73f2ece532ce8bf5ffcae87655f27278205e819188979a53b742e989c25ab777f5a32bf992d7601e2fd749c51855b85691651

data/Gemfile

@@ -2,4 +2,5 @@ source 'https://rubygems.org'
 
 gemspec
 
-gem "codeclimate-test-reporter", group: :test, require: nil
+gem "codeclimate-test-reporter", group: :test, require: false
+gem 'coveralls', group: :test, require: false

data/README.md

@@ -1,6 +1,6 @@
 # Mittsu
 
-[![Gem Version](https://badge.fury.io/rb/mittsu.svg)](https://badge.fury.io/rb/mittsu) [![Dependency Status](https://gemnasium.com/jellymann/mittsu.svg)](https://gemnasium.com/jellymann/mittsu) [![Circle CI](https://circleci.com/gh/jellymann/mittsu/tree/master.svg?style=shield)](https://circleci.com/gh/jellymann/mittsu/tree/master) [![Test Coverage](https://codeclimate.com/github/jellymann/mittsu/badges/coverage.svg)](https://codeclimate.com/github/jellymann/mittsu/coverage) [![Code Climate](https://codeclimate.com/github/jellymann/mittsu/badges/gpa.svg)](https://codeclimate.com/github/jellymann/mittsu)
+[![Gem Version](https://badge.fury.io/rb/mittsu.svg)](https://badge.fury.io/rb/mittsu) [![Dependency Status](https://gemnasium.com/jellymann/mittsu.svg)](https://gemnasium.com/jellymann/mittsu) [![Circle CI](https://circleci.com/gh/jellymann/mittsu/tree/master.svg?style=shield)](https://circleci.com/gh/jellymann/mittsu/tree/master) [![Coverage Status](https://coveralls.io/repos/github/jellymann/mittsu/badge.svg?branch=master)](https://coveralls.io/github/jellymann/mittsu?branch=master) [![Code Climate](https://codeclimate.com/github/jellymann/mittsu/badges/gpa.svg)](https://codeclimate.com/github/jellymann/mittsu)
 
 3D Graphics Library for Ruby
 

data/lib/mittsu/cameras/orthographic_camera.rb

@@ -49,5 +49,18 @@ module Mittsu
 
       camera
     end
+
+    protected
+
+    def jsonify
+      data = super
+      data[:left] = self.left
+      data[:right] = self.right
+      data[:top] = self.top
+      data[:bottom] = self.bottom
+      data[:near] = self.near
+      data[:far] = self.far
+      data
+    end
   end
 end

data/lib/mittsu/cameras/perspective_camera.rb

@@ -111,5 +111,16 @@ module Mittsu
 
       camera
     end
+
+    protected
+
+    def jsonify
+      data = super
+      data[:fov] = self.fov
+      data[:aspect] = self.aspect
+      data[:near] = self.near
+      data[:far] = self.far
+      data
+    end
   end
 end

data/lib/mittsu/core/geometry.rb

@@ -1,9 +1,8 @@
 require 'securerandom'
 require 'mittsu'
-require 'mittsu/core/hash_object'
 
 module Mittsu
-  class Geometry < HashObject
+  class Geometry
     include EventDispatcher
 
     MorphNormal = Struct.new(:face_normals, :vertex_normals)
@@ -17,7 +16,7 @@ module Mittsu
 
     def initialize
       super
-      
+
       @id = (@@id ||= 1).tap { @@id += 1 }
 
       @name = ''
@@ -526,12 +525,12 @@ module Mittsu
           faces << get_color_index(vertex_colors[2], colors_hash, colors)
         end
       end
-      output.data = {}
-      output.data.vertices = vertices
-      output.data.normals = normals
-      output.data.colors = colors unless colors.empty?
-      output.data.uvs = [uvs] unless uvs.empty? # temporal backward compatibility
-      output.data.faces = faces
+      output[:data] = {}
+      output[:data][:vertices] = vertices
+      output[:data][:normals] = normals
+      output[:data][:colors] = colors unless colors.empty?
+      output[:data][:uvs] = [uvs] unless uvs.empty? # temporal backward compatibility
+      output[:data][:faces] = faces
 
       #
 
@@ -563,6 +562,10 @@ module Mittsu
       self.dispatch_event type: :dispose
     end
 
+    def implementation(renderer)
+      @_implementation ||= renderer.create_implementation(self)
+    end
+
     private
 
     def set_bit(value, position, enabled)

data/lib/mittsu/core/object_3d.rb

@@ -1,9 +1,8 @@
 require 'securerandom'
 require 'mittsu'
-require 'mittsu/core/hash_object'
 
 module Mittsu
-  class Object3D < HashObject
+  class Object3D
     include EventDispatcher
 
     attr_accessor  :name, :children, :up, :position, :rotation, :quaternion, :scale, :rotation_auto_update, :matrix, :matrix_world, :matrix_auto_update, :matrix_world_needs_update, :visible, :cast_shadow, :receive_shadow, :frustum_culled, :render_order, :user_data, :parent, :geometry
@@ -271,7 +270,7 @@ module Mittsu
 
     def traverse_ancestors(&callback)
       if @parent
-        callback.yielf @parent
+        callback.yield @parent
         @parent.traverse_ancestors(&callback)
       end
     end
@@ -308,11 +307,12 @@ module Mittsu
       }
       @_geometries = {}
       @_materials = {}
-      @_output[:object] = parse_object(self)
+      @_output[:object] = self.jsonify
       @_output
     end
 
-    def clone(object = Object3D.new, recursive = true)
+    def clone(object = nil, recursive = true)
+      object ||= Object3D.new
       object.name = @name
       object.up.copy(@up)
       object.position.copy(@position)
@@ -336,9 +336,34 @@ module Mittsu
       object
     end
 
-    private
+    def implementation(renderer)
+      @_implementation ||= renderer.create_implementation(self)
+    end
+
+    protected
 
-    def parse_geometry(geometry)
+    def jsonify
+      data = {
+        uuid: @uuid,
+        type: @type,
+        matrix: @matrix.to_a
+      }
+      data[:name] = @name unless @name.nil? || @name.empty?
+      data[:user_data] = @user_data unless @user_data.nil? || @user_data.empty?
+      data[:visible] = @visible unless @visible
+
+      if !self.children.empty?
+        data[:children] = @children.map do |child|
+          child.jsonify
+        end
+      end
+
+      # TODO: implement jsonify for PointCloud
+
+      data
+    end
+
+    def jsonify_geometry(geometry)
       @_output[:geometries] ||= []
       if @_geometries[geometry.uuid].nil?
         json = geometry.to_json
@@ -349,7 +374,7 @@ module Mittsu
       geometry.uuid
     end
 
-    def parse_material(material)
+    def jsonify_material(material)
       @_output[:materials] ||= []
       if @_materials[material.uuid].nil?
         json = material.to_json
@@ -359,63 +384,5 @@ module Mittsu
       end
       material.uuid
     end
-
-    def parse_object(object)
-      data = {}
-      data[:uuid] = object.uuid
-      data[:type] = object.type
-      data[:name] = object.name unless object.name.nil? || object.name.empty?
-      data.user_data = object.user_data unless object.user_data.nil? || object.user_data.empty?
-      data[:visible] = object.visible unless object.visible
-
-      case object
-      when PerspectiveCamera
-        data[:fov] = object.fov
-        data[:aspect] = object.aspect
-        data[:near] = object.near
-        data[:far] = object.far
-      when OrthographicCamera
-        data[:left] = object.left
-        data[:right] = object.right
-        data[:top] = object.top
-        data[:bottom] = object.bottom
-        data[:near] = object.near
-        data[:far] = object.far
-      when AmbientLight
-        data[:color] = object.color.get_hex
-      when DirectionalLight
-        data[:color] = object.color.get_hex
-        data[:intensity] = object.intensity
-      when PointLight
-        data[:color] = object.color.get_hex
-        data[:intensity] = object.intensity
-        data[:distance] = object.distance
-        data[:decay] = object.decay
-      when SpotLight
-        data[:color] = object.color.get_hex
-        data[:intensity] = object.intensity
-        data[:distance] = object.distance
-        data[:angle] = object.angle
-        data[:exponent] = object.exponent
-        data[:decay] = object.decay
-      when HemisphereLight
-        data[:color] = object.color.get_hex
-        data[:ground_color] = object.ground_color.get_hex
-      when Mesh, Line, PointCloud
-        data[:geometry] = parse_geometry(object.geometry)
-        data[:material] = parse_material(object.material)
-        data[:mode] = object.mode if object.is_a? Line
-      when Sprite
-        data[:material] = parse_material(object.material)
-      end
-      data[:matrix] = object.matrix.to_a
-      if !object.children.length.empty?
-        data[:children] = []
-        object.children.each do |child|
-          data[:children] << parse_object(child)
-        end
-      end
-      data
-    end
   end
 end

data/lib/mittsu/lights/ambient_light.rb

@@ -12,5 +12,13 @@ module Mittsu
       super(light)
       light
     end
+
+    protected
+
+    def jsonify
+      data = super
+      data[:color] = self.color.get_hex
+      data
+    end
   end
 end

data/lib/mittsu/lights/directional_light.rb

@@ -127,5 +127,14 @@ module Mittsu
     	light.shadow_cascade_near_z = @shadow_cascade_near_z.dup
     	light.shadow_cascade_far_z  = @shadow_cascade_far_z.dup
     end
+
+    protected
+
+    def jsonify
+      data = super
+      data[:color] = self.color.get_hex
+      data[:intensity] = self.intensity
+      data
+    end
   end
 end

data/lib/mittsu/lights/hemisphere_light.rb

@@ -25,5 +25,14 @@ module Mittsu
 
       light
     end
+
+    protected
+
+    def jsonify
+      data = super
+      data[:color] = self.color.get_hex
+      data[:ground_color] = self.ground_color.get_hex
+      data
+    end
   end
 end

data/lib/mittsu/lights/point_light.rb

@@ -23,5 +23,16 @@ module Mittsu
       light.decay = @decay
       light
     end
+
+    protected
+
+    def jsonify
+      data = super
+      data[:color] = self.color.get_hex
+      data[:intensity] = self.intensity
+      data[:distance] = self.distance
+      data[:decay] = self.decay
+      data
+    end
   end
 end

data/lib/mittsu/lights/spot_light.rb

@@ -100,5 +100,18 @@ module Mittsu
 
       return light
     end
+
+    protected
+
+    def jsonify
+      data = super
+      data[:color] = self.color.get_hex
+      data[:intensity] = self.intensity
+      data[:distance] = self.distance
+      data[:angle] = self.angle
+      data[:exponent] = self.exponent
+      data[:decay] = self.decay
+      data
+    end
   end
 end

data/lib/mittsu/loaders.rb

@@ -3,5 +3,6 @@ require 'mittsu/loaders/loader'
 require 'mittsu/loaders/loading_manager'
 require 'mittsu/loaders/image_loader'
 require 'mittsu/loaders/file_loader'
+require 'mittsu/loaders/obj_loader'
 require 'mittsu/loaders/mtl_loader'
 require 'mittsu/loaders/obj_mtl_loader'

data/lib/mittsu/loaders/mtl_loader.rb

@@ -2,15 +2,13 @@ module Mittsu
   class MTLLoader
     include EventDispatcher
 
-    def initialize(base_url, options = {}) # TODO: cross_origin?
+    def initialize(base_url, options = {})
       @base_url = base_url
       @options = options
-      # @cross_origin = cross_origin
     end
 
     def load(url)
       loader = FileLoader.new
-      # loader.cross_origin = @cross_origin
 
       text = loader.load File.join(@base_url, url)
       parse(text)
@@ -36,14 +34,11 @@ module Mittsu
   			value = value.strip
 
   			if key == "newmtl"
-  				# New material
-
   				info = { name: value };
   				materials_info[value] = info
   			elsif info
   				if key == "ka" || key == "kd" || key == "ks"
-  					ss = value.split(delimiter_pattern).take(3)
-  					info[key] = [ss[0].to_f, ss[1].to_f, ss[2].to_f]
+  					info[key] = value.split(delimiter_pattern).take(3).map(&:to_f)
   				else
   					info[key] = value
   				end
@@ -81,8 +76,7 @@ module Mittsu
         converted = {}
 
         materials_info.each do |mn, mat|
-          covmat = {}
-          converted[mn] = covmat
+          covmat = converted[mn] ={}
 
           mat.each do |prop, value|
             save = true
@@ -97,7 +91,7 @@ module Mittsu
               end
 
               if @options && @options[:ignore_zero_rgbs]
-                if value.take(3).any?(&:zero?)
+                if value.take(3).all?(&:zero?)
                   # ignore
                   save = false
                 end
@@ -108,7 +102,7 @@ module Mittsu
   						#   factor of 1.0 is fully opaque, a factor of 0 is fully dissolved (completely transparent)
 
               if @options && @options[:invert_transparency]
-                value = 1.0 - value
+                value = 1.0 - value.to_f
               end
             end
 
@@ -155,7 +149,6 @@ module Mittsu
           texture = Texture.new
 
           loader = ImageLoader.new
-          # loader.cross_origin = @cross_origin # TODO: ???
           image = loader.load url
 
           texture.image = ensure_power_of_two(image)

data/lib/mittsu/loaders/obj_loader.rb

@@ -0,0 +1,212 @@
+module Mittsu
+  class OBJLoader
+    include EventDispatcher
+
+    FLOAT                = /[\d|.|+|\-|e]+/
+
+    VERTEX_PATTERN       = /^v\s+(#{FLOAT})\s+(#{FLOAT})\s+(#{FLOAT})/
+    NORMAL_PATTERN       = /^vn\s+(#{FLOAT})\s+(#{FLOAT})\s+(#{FLOAT})/
+    UV_PATTERN           = /^vt\s+(#{FLOAT})\s+(#{FLOAT})/
+
+    FACE_PATTERN         = /^f\s+/
+    FACE_V_PATTERN       = /^f\s+(\d+)\s+(\d+)\s+(\d+)(?:\s+(\d+))?/
+    FACE_V_VT_PATTERN    = /^f\s+(\d+)\/(\d+)\s+(\d+)\/(\d+)\s+(\d+)\/(\d+)(?:\s+(\d+)\/(\d+))?/
+    FACE_V_VN_PATTERN    = /^f\s+(\d+)\/\/(\d+)\s+(\d+)\/\/(\d+)\s+(\d+)\/\/(\d+)(?:\s+(\d+)\/\/(\d+))?/
+    FACE_V_VT_VN_PATTERN = /^f\s+(\d+)\/(\d+)\/(\d+)\s+(\d+)\/(\d+)\/(\d+)\s+(\d+)\/(\d+)\/(\d+)(?:\s+(\d+)\/(\d+)\/(\d+))?/
+
+    OBJECT_PATTERN       = /^o\s+(.+)$/
+    GROUP_PATTERN        = /^g\s+(.+)$/
+    SMOOTH_GROUP_PATTERN = /^s\s+(\d|true|false|on|off)$/
+
+    USE_MTL_PATTERN      = /^usemtl\s+(.+)$/
+    LOAD_MTL_PATTERN     = /^mtllib\s+(.+)$/
+
+    def initialize(manager = DefaultLoadingManager)
+      @manager = manager
+    end
+
+    def load(url)
+      loader = FileLoader.new(@manager)
+
+      text = loader.load(url)
+      parse(text)
+    end
+
+    def parse(data)
+      init_parsing
+      relevant_lines(data).each { |line| parse_line(line) }
+      end_object
+      @group
+    end
+
+    private
+
+    def parse_line(line)
+      case line
+      when VERTEX_PATTERN       then handle_vertex($1.to_f, $2.to_f, $3.to_f)
+      when NORMAL_PATTERN       then handle_normal($1.to_f, $2.to_f, $3.to_f)
+      when UV_PATTERN           then handle_uv($1.to_f, $2.to_f)
+
+      when FACE_PATTERN         then parse_face(line)
+
+      when OBJECT_PATTERN       then new_object($1) and reset_vertices
+      when GROUP_PATTERN        # ignore
+      when SMOOTH_GROUP_PATTERN # ignore
+
+      when USE_MTL_PATTERN      then set_material($1)
+      when LOAD_MTL_PATTERN     # TODO
+      else                      raise "Mittsu::OBJMTLLoader: Unhandled line #{line}"
+      end
+    end
+
+    def parse_face(line)
+      case line
+      when FACE_V_PATTERN       then handle_face(
+        [$1, $2, $3, $4])   #face
+                            #(uv)
+                            #(normal)
+      when FACE_V_VT_PATTERN    then handle_face(
+        [$1, $3, $5, $7],   #face
+        [$2, $4, $6, $8])   #uv
+                            #(normal)
+      when FACE_V_VN_PATTERN    then handle_face(
+        [$1, $3, $5, $7 ],  #face
+        [],                 #(uv)
+        [$2, $4, $6, $8 ])  #normal
+      when FACE_V_VT_VN_PATTERN then handle_face(
+        [$1, $4, $7, $10],  #face
+        [$2, $5, $8, $11],  #uv
+        [$3, $6, $9, $12])  #normal
+      end
+    end
+
+    def face3(a, b, c, normals = nil)
+      Face3.new(a, b, c, normals)
+    end
+
+    def init_parsing
+      @face_offset = 0
+      @group = Group.new
+      @vertices = []
+      @normals = []
+      @uvs = []
+    end
+
+    def reset_vertices
+      @face_offset = @face_offset + @vertices.length
+      @vertices = []
+    end
+
+    def relevant_lines(raw_lines)
+      raw_lines.split("\n").map(&:strip).reject(&:empty?).reject{|l| l.start_with? '#'}
+    end
+
+    def new_object(object_name = '')
+      end_object
+      @object = Object3D.new
+      @object.name = object_name
+    end
+
+    def end_object
+      return if @object.nil?
+      end_mesh
+      @group.add(@object)
+      @object = nil
+    end
+
+    def new_mesh
+      end_mesh
+      new_object if @object.nil?
+      @geometry = Geometry.new
+      @mesh = Mesh.new(@geometry, @material || MeshLambertMaterial.new)
+      @mesh.name = @object.name
+      @mesh.name += " #{@material.name}" unless @material.nil?
+    end
+
+    def end_mesh
+      return if @mesh.nil? || @vertices.empty?
+      @geometry.vertices = @vertices
+
+      @geometry.merge_vertices
+      @geometry.compute_face_normals
+      @geometry.compute_bounding_sphere
+
+      @object.add(@mesh)
+      @mesh = nil
+    end
+
+    def set_material(material_name)
+      end_mesh
+
+      @material = MeshLambertMaterial.new
+      @material.name = material_name
+    end
+
+    def handle_vertex(x, y, z)
+      @vertices << Vector3.new(x, y, z)
+    end
+
+    def handle_normal(x, y, z)
+      @normals << Vector3.new(x, y, z)
+    end
+
+    def handle_uv(u, v)
+      @uvs << Vector2.new(u, v)
+    end
+
+    def add_face(a, b, c, normal_inds = nil)
+      if normal_inds.nil?
+        @geometry.faces << face3(
+          a.to_i - (@face_offset + 1),
+          b.to_i - (@face_offset + 1),
+          c.to_i - (@face_offset + 1)
+        )
+      else
+        @geometry.faces << face3(
+          a.to_i - (@face_offset + 1),
+          b.to_i - (@face_offset + 1),
+          c.to_i - (@face_offset + 1),
+          normal_inds.take(3).map { |i| @normals[i.to_i - 1].clone }
+        )
+      end
+    end
+
+    def add_uvs(a, b, c)
+      @geometry.face_vertex_uvs[0] << [
+        @uvs[a.to_i - 1].clone,
+        @uvs[b.to_i - 1].clone,
+        @uvs[c.to_i - 1].clone
+      ]
+    end
+
+    def handle_triangle(faces, uvs, normal_inds)
+      add_face(faces[0], faces[1], faces[2], normal_inds)
+
+      if !uvs.nil? && !uvs.empty?
+        add_uvs(uvs[0], uvs[1], uvs[2])
+      end
+    end
+
+    def handle_face(faces, uvs = [], normal_inds = [])
+      new_mesh if @mesh.nil?
+      if faces[3].nil?
+        handle_triangle(faces, uvs, normal_inds)
+      else
+        handle_quad(faces, uvs, normal_inds)
+      end
+    end
+
+    def handle_quad(faces, uvs, normal_inds)
+      handle_quad_triangle(faces, uvs, normal_inds, [0, 1, 3])
+      handle_quad_triangle(faces, uvs, normal_inds, [1, 2, 3])
+    end
+
+    def handle_quad_triangle(faces, uvs, normal_inds, tri_inds)
+      handle_triangle(
+        faces.values_at(*tri_inds).compact,
+        uvs.values_at(*tri_inds).compact,
+        normal_inds.values_at(*tri_inds).compact
+      )
+    end
+  end
+end