mittsu 0.1.7 → 0.2.0

data/lib/mittsu/objects/sprite.rb

@@ -0,0 +1,53 @@
+module Mittsu
+  class Sprite < Object3D
+    attr_accessor :material, :z
+
+    INDICES = [0, 1, 2,
+               0, 2, 3] # Uint16Array
+    VERTICES = [-0.5, -0.5, 0.0,
+                0.5, -0.5, 0.0,
+                0.5, 0.5, 0.0,
+                -0.5, 0.5, 0.0] # Float32Array
+    UVS = [0.0, 0.0,
+           1.0, 0.0,
+           1.0, 1.0,
+           0.0, 1.0] # Float32Array
+
+    GEOMETRY = BufferGeometry.new
+    GEOMETRY[:index] = BufferAttribute.new(INDICES, 1)
+    GEOMETRY[:position] = BufferAttribute.new(VERTICES, 3)
+    GEOMETRY[:uv] = BufferAttribute.new(UVS, 2)
+
+    def initialize(material = SpriteMaterial.new)
+      super()
+
+      @type = 'Sprite'
+
+      @geometry = GEOMETRY
+      @material = material
+      @z = nil
+    end
+
+    def raycast(raycaster, intersects)
+      @_matrix_position ||= Vector3.new
+
+      @_matrix_position.set_from_matrix_position(@matrix_world)
+
+      distance = raycaster.ray.distance_to_pint(@_matrix_position)
+
+      return if distance > @scale.x
+
+      intersects.push({
+        distance: distance,
+        point: @position,
+        face: nil,
+        object: self
+        })
+    end
+
+    def clone(object = Sprite.new(@material))
+      super(object)
+      object
+    end
+  end
+end

data/lib/mittsu/renderers/glfw_window.rb

@@ -178,6 +178,14 @@ module Mittsu
         glfwGetJoystickName(joystick)
       end
 
+      def set_mouselock(value)
+        if value
+          glfwSetInputMode(@handle, GLFW_CURSOR, GLFW_CURSOR_DISABLED)
+        else
+          glfwSetInputMode(@handle, GLFW_CURSOR, GLFW_CURSOR_NORMAL)
+        end
+      end
+
       private
 
       def poll_all_joysticks_buttons

data/lib/mittsu/renderers/opengl/core/buffer_geometry.rb

@@ -0,0 +1,11 @@
+module Mittsu
+  class BufferGeometry
+    include OpenGLGeometryLike
+
+    attr_accessor :initted
+
+    def init
+      @initted = true
+    end
+  end
+end

data/lib/mittsu/renderers/opengl/core/geometry.rb

@@ -34,7 +34,7 @@ module Mittsu
           @tangents_need_update = true
           @colors_need_update = true
 
-  				add_buffers = true
+          add_buffers = true
         else
           add_buffers = false
         end
@@ -59,6 +59,17 @@ module Mittsu
       init_custom_attributes(object)
     end
 
+    def init_particle_buffers(object)
+      nvertices = @vertices.length
+
+      @vertex_array = Array.new(nvertices * 3, 0.0) # Float32Array
+      @color_array = Array.new(nvertices * 3, 0.0) # Float32Array
+
+      @particle_count = nvertices
+
+      init_custom_attributes(object)
+    end
+
     def create_line_buffers
       @vertex_array_object = glCreateVertexArray
 
@@ -69,6 +80,15 @@ module Mittsu
       @renderer.info[:memory][:geometries] += 1
     end
 
+    def create_particle_buffers
+      @vertex_array_object = glCreateVertexArray
+
+      @vertex_buffer = glCreateBuffer
+      @color_buffer = glCreateBuffer
+
+      @renderer.info[:memory][:geometries] += 1
+    end
+
     def set_line_buffers(hint)
       if @vertices_need_update
         @vertices.each_with_index do |vertex, v|
@@ -117,36 +137,36 @@ module Mittsu
               custom_attribute.array[ca] = value
             end
           when 2
-            values.each_with_index do |value, ca|
-              custom_attribute[offset    ] = value.x
-              custom_attribute[offset + 1] = value.y
+            values.each do |value|
+              custom_attribute.array[offset    ] = value.x
+              custom_attribute.array[offset + 1] = value.y
 
               offset += 2
             end
           when 3
             if custom_attribute.type === :c
-              values.each_with_index do |value, ca|
-                custom_attribute[offset    ] = value.r
-                custom_attribute[offset + 1] = value.g
-                custom_attribute[offset + 2] = value.b
+              values.each do |value|
+                custom_attribute.array[offset    ] = value.r
+                custom_attribute.array[offset + 1] = value.g
+                custom_attribute.array[offset + 2] = value.b
 
                 offset += 3
               end
             else
