mittsu 0.1.2 → 0.1.3

data/lib/mittsu/renderers/opengl/materials/{opengl_shader_material.rb → shader_material.rb}

@@ -1,5 +1,5 @@
 module Mittsu
-  class OpenGLShaderMaterial < OpenGLMaterial
+  class ShaderMaterial
     def needs_camera_position_uniform?
       true
     end

data/lib/mittsu/renderers/opengl/objects/group.rb

@@ -0,0 +1,9 @@
+module Mittsu
+  class Group
+    def project(renderer)
+      @renderer = renderer
+      return unless visible
+      project_children
+    end
+  end
+end

data/lib/mittsu/renderers/opengl/objects/line.rb

@@ -0,0 +1,45 @@
+module Mittsu
+  class Line
+    def render_buffer(camera, lights, fog, material, geometry_group, update_buffers)
+      opengl_mode = mode == LineStrip ? GL_LINE_STRIP : GL_LINES
+
+      @renderer.state.set_line_width(material.line_width * @renderer.pixel_ratio)
+
+      glDrawArrays(opengl_mode, 0, geometry_group.line_count)
+
+      @renderer.info[:render][:calls] += 1
+    end
+
+    def update
+      # TODO: glBindVertexArray ???
+      material = buffer_material(geometry)
+      custom_attributes_dirty = material.attributes && material.custom_attributes_dirty?
+
+      if geometry.vertices_need_update || geometry.colors_need_update || geometry.line_distances_need_update || custom_attributes_dirty
+        geometry.set_line_buffers(GL_DYNAMIC_DRAW)
+      end
+
+      geometry.vertices_need_update = false
+      geometry.colors_need_update = false
+      geometry.line_distances_need_update = false
+
+      material.attributes && material.clear_custom_attributes
+    end
+
+    def init_geometry
+      geometry.renderer = @renderer
+      if geometry.vertex_buffer.nil?
+        geometry.create_line_buffers
+        geometry.init_line_buffers(self)
+
+        geometry.vertices_need_update = true
+        geometry.colors_need_update = true
+        geometry.line_distances_need_update
+      end
+    end
+
+    def add_opengl_object
+      @renderer.add_opengl_object(geometry, self)
+    end
+  end
+end

data/lib/mittsu/renderers/opengl/objects/{opengl_mesh.rb → mesh.rb}

@@ -1,9 +1,6 @@
 module Mittsu
-  class OpenGLMesh < OpenGLObject3D
-    def initialize(mesh, renderer)
-      super
-      @mesh = mesh
-    end
+  class Mesh
+    attr_accessor :renderer
 
     def render_buffer(camera, lights, fog, material, geometry_group, update_buffers)
       type = GL_UNSIGNED_INT # geometry_group.type_array == Uint32Array ? GL_UNSIGNED_INT : GL_UNSIGNED_SHORT
@@ -28,21 +25,16 @@ module Mittsu
 
     def update
       # check all geometry groubs
-      geometry = @mesh.geometry
-      geometry_impl = geometry.implementation(self)
-
-      material = nil
-      material_impl = nil
-      geometry_impl.groups.each do |geometry_group|
+      mat = nil
+      geometry.groups.each do |geometry_group|
         # TODO: place to put this???
         # glBindVertexArray(geometry_group.vertex_array_object)
-        material = buffer_material(geometry_group)
-        material_impl = material.implementation(@renderer)
+        mat = buffer_material(geometry_group)
 
-        custom_attributes_dirty = material.attributes && material_impl.custom_attributes_dirty?
+        custom_attributes_dirty = mat.attributes && mat.custom_attributes_dirty?
 
         if geometry.vertices_need_update || geometry.morph_targets_need_update || geometry.elements_need_update || geometry.uvs_need_update || geometry.normals_need_update || geometry.colors_need_update || geometry.tangents_need_update || custom_attributes_dirty
-          geometry_group.set_mesh_buffers(@mesh, GL_DYNAMIC_DRAW, !geometry.dynamic, material)
+          geometry_group.set_mesh_buffers(self, GL_DYNAMIC_DRAW, !geometry.dynamic, mat)
         end
       end
 
@@ -54,23 +46,24 @@ module Mittsu
       geometry.colors_need_update = false
       geometry.tangents_need_update = false
 
