mittsu 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a116d4e3970e8c01c66d77f51eae67c987240017
-  data.tar.gz: ee8cf7cd8bbeeb6936b6609777d1c767a72b48fd
+  metadata.gz: d7b8204b98ee764f5d16b7f05080fdfef61e40d9
+  data.tar.gz: f0414817f8f8d34396c8e2db3fc78940e1e9da5f
 SHA512:
-  metadata.gz: 0fff4b0a5cba6d3088677d89434e7e2af7223d597dd10b438fd92eeb52aa6ab587fd3cb8e406e4a984d8b178d09bf97b9a1325b139ec200bfbf13ad0eecaeab3
-  data.tar.gz: fed0e180de0ae1f9e91af33817c73f2ece532ce8bf5ffcae87655f27278205e819188979a53b742e989c25ab777f5a32bf992d7601e2fd749c51855b85691651
+  metadata.gz: 794ce9888d5bec3b342cdce1b06111f2d194467ad8b8964f81eb9f84d09540bf62b10dfe1b24aa241a402b31e5c0bfb76cc64e9eb35146e4407be4d8781cd8e6
+  data.tar.gz: f193740db7fd18fb93c31e7daaae4c1ccbab6b6de93a6eb03e806da99dd3eb88e8069b365546b14ec3ce4ba35dcdc2bab2bc08799c969fe6e3c43bc8139a1d06

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) [![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)
+[![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)
 
 3D Graphics Library for Ruby
 

data/lib/mittsu.rb

@@ -1,3 +1,11 @@
+module Mittsu
+  DEBUG = ENV["DEBUG"] == "true"
+
+  def self.debug?
+    DEBUG
+  end
+end
+
 require "mittsu/version"
 require "mittsu/math"
 require "mittsu/core"

data/lib/mittsu/core/face3.rb

@@ -17,7 +17,7 @@ module Mittsu
     end
 
     def clone
-      face = THREE.face3.new(@a, @b, @c)
+      face = Mittsu::Face3.new(@a, @b, @c)
       face.normal.copy(@normal)
       face.color.copy(@color)
       face.material_index = @material_index

data/lib/mittsu/core/geometry.rb

@@ -562,10 +562,6 @@ 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

@@ -5,7 +5,9 @@ module Mittsu
   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
+    attr_accessor :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
+
+    attr_writer :name
 
     attr_reader :id, :uuid, :type
 
@@ -17,7 +19,6 @@ module Mittsu
 
       @uuid = SecureRandom.uuid
 
-      @name = ''
       @type = 'Object3D'
 
       @children = []
@@ -56,6 +57,10 @@ module Mittsu
       @user_data = {}
     end
 
+    def name
+      @name || "<#{@type} ##{@id}>"
+    end
+
     def apply_matrix(matrix)
       @matrix.multiply_matrices(matrix, @matrix)
       @matrix.decompose(@position, @quaternion, @scale)
@@ -336,10 +341,6 @@ module Mittsu
       object
     end
 
-    def implementation(renderer)
-      @_implementation ||= renderer.create_implementation(self)
-    end
-
     protected
 
     def jsonify

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

@@ -75,10 +75,10 @@ module Mittsu
       @matrix = camera.matrix_world
       @matrix_auto_update = false
 
-      update
+      update_points
     end
 
-    def update
+    def update_points
       w = 1.0
       h = 1.0
 

data/lib/mittsu/materials/material.rb

@@ -135,10 +135,6 @@ module Mittsu
       dispatch_event type: :dispose
     end
 
-    def implementation(renderer)
-      @_implementation ||= renderer.create_implementation(self)
-    end
-
     private
 
     def has_property?(key)

data/lib/mittsu/renderers/opengl/core/{opengl_geometry.rb → geometry.rb}

@@ -1,30 +1,21 @@
 require 'mittsu/renderers/opengl/opengl_geometry_like'
 
 module Mittsu
-  class OpenGLGeometry
+  class Geometry
     include OpenGLGeometryLike
 
     attr_accessor :groups, :initted
-    attr_reader :id
-
-    def initialize(geometry, renderer)
-      @id = (@@id ||= 1).tap { @@id += 1 }
-
-      @geometry = geometry
-      @renderer = renderer
-    end
 
     def init_geometry_groups(object)
-      object_impl = object.implementation(@renderer)
       material = object.material
       add_buffers = false
 
-      if @groups.nil? || @geometry.groups_need_update
+      if @groups.nil? || @groups_need_update
         @renderer.remove_opengl_object(object)
 
         @groups = make_groups(material.is_a?(MeshFaceMaterial))
 
-        @geometry.groups_need_update = false
+        @groups_need_update = false
       end
 
       # create separate VBOs per geometry chunk
@@ -35,29 +26,29 @@ module Mittsu
           geometry_group.create_mesh_buffers
           geometry_group.init_mesh_buffers(object)
 
-          @geometry.vertices_need_update = true
-          @geometry.morph_targets_need_update = true
-          @geometry.elements_need_update = true
-          @geometry.uvs_need_update = true
-          @geometry.normals_need_update = true
-          @geometry.tangents_need_update = true
-          @geometry.colors_need_update = true
+          @vertices_need_update = true
+          @morph_targets_need_update = true
+          @elements_need_update = true
+          @uvs_need_update = true
+          @normals_need_update = true
+          @tangents_need_update = true
+          @colors_need_update = true
 
   				add_buffers = true
         else
           add_buffers = false
         end
 
-        if add_buffers || !object_impl.active?
+        if add_buffers || !object.active?
           @renderer.add_opengl_object(geometry_group, object)
         end
       end
 
-      object_impl.active = true
+      object.active = true
     end
 
     def init_line_buffers(object)
-      nvertices = @geometry.vertices.length
+      nvertices = @vertices.length
 
       @vertex_array = Array.new(nvertices * 3, 0.0) # Float32Array
       @color_array = Array.new(nvertices * 3, 0.0) # Float32Array
@@ -79,8 +70,8 @@ module Mittsu
     end
 
     def set_line_buffers(hint)
-      if @geometry.vertices_need_update
-        @geometry.vertices.each_with_index do |vertex, v|
+      if @vertices_need_update
+        @vertices.each_with_index do |vertex, v|
           offset = v * 3
 
           @vertex_array[offset]     = vertex.x
@@ -92,8 +83,8 @@ module Mittsu
         glBufferData_easy(GL_ARRAY_BUFFER, @vertex_array, hint)
       end
 
-      if @geometry.colors_need_update
-        @geometry.colors.each_with_index do |color, c|
+      if @colors_need_update
+        @colors.each_with_index do |color, c|
           offset = c * 3
 
           @color_array[offset]     = color.r
@@ -105,8 +96,8 @@ module Mittsu
         glBufferData_easy(GL_ARRAY_BUFFER, @color_array, hint)
       end
 
-      if @geometry.line_distances_need_update
-        @geometry.line_distances.each_with_index do |l, d|
+      if @line_distances_need_update
+        @line_distances.each_with_index do |l, d|
           @line_distance_array[d] = l
         end
 
@@ -176,13 +167,13 @@ module Mittsu
 
       hash_map = {}
 
-      num_morph_targets = @geometry.morph_targets.length
-      num_morph_normals = @geometry.morph_normals.length
+      num_morph_targets = @morph_targets.length
+      num_morph_normals = @morph_normals.length
 
       groups = {}
       groups_list = []
 
-      @geometry.faces.each_with_index do |face, f|
+      @faces.each_with_index do |face, f|
         material_index = uses_face_material ? face.material_index : 0
 
         if !hash_map.include? material_index
@@ -218,7 +209,7 @@ module Mittsu
     def init_custom_attributes(object)
       material = object.material
 
-      nvertices = @geometry.vertices.length
+      nvertices = @vertices.length
 
       if material.attributes
         @custom_attributes_list ||= []

data/lib/mittsu/renderers/opengl/core/{opengl_object_3d.rb → object_3d.rb}

@@ -1,36 +1,29 @@
 module Mittsu
-  class OpenGLObject3D
-    attr_accessor :morph_target_influences
+  class Object3D
+    attr_accessor :morph_target_influences, :renderer
     attr_reader :model_view_matrix
     attr_writer :active
 
-    def initialize(object, renderer)
-      @object = object
-      @renderer = renderer
-      @_vector3 = Vector3.new
-    end
-
     def active?
       @active
     end
 
     def init
       if !@initted
+        puts " --- INIT #{self.name}" if DEBUG
+
         @initted = true
         @model_view_matrix = Matrix4.new
         @normal_matrix = Matrix3.new
 
-        @object.add_event_listener(:removed, @renderer.method(:on_object_removed))
+        add_event_listener(:removed, @renderer.method(:on_object_removed))
       end
 
-      geometry = @object.geometry
-
       if geometry.nil?
         # ImmediateRenderObject
       else
-        geometry_impl = geometry.implementation(@renderer)
-        if !geometry_impl.initted
-          geometry_impl.initted = true
+        if !geometry.initted
+          geometry.initted = true
           geometry.add_event_listener(:dispose, @renderer.method(:on_geometry_dispose))
           if geometry.is_a?(BufferGeometry)
             @renderer.info[:memory][:geometries] += 1
@@ -55,26 +48,30 @@ module Mittsu
         add_opengl_object
         # TODO: when ImmediateRenderObject exists
         # if object.is_a? ImmediateRenderObject || object.immediate_render_callback
-        #   add_buffer_immediate(@renderer.instance_variable_get(:@_opengl_objects_immediate), @object)
+        #   add_buffer_immediate(@renderer.instance_variable_get(:@_opengl_objects_immediate), self)
         # end
       end
     end
 
-    def project
-      return unless @object.visible
+    def project(renderer)
+      puts " --- PROJECT #{self.name}" if DEBUG
+      @renderer = renderer
+      return unless visible
       init
 
       # TODO!!! FIXME!!!
-      opengl_objects = @renderer.instance_variable_get(:@_opengl_objects)[@object.id]
+      opengl_objects = @renderer.instance_variable_get(:@_opengl_objects)[id]
 
-      if opengl_objects && (!@object.frustum_culled || @renderer.object_in_frustum?(@object))
+      if opengl_objects && (!frustum_culled || @renderer.object_in_frustum?(self))
         opengl_objects.each do |opengl_object|
           # TODO!!! FIXME!!!
           @renderer.send(:unroll_buffer_material, opengl_object)
 
           opengl_object.render = true
           if @renderer.sort_objects?
-            @_vector3.set_from_matrix_position(@object.matrix_world)
+            @_vector3 ||= Vector3.new
+
+            @_vector3.set_from_matrix_position(matrix_world)
             @_vector3.apply_projection(@renderer.proj_screen_matrix)
 
             opengl_object[:z] = @_vector3.z
@@ -86,7 +83,7 @@ module Mittsu
     end
 
     def setup_matrices(camera)
-      @model_view_matrix.multiply_matrices(camera.matrix_world_inverse, @object.matrix_world)
+      @model_view_matrix.multiply_matrices(camera.matrix_world_inverse, matrix_world)
       @normal_matrix.normal_matrix(@model_view_matrix)
       @model_view_matrix
     end
@@ -104,7 +101,6 @@ module Mittsu
     end
 
     def buffer_material(geometry_group)
-      material = @object.material
       if material.is_a?(MeshFaceMaterial)
         material.materials[geometry_group.material_index]
       else
@@ -123,8 +119,8 @@ module Mittsu
     protected
 
     def project_children
-      @object.children.each do |child|
-        child.implementation(@renderer).project
+      children.each do |child|
+        child.project(@renderer)
       end
     end
   end

data/lib/mittsu/renderers/opengl/lights/{opengl_ambient_light.rb → ambient_light.rb}

@@ -1,5 +1,5 @@
 module Mittsu
-  class OpenGLAmbientLight < OpenGLLight
+  class AmbientLight
     TYPE = :ambient
 
     class Cache < Struct.new(:length, :count, :value)
@@ -16,9 +16,9 @@ module Mittsu
     end
 
     def setup_specific(_)
-      @cache.value[0] += @light.color.r
-      @cache.value[1] += @light.color.g
-      @cache.value[2] += @light.color.b
+      @cache.value[0] += color.r
+      @cache.value[1] += color.g
+      @cache.value[2] += color.b
     end
 
     def self.null_remaining_lights(_); end

data/lib/mittsu/renderers/opengl/lights/{opengl_directional_light.rb → directional_light.rb}

@@ -1,5 +1,5 @@
 module Mittsu
-  class OpenGLDirectionalLight < OpenGLLight
+  class DirectionalLight
     TYPE = :directional
 
     class Cache < Struct.new(:length, :count, :colors, :positions)
@@ -15,8 +15,8 @@ module Mittsu
     def setup_specific(index)
       offset = index * 3
 
-      @_direction.set_from_matrix_position(@light.matrix_world)
-      @_vector3.set_from_matrix_position(@light.target.matrix_world)
+      @_direction.set_from_matrix_position(matrix_world)
+      @_vector3.set_from_matrix_position(target.matrix_world)
       @_direction.sub(@_vector3)
       @_direction.normalize
 
@@ -25,7 +25,7 @@ module Mittsu
       positions[offset + 1] = @_direction.y
       positions[offset + 2] = @_direction.z
 
-      OpenGLHelper.set_color_linear(@cache.colors, offset, @light.color, @light.intensity)
+      OpenGLHelper.set_color_linear(@cache.colors, offset, color, intensity)
     end
 
     def to_sym

data/lib/mittsu/renderers/opengl/lights/{opengl_hemisphere_light.rb → hemisphere_light.rb}

@@ -1,5 +1,5 @@
 module Mittsu
-  class OpenGLHemisphereLight < OpenGLLight
+  class HemisphereLight
     TYPE = :hemi
 
     class Cache < Struct.new(:length, :count, :sky_colors, :ground_colors, :positions)
@@ -15,7 +15,7 @@ module Mittsu
     def setup_specific(index)
       offset = index * 3
 
-      @_direction.set_from_matrix_position(@light.matrix_world)
+      @_direction.set_from_matrix_position(matrix_world)
       @_direction.normalize
 
       positions = @cache.positions
@@ -23,11 +23,8 @@ module Mittsu
       positions[offset + 1] = @_direction.y
       positions[offset + 2] = @_direction.z
 
-      sky_color = @light.color
-      ground_color = @light.ground_color
-
-      OpenGLHelper.set_color_linear(@cache.sky_colors, offset, sky_color, @light.intensity )
-      OpenGLHelper.set_color_linear(@cache.ground_colors, offset, ground_color, @light.intensity)
+      OpenGLHelper.set_color_linear(@cache.sky_colors, offset, color, intensity)
+      OpenGLHelper.set_color_linear(@cache.ground_colors, offset, ground_color, intensity)
     end
 
     def self.null_remaining_lights(cache)

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

@@ -0,0 +1,55 @@
+module Mittsu
+  class Light
+    attr_accessor :camera_helper
+
+    # def initialize(light, renderer)
+    #   super
+    #   @light = light
+    #   @light_renderer = renderer.light_renderer
+    #
+    #
+    #   @_direction = Vector3.new
+    #   @_vector3 = Vector3.new
+    # end
+
+    def type
+      self.class::TYPE
+    end
+
+    def setup(light_renderer)
+      @light_renderer = light_renderer
+      @cache ||= @light_renderer.cache[type]
+      @cache.count += 1
+
+      return unless visible
+
+      @_direction ||= Vector3.new
+      @_vector3 ||= Vector3.new
+
+      setup_specific(@cache.length)
+
+      @cache.length += 1
+    end
+
+    def project(renderer)
+      @renderer = renderer
+      return unless visible
+      init
+      # TODO!!! FIXME!!!
+      @renderer.instance_variable_get(:@lights) << self
+      project_children
+    end
+
+    def self.null_remaining_lights(cache, colors = nil)
+      colors ||= cache.colors
+      count = [colors.length, cache.count * 3].max
+      (cache.length * 3).upto(count - 1).each { |i|
+        colors[i] = 0.0
+      }
+    end
+
+    def to_sym
+      :other
+    end
+  end
+end