-              values.each_with_index do |value, ca|
-                custom_attribute[offset    ] = value.x
-                custom_attribute[offset + 1] = value.y
-                custom_attribute[offset + 2] = value.z
+              values.each do |value|
+                custom_attribute.array[offset    ] = value.x
+                custom_attribute.array[offset + 1] = value.y
+                custom_attribute.array[offset + 2] = value.z
 
                 offset += 3
               end
             end
           when 4
-            values.each_with_index do |value, ca|
-              custom_attribute[offset    ] = value.x
-              custom_attribute[offset + 1] = value.y
-              custom_attribute[offset + 2] = value.z
-              custom_attribute[offset + 3] = value.w
+            values.each do |value|
+              custom_attribute.array[offset    ] = value.x
+              custom_attribute.array[offset + 1] = value.y
+              custom_attribute.array[offset + 2] = value.z
+              custom_attribute.array[offset + 3] = value.w
 
               offset += 4
             end
@@ -160,6 +180,88 @@ module Mittsu
       end
     end
 
+    def set_particle_buffers(hint)
+      if @vertices_need_update
+        @vertices.each_with_index do |vertex, v|
+          offset = v * 3
+
+          @vertex_array[offset]     = vertex.x
+          @vertex_array[offset + 1] = vertex.y
+          @vertex_array[offset + 2] = vertex.z
+        end
+
+
+        glBindBuffer(GL_ARRAY_BUFFER, @vertex_buffer)
+        glBufferData_easy(GL_ARRAY_BUFFER, @vertex_array, hint)
+      end
+
+      if @colors_need_update
+        @colors.each_with_index do |color, c|
+          offset = c * 3;
+
+          @color_array[offset]     = color.r
+          @color_array[offset + 1] = color.g
+          @color_array[offset + 2] = color.b
+        end
+
+        glBindBuffer(GL_ARRAY_BUFFER, @color_buffer)
+        glBufferData_easy(GL_ARRAY_BUFFER, @color_array, hint)
+      end
+
+      if @custom_attribute
+        @custom_attributes.each do |custom_attribute|
+          if custom_attribute.needs_update? && (custom_attribute.bount_to.nil? || custom_attribute.bount_to == 'vertices')
+            offset = 0
+
+            if custom_attribute.size == 1
+              custom_attribute.value.each_with_index do |value, ca|
+                custom_attribute.array[ca] = value
+              end
+            elsif custom_attribute.size == 2
+              custom_attribute.value.each do |value|
+                custom_attribute.array[offset]     = value.x
+                custom_attribute.array[offset + 1] = value.y
+
+                offset += 2
+              end
+            elsif custom_attribute.size == 3
+              if custom_attribute.type == :c
+                custom_attribute.value.each do |value|
+                  custom_attribute.array[offset]     = value.r
+                  custom_attribute.array[offset + 1] = value.g
+                  custom_attribute.array[offset + 2] = value.b
+
+                  offset += 3
+                end
+              else
+                custom_attribute.value.each do |value|
+                  custom_attribute.array[offset]     = value.x
+                  custom_attribute.array[offset + 1] = value.y
+                  custom_attribute.array[offset + 2] = value.z
+
+                  offset += 3
+                end
+              end
+            elsif custom_attribute.size == 4
+              custom_attribute.value.each do |value|
+                custom_attribute.array[offset]     = value.x
+                custom_attribute.array[offset + 1] = value.y
+                custom_attribute.array[offset + 2] = value.z
+                custom_attribute.array[offset + 3] = value.w
+
+                offset += 3
+              end
+            end
+          end
+
+          glBindBuffer(GL_ARRAY_BUFFER, customAttribute.buffer)
+          glBufferData(GL_ARRAY_BUFFER, customAttribute.array, hint)
+
+          custom_attribute.needs_update = false
+        end
+      end
+    end
+
     private
 
     def make_groups(uses_face_material = false)

data/lib/mittsu/renderers/opengl/materials/point_cloud_material.rb

@@ -0,0 +1,27 @@
+module Mittsu
+  class PointCloudMaterial
+    def refresh_uniforms(uniforms)
+      uniforms['psColor'].value = color
+      uniforms['opacity'].value = opacity
+      uniforms['size'].value = size
+      # uniforms['scale'].value = _canvas.height / 2.0 # TODO get window height?
+
+      uniforms['map'].value = map
+
+      if !map.nil?
+        offset = material.map.offset
+        repeat = material.map.repeat
+
+        uniforms['offsetRepeat'].value.set(offset.x, offset.y, repeat.x, repeat.y)
+      end
+    end
+
+    def init_shader
+      @shader = ShaderLib.create_shader(shader_id)
+    end
+
+    def shader_id
+      :particle_basic
+    end
+  end
+end

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

@@ -34,7 +34,7 @@ module Mittsu
 
         geometry.vertices_need_update = true
         geometry.colors_need_update = true