-      material.attributes && material_impl.clear_custom_attributes(material)
+      mat.attributes && mat.clear_custom_attributes
     end
 
     def init_geometry
-      @object.geometry.implementation(@renderer).init_geometry_groups(@object)
+      geometry.renderer = @renderer
+      geometry.init_geometry_groups(self)
     end
 
     def add_opengl_object
-      geometry = @object.geometry
       case geometry
       when BufferGeometry
-        @renderer.add_opengl_object(geometry, @object)
+        @renderer.add_opengl_object(geometry, self)
       when Geometry
-        geometry_impl = geometry.implementation(self)
-        geometry_impl.groups.each do |group|
-          @renderer.add_opengl_object(group, @object)
+        geometry.groups.each do |group|
+          @renderer.add_opengl_object(group, self)
         end
+      else
+        raise "GEOMETRY IS NULL"
       end
     end
   end

data/lib/mittsu/renderers/opengl/opengl_buffer.rb

@@ -1,5 +1,9 @@
 module Mittsu
   class OpenGLBuffer < Struct.new(:buffer, :object, :material, :z)
     attr_accessor :render, :transparent, :opaque
+
+    def name
+      "BUFFER(#{object.name})"
+    end
   end
 end

data/lib/mittsu/renderers/opengl/opengl_debug.rb

@@ -31,8 +31,8 @@ module OpenGLDebug
     extend OpenGL
   end
 
-  def self.load_lib
-    OpenGL.load_lib
+  def self.load_lib(*args)
+    OpenGL.load_lib(*args)
   end
 
   OpenGL.constants.each do |c|
@@ -40,15 +40,16 @@ module OpenGLDebug
   end
 
   def call_debug_method m, *args
-    r = OpenGLProxy.send(m, *args)
     if m.to_s.start_with?('glUniform')
       uniform_name = @@current_shader.get_uniform_name(args.first)
       call = "#{m}('#{uniform_name}',#{args[1..-1].map { |s| s.to_s[0..20] }.join(', ')})"
     else
       call = "#{m}(#{args.map { |s| s.to_s[0..20] }.join(', ')})"
     end
+    print call
+    r = OpenGLProxy.send(m, *args)
     ret = r.nil? ? '' : " => #{r}"
-    puts "#{call}#{ret} (#{caller[0]})"
+    puts "#{ret} (#{caller[0]})"
     e = OpenGLProxy.glGetError
     raise "ERROR: #{m} => #{ERROR_STRINGS[e]}" unless e == OpenGL::GL_NO_ERROR
     r

data/lib/mittsu/renderers/opengl/opengl_default_target.rb

@@ -46,9 +46,5 @@ module Mittsu
     def set_viewport_size(width, height)
       @viewport_width, @viewport_height = width, height
     end
-
-    def implementation(_)
-      self
-    end
   end
 end

data/lib/mittsu/renderers/opengl/opengl_geometry_group.rb

@@ -57,7 +57,6 @@ module Mittsu
 
     def init_mesh_buffers(object)
       geometry = object.geometry
-      object_impl = object.implementation(@renderer)
 
       nvertices = @faces3.length * 3
       nvertices2 = nvertices * 2
@@ -66,7 +65,7 @@ module Mittsu
       ntris = @faces3.length * 1
       nlines = @faces3.length * 3
 
-      material = object_impl.buffer_material(self)
+      material = object.buffer_material(self)
 
       @vertex_array = Array.new(nvertices3) # Float32Array
       @normal_array = Array.new(nvertices3) # Float32Array
@@ -159,9 +158,8 @@ module Mittsu
       return unless @initted_arrays
 
       geometry = object.geometry
-      material_impl = material.implementation(@renderer)
 
-      needs_face_normals = material_impl.needs_face_normals?
+      needs_face_normals = material.needs_face_normals?
 
       vertex_index = 0
 
@@ -755,9 +753,5 @@ module Mittsu
       @skin_index_array = nil
       @skin_weight_array = nil
     end
-
-    def implementation(_)
-      self
-    end
   end
 end

data/lib/mittsu/renderers/opengl/opengl_geometry_like.rb