-        geometry.line_distances_need_update
+        geometry.line_distances_need_update = true
       end
     end
 

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

@@ -0,0 +1,39 @@
+module Mittsu
+  class PointCloud
+    def render_buffer(camera, lights, fog, material, geometry_group, update_buffers)
+      glDrawArrays(GL_POINTS, 0, geometry_group.particle_count)
+
+      @renderer.info[:render][:calls] += 1
+      @renderer.info[:render][:points] += geometry_group.particle_count
+    end
+
+    def update
+			material = buffer_material(geometry)
+			custom_attributes_dirty = material.attributes &&  material.custom_attributes_dirty?
+
+			if geometry.vertices_need_update || geometry.colors_need_update || custom_attributes_dirty
+				geometry.set_particle_buffers(GL_DYNAMIC_DRAW)
+			end
+
+			geometry.vertices_need_update = false
+			geometry.colors_need_update = false
+
+      material.attributes && material.clear_custom_attributes
+    end
+
+    def init_geometry
+      geometry.renderer = @renderer
+      if geometry.vertex_buffer.nil?
+        geometry.create_particle_buffers
+        geometry.init_particle_buffers(self)
+
+        geometry.vertices_need_update = true
+        geometry.colors_need_update = true
+      end
+    end
+
+    def add_opengl_object
+      @renderer.add_opengl_object(geometry, self)
+    end
+  end
+end

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

@@ -0,0 +1,12 @@
+module Mittsu
+  class Sprite
+    def project(renderer)
+      @renderer = renderer
+      return unless visible
+      init
+      # TODO!!! FIXME!!!
+      @renderer.instance_variable_get(:@sprites) << self
+      project_children
+    end
+  end
+end

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

@@ -5,5 +5,9 @@ module Mittsu
     def name
       "BUFFER(#{object.name})"
     end
+
+    def id
+      object.id
+    end
   end
 end

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

@@ -39,7 +39,7 @@ module OpenGLDebug
     const_set c, OpenGL.const_get(c)
   end
 
-  def call_debug_method m, *args
+  def call_debug_method m, called_from = caller[0], *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(', ')})"
@@ -49,7 +49,7 @@ module OpenGLDebug
     print call
     r = OpenGLProxy.send(m, *args)
     ret = r.nil? ? '' : " => #{r}"
-    puts "#{ret} (#{caller[0]})"
+    puts "#{ret} (#{called_from})"
     e = OpenGLProxy.glGetError
     raise "ERROR: #{m} => #{ERROR_STRINGS[e]}" unless e == OpenGL::GL_NO_ERROR
     r
@@ -57,12 +57,12 @@ module OpenGLDebug
 
   OpenGL.instance_methods.each do |m|
     define_method m do |*args|
-      self.call_debug_method(m, *args)
+      self.call_debug_method(m, caller[0], *args)
     end
   end
 
   def glCreateProgram
-    call_debug_method(:glCreateProgram).tap do |handle|
+    call_debug_method(:glCreateProgram, caller[0]).tap do |handle|
       @@shaders ||= {}
       @@shaders[handle] = DebugShader.new(handle)
     end
@@ -70,11 +70,11 @@ module OpenGLDebug
 
   def glUseProgram(handle)
     @@current_shader = @@shaders[handle]
-    call_debug_method(:glUseProgram, handle)
+    call_debug_method(:glUseProgram, caller[0], handle)
   end
 
   def glGetUniformLocation(program, name)
-    call_debug_method(:glGetUniformLocation, program, name).tap do |handle|
+    call_debug_method(:glGetUniformLocation, caller[0], program, name).tap do |handle|
       @@shaders[program].set_uniform(handle, name)
     end
   end

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

@@ -27,6 +27,7 @@ module Mittsu
                   :type_array,
                   :face_count,
                   :line_count,
+                  :particle_count,
                   :initted_arrays,
                   :custom_attributes_list,
                   :num_vertices,

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

@@ -137,23 +137,23 @@ module Mittsu
 
       def painter_sort_stable(a, b)
         if a.object.render_order != b.object.render_order
-          a.object.render_order - b.object.render_order
+          a.object.render_order <=> b.object.render_order
         elsif a.material.id != b.material.id
-          a.material.id - b.material.id
+          a.material.id <=> b.material.id
         elsif a.z != b.z
-          a.z - b.z
+          a.z <=> b.z
         else
-          a.object.id - b.object.id
+          a.object.id <=> b.object.id
         end
       end
 
       def reverse_painter_sort_stable(a, b)
         if a.object.render_order != b.object.render_order
-          a.object.render_order - b.object.render_order
+          a.object.render_order <=> b.object.render_order
         elsif a.z != b.z
-          b.z - a.z
+          b.z <=> a.z
         else
-          a.id - b.id
+          b.id <=> a.id
         end
       end
     end