@@ -29,7 +29,8 @@ module Mittsu
                   :line_count,
                   :initted_arrays,
                   :custom_attributes_list,
-                  :num_vertices
+                  :num_vertices,
+                  :renderer
 
     def bind_vertex_array_object
       glBindVertexArray(@vertex_array_object) if @vertex_array_object

data/lib/mittsu/renderers/opengl/opengl_implementations.rb

@@ -5,57 +5,28 @@ require 'mittsu/materials'
 require 'mittsu/textures'
 require 'mittsu/scenes'
 
-require 'mittsu/renderers/opengl/core/opengl_geometry'
-require 'mittsu/renderers/opengl/core/opengl_object_3d'
-require 'mittsu/renderers/opengl/objects/opengl_mesh'
-require 'mittsu/renderers/opengl/objects/opengl_line'
-require 'mittsu/renderers/opengl/objects/opengl_group'
-require 'mittsu/renderers/opengl/scenes/opengl_scene'
-require 'mittsu/renderers/opengl/materials/opengl_material'
-require 'mittsu/renderers/opengl/materials/opengl_mesh_basic_material'
-require 'mittsu/renderers/opengl/materials/opengl_mesh_lambert_material'
-require 'mittsu/renderers/opengl/materials/opengl_mesh_phong_material'
-require 'mittsu/renderers/opengl/materials/opengl_line_basic_material'
-require 'mittsu/renderers/opengl/materials/opengl_shader_material'
-require 'mittsu/renderers/opengl/textures/opengl_texture'
-require 'mittsu/renderers/opengl/textures/opengl_cube_texture'
-require 'mittsu/renderers/opengl/textures/opengl_data_texture'
-require 'mittsu/renderers/opengl/textures/opengl_compressed_texture'
-require 'mittsu/renderers/opengl/lights/opengl_light'
-require 'mittsu/renderers/opengl/lights/opengl_light'
-require 'mittsu/renderers/opengl/lights/opengl_spot_light'
-require 'mittsu/renderers/opengl/lights/opengl_point_light'
-require 'mittsu/renderers/opengl/lights/opengl_hemisphere_light'
-require 'mittsu/renderers/opengl/lights/opengl_ambient_light'
-require 'mittsu/renderers/opengl/lights/opengl_directional_light'
+require 'mittsu/renderers/opengl/core/geometry'
+require 'mittsu/renderers/opengl/core/object_3d'
+require 'mittsu/renderers/opengl/objects/mesh'
+require 'mittsu/renderers/opengl/objects/line'
+require 'mittsu/renderers/opengl/objects/group'
+require 'mittsu/renderers/opengl/scenes/scene'
 
-module Mittsu
-  OPENGL_IMPLEMENTATIONS = {
-    Object3D => OpenGLObject3D,
-    Geometry => OpenGLGeometry,
-    Material => OpenGLMaterial,
-    Texture => OpenGLTexture,
-    Light => OpenGLLight,
-    CubeTexture => OpenGLCubeTexture,
-    Mesh => OpenGLMesh,
-    Line => OpenGLLine,
-    SpotLight => OpenGLSpotLight,
-    PointLight => OpenGLPointLight,
-    HemisphereLight => OpenGLHemisphereLight,
-    AmbientLight => OpenGLAmbientLight,
-    DirectionalLight => OpenGLDirectionalLight,
-    DataTexture => OpenGLDataTexture,
-    CompressedTexture => OpenGLCompressedTexture,
-    Scene => OpenGLScene,
-    Group => OpenGLGroup,
-    MeshBasicMaterial => OpenGLMeshBasicMaterial,
-    MeshLambertMaterial => OpenGLMeshLambertMaterial,
-    MeshPhongMaterial => OpenGLMeshPhongMaterial,
-    LineBasicMaterial => OpenGLLineBasicMaterial,
-    ShaderMaterial => OpenGLShaderMaterial
-  }
-  OPENGL_IMPLEMENTATIONS.default_proc = -> (hash, key) {
-    super_klass = key.ancestors.find { |a| hash.has_key?(a) }
-    super_klass ? (hash[key] = hash[super_klass]) : nil
-  }
-end
+require 'mittsu/renderers/opengl/lights/light'
+require 'mittsu/renderers/opengl/lights/spot_light'
+require 'mittsu/renderers/opengl/lights/point_light'
+require 'mittsu/renderers/opengl/lights/hemisphere_light'
+require 'mittsu/renderers/opengl/lights/ambient_light'
+require 'mittsu/renderers/opengl/lights/directional_light'
+
+require 'mittsu/renderers/opengl/materials/material'
+require 'mittsu/renderers/opengl/materials/mesh_basic_material'
+require 'mittsu/renderers/opengl/materials/mesh_lambert_material'
+require 'mittsu/renderers/opengl/materials/mesh_phong_material'
+require 'mittsu/renderers/opengl/materials/line_basic_material'
+require 'mittsu/renderers/opengl/materials/shader_material'
+
+require 'mittsu/renderers/opengl/textures/texture'
+require 'mittsu/renderers/opengl/textures/cube_texture'
+require 'mittsu/renderers/opengl/textures/data_texture'
+require 'mittsu/renderers/opengl/textures/compressed_texture'

data/lib/mittsu/renderers/opengl/opengl_lib.rb

@@ -0,0 +1,62 @@
+module OpenGLLib
+  def self.discover
+    case OpenGL.get_platform
+    when :OPENGL_PLATFORM_WINDOWS
+      Windows.new
+    when :OPENGL_PLATFORM_MACOSX
+      MacOS.new
+    when :OPENGL_PLATFORM_LINUX
+      Linux.new
+    else
+      fail "Unsupported platform."
+    end
+  end
+
+  class Linux
+    def path
+      # http://www.pilotlogic.com/sitejoom/index.php/wiki?id=398<F37>
+      # 32              64
+      # /usr/lib        /usr/lib64       redhat, mandriva
+      # /usr/lib32      /usr/lib64       arch, gento
+      # /usr/lib        /usr/lib64       slackware
+      # /usr/lib/i386.. /usr/libx86_64/  debian
+      libs = Dir.glob("/usr/lib*/**/libGL.so")
+      if libs.size == 0
+        puts "no libGL.so"
+        exit 1
+      end
+      case kernel_module_in_use
+      when /nvidia/
+        return File.dirname(libs.grep(/nvidia/)[0])
+      end
+      # Get the same architecture that the runnning ruby
+      if 1.size == 8 # 64 bits
+        File.dirname(libs.grep(/64/)[0])
+      else # 32 bits
+        File.dirname(libs[0])
+      end
+    end
+
+    def file
+      'libGL.so'
+    end
+
+    private
+      def kernel_module_in_use
+        lspci_line = `lspci -nnk | grep -i vga -A3 | grep 'in use'`
+        return /in use:\s*(\S+)/ =~ lspci_line && $1
+      end
+  end
+
+  # TODO
+  class Windows
+    def path; nil; end
+    def file; nil; end
+  end
+
+  # TODO
+  class MacOS
+    def path; nil; end
+    def file; nil; end
+  end
+end

data/lib/mittsu/renderers/opengl/opengl_light_renderer.rb

@@ -3,11 +3,11 @@ module Mittsu
     attr_accessor :lights_need_update, :cache
 
     LIGHT_CLASSES = [
-      OpenGLAmbientLight,
-      OpenGLDirectionalLight,
-      OpenGLPointLight,
-      OpenGLSpotLight,
-      OpenGLHemisphereLight
+      AmbientLight,
+      DirectionalLight,
+      PointLight,
+      SpotLight,
+      HemisphereLight
     ]
     LIGHT_TYPES = LIGHT_CLASSES.map { |klass| klass::TYPE }
 
@@ -25,7 +25,7 @@ module Mittsu
 
       lights.each do |light|
         next if light.only_shadow
-        light.implementation(self).setup
+        light.setup(self)
       end
 
       LIGHT_CLASSES.each do |klass|

data/lib/mittsu/renderers/opengl/opengl_program.rb

@@ -13,8 +13,7 @@ module Mittsu
 
       compile_and_link_program(material, parameters)
 
-      material_impl = material.implementation(@renderer)
-      cache_uniform_locations(material_impl.shader[:uniforms] || {}, parameters)
+      cache_uniform_locations(material.shader[:uniforms] || {}, parameters)
       cache_attribute_locations(material.attributes || {}, parameters)
 
       @code = code
@@ -149,7 +148,6 @@ module Mittsu
     end
 
     def compile_shaders(material, parameters)
-      material_impl = material.implementation(@renderer)
       shadow_map_type_define = get_shadow_map_define(parameters[:shadow_map_type])
 
       env_map_type_define = get_env_map_type_define(parameters[:env_map], material)
@@ -168,8 +166,8 @@ module Mittsu
         prefix_fragment = File.read(File.expand_path('../../shaders/shader_templates/fragment.glsl.erb', __FILE__))
       end
 
-      @vertex_shader = OpenGLShader.new(GL_VERTEX_SHADER, compile_shader_template(prefix_vertex + material_impl.shader[:vertex_shader], binding))
-      @fragment_shader = OpenGLShader.new(GL_FRAGMENT_SHADER, compile_shader_template(prefix_fragment + material_impl.shader[:fragment_shader], binding))
+      @vertex_shader = OpenGLShader.new(GL_VERTEX_SHADER, compile_shader_template(prefix_vertex + material.shader[:vertex_shader], binding))
+      @fragment_shader = OpenGLShader.new(GL_FRAGMENT_SHADER, compile_shader_template(prefix_fragment + material.shader[:fragment_shader], binding))
 
       glAttachShader(@program, @vertex_shader.shader)
       glAttachShader(@program, @fragment_shader.shader)

data/lib/mittsu/renderers/opengl/plugins/shadow_map_plugin.rb

@@ -49,10 +49,10 @@ module Mittsu
         skinning: true
       )
 
-      @depth_material.implementation(renderer).shadow_pass = true
-      @depth_material_morph.implementation(renderer).shadow_pass = true
-      @depth_material_skin.implementation(renderer).shadow_pass = true
-      @depth_material_morph_skin.implementation(renderer).shadow_pass = true
+      @depth_material.shadow_pass = true
+      @depth_material_morph.shadow_pass = true
+      @depth_material_skin.shadow_pass = true
+      @depth_material_morph_skin.shadow_pass = true
     end
 
     def render(scene, camera)
@@ -122,6 +122,7 @@ module Mittsu
           pars = { min_filter: shadow_filter, mag_filter: shadow_filter, format: RGBAFormat }
 
           light.shadow_map = OpenGLRenderTarget.new(light.shadow_map_width, light.shadow_map_height, pars)
+          light.shadow_map.renderer = @renderer
           light.shadow_map_size = Vector2.new(light.shadow_map_width, light.shadow_map_height)
 
           light.shadow_matrix = Matrix4.new
@@ -142,10 +143,9 @@ module Mittsu
           scene.update_matrix_world if scene.auto_update
         end
 
-        light_impl = light.implementation(@renderer)
-        if light.shadow_camera_visible && !light_impl.camera_helper
-          light_impl.camera_helper = CameraHelper.new(light.shadow_camera)
-          scene.add(light_impl.camera_helper)
+        if light.shadow_camera_visible && !light.camera_helper
+          light.camera_helper = CameraHelper.new(light.shadow_camera)
+          scene.add(light.camera_helper)
         end
 
         if light.virtual? && virtual_light.original_camera == camera
@@ -168,8 +168,8 @@ module Mittsu
         #
 
 
-        light_impl.camera_helper.visible = light.shadow_camera_visible if light_impl.camera_helper
-        light_impl.camera_helper.update if light.shadow_camera_visible
+        light.camera_helper.visible = light.shadow_camera_visible if light.camera_helper
+        light.camera_helper.update_points if light.shadow_camera_visible
 
         # compute shadow matrix
 
@@ -274,8 +274,7 @@ module Mittsu
 
         if opengl_objects && object.cast_shadow && (object.frustum_culled == false || @frustum.intersects_object?(object) == true)
           opengl_objects.each do |opengl_object|
-            object_impl = object.implementation(@renderer)
-            object_impl.model_view_matrix.multiply_matrices(shadow_camera.matrix_world_inverse, object.matrix_world)
+            object.model_view_matrix.multiply_matrices(shadow_camera.matrix_world_inverse, object.matrix_world)
             @render_list << opengl_object
           end
         end