mittsu 0.1.2 → 0.1.3

data/lib/mittsu/textures/texture.rb

@@ -87,9 +87,5 @@ module Mittsu
     def dispose
       dispatch_event type: :dispose
     end
-
-    def implementation(renderer)
-      @_implementation ||= renderer.create_implementation(self)
-    end
   end
 end

data/lib/mittsu/version.rb

@@ -1,4 +1,4 @@
 module Mittsu
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
   REVISION = "71"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mittsu
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Daniel Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-15 00:00:00.000000000 Z
+date: 2016-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opengl-bindings
@@ -235,23 +235,24 @@ files:
 - lib/mittsu/objects/mesh.rb
 - lib/mittsu/renderers.rb
 - lib/mittsu/renderers/glfw_window.rb
-- lib/mittsu/renderers/opengl/core/opengl_geometry.rb
-- lib/mittsu/renderers/opengl/core/opengl_object_3d.rb
-- lib/mittsu/renderers/opengl/lights/opengl_ambient_light.rb
-- lib/mittsu/renderers/opengl/lights/opengl_directional_light.rb
-- lib/mittsu/renderers/opengl/lights/opengl_hemisphere_light.rb
-- lib/mittsu/renderers/opengl/lights/opengl_light.rb
-- lib/mittsu/renderers/opengl/lights/opengl_point_light.rb
-- lib/mittsu/renderers/opengl/lights/opengl_spot_light.rb
-- lib/mittsu/renderers/opengl/materials/opengl_line_basic_material.rb
-- lib/mittsu/renderers/opengl/materials/opengl_material.rb
-- lib/mittsu/renderers/opengl/materials/opengl_mesh_basic_material.rb
-- lib/mittsu/renderers/opengl/materials/opengl_mesh_lambert_material.rb
-- lib/mittsu/renderers/opengl/materials/opengl_mesh_phong_material.rb
-- lib/mittsu/renderers/opengl/materials/opengl_shader_material.rb
-- lib/mittsu/renderers/opengl/objects/opengl_group.rb
-- lib/mittsu/renderers/opengl/objects/opengl_line.rb
-- lib/mittsu/renderers/opengl/objects/opengl_mesh.rb
+- lib/mittsu/renderers/opengl/core/geometry.rb
+- lib/mittsu/renderers/opengl/core/object_3d.rb
+- lib/mittsu/renderers/opengl/lights/ambient_light.rb
+- lib/mittsu/renderers/opengl/lights/directional_light.rb
+- lib/mittsu/renderers/opengl/lights/hemisphere_light.rb
+- lib/mittsu/renderers/opengl/lights/light.rb
+- lib/mittsu/renderers/opengl/lights/point_light.rb
+- lib/mittsu/renderers/opengl/lights/spot_light.rb
+- lib/mittsu/renderers/opengl/materials/line_basic_material.rb
+- lib/mittsu/renderers/opengl/materials/material.rb
+- lib/mittsu/renderers/opengl/materials/mesh_basic_material.rb
+- lib/mittsu/renderers/opengl/materials/mesh_lambert_material.rb
+- lib/mittsu/renderers/opengl/materials/mesh_phong_material.rb
+- lib/mittsu/renderers/opengl/materials/opengl_material_basics.rb
+- lib/mittsu/renderers/opengl/materials/shader_material.rb
+- lib/mittsu/renderers/opengl/objects/group.rb
+- lib/mittsu/renderers/opengl/objects/line.rb
+- lib/mittsu/renderers/opengl/objects/mesh.rb
 - lib/mittsu/renderers/opengl/opengl_buffer.rb
 - lib/mittsu/renderers/opengl/opengl_debug.rb
 - lib/mittsu/renderers/opengl/opengl_default_target.rb
@@ -259,17 +260,18 @@ files:
 - lib/mittsu/renderers/opengl/opengl_geometry_like.rb
 - lib/mittsu/renderers/opengl/opengl_helper.rb
 - lib/mittsu/renderers/opengl/opengl_implementations.rb
+- lib/mittsu/renderers/opengl/opengl_lib.rb
 - lib/mittsu/renderers/opengl/opengl_light_renderer.rb
 - lib/mittsu/renderers/opengl/opengl_mittsu_params.rb
 - lib/mittsu/renderers/opengl/opengl_program.rb
 - lib/mittsu/renderers/opengl/opengl_shader.rb
 - lib/mittsu/renderers/opengl/opengl_state.rb
 - lib/mittsu/renderers/opengl/plugins/shadow_map_plugin.rb
-- lib/mittsu/renderers/opengl/scenes/opengl_scene.rb
-- lib/mittsu/renderers/opengl/textures/opengl_compressed_texture.rb
-- lib/mittsu/renderers/opengl/textures/opengl_cube_texture.rb
-- lib/mittsu/renderers/opengl/textures/opengl_data_texture.rb
-- lib/mittsu/renderers/opengl/textures/opengl_texture.rb
+- lib/mittsu/renderers/opengl/scenes/scene.rb
+- lib/mittsu/renderers/opengl/textures/compressed_texture.rb
+- lib/mittsu/renderers/opengl/textures/cube_texture.rb
+- lib/mittsu/renderers/opengl/textures/data_texture.rb
+- lib/mittsu/renderers/opengl/textures/texture.rb
 - lib/mittsu/renderers/opengl_render_target.rb
 - lib/mittsu/renderers/opengl_renderer.rb
 - lib/mittsu/renderers/shaders/rbsl_loader.rb

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

@@ -1,52 +0,0 @@
-module Mittsu
-  class OpenGLLight < OpenGLObject3D
-    attr_accessor :camera_helper
-
-    def initialize(light, renderer)
-      super
-      @light = light
-      @light_renderer = renderer.light_renderer
-      @cache = @light_renderer.cache[type]
-
-      @_direction = Vector3.new
-      @_vector3 = Vector3.new
-    end
-
-    def type
-      self.class::TYPE
-    end
-
-    def setup
-      @cache.count += 1
-
-      return unless @light.visible
-      setup_specific(@cache.length)
-
-      @cache.length += 1
-    end
-
-    def project
-      return unless @light.visible
-      init
-      # TODO!!! FIXME!!!
-      @renderer.instance_variable_get(:@lights) << @light
-      project_children
-    end
-
-    def setup_specific
-      raise "Unknown Light Impl: #{@light.class} => #{self.class}"
-    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

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

@@ -1,69 +0,0 @@
-module Mittsu
-  class OpenGLMeshBasicMaterial < OpenGLMaterial
-    def refresh_uniforms(uniforms)
-      refresh_map_uniforms(uniforms)
-      refresh_env_map_uniforms(uniforms)
-      refresh_other_uniforms(uniforms)
-    end
-
-    protected
-
-    def init_shader
-      @shader = ShaderLib.create_shader(shader_id)
-    end
-
-    def shader_id
-      :basic
-    end
-
-    private
-
-    def get_uv_scale_map
-      @material.map ||
-      @material.specular_map ||
-      @material.normal_map ||
-      @material.bump_map ||
-      @material.alpha_map
-    end
-
-    def refresh_map_uniforms(uniforms)
-      uniforms['map'].value = @material.map
-      uniforms['lightMap'].value = @material.light_map
-      uniforms['specularMap'].value = @material.specular_map
-      uniforms['alphaMap'].value = @material.alpha_map
-
-      if @material.bump_map
-        uniforms['bumpMap'].value = @material.bump_map
-        uniforms['bumpScale'].value = @material.bump_scale
-      end
-
-      if @material.normal_map
-        uniforms['normalMap'].value = @material.normal_map
-        uniforms['normalScale'].value.copy(@material.normal_scale)
-      end
-    end
-
-    def refresh_env_map_uniforms(uniforms)
-      uv_scale_map = get_uv_scale_map
-
-      if uv_scale_map
-        offset = uv_scale_map.offset
-        repeat = uv_scale_map.repeat
-
-        uniforms['offsetRepeat'].value.set(offset.x, offset.y, repeat.x, repeat.y)
-      end
-
-      uniforms['envMap'].value = @material.env_map
-      # TODO: when OpenGLRenderTargetCube exists
-      # uniforms['flipEnvMap'].value = @material.envMap.is_a?(OpenGLRenderTargetCube) ? 1 : - 1
-    end
-
-    def refresh_other_uniforms(uniforms)
-      uniforms['opacity'].value = @material.opacity
-      uniforms['diffuse'].value = @material.color
-
-      uniforms['reflectivity'].value = @material.reflectivity
-      uniforms['refractionRatio'].value = @material.refraction_ratio
-    end
-  end
-end

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

@@ -1,8 +0,0 @@
-module Mittsu
-  class OpenGLGroup < OpenGLObject3D
-    def project
-      return unless @object.visible
-      project_children
-    end
-  end
-end

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

@@ -1,54 +0,0 @@
-module Mittsu
-  class OpenGLLine < OpenGLObject3D
-    def initialize(line, renderer)
-      super
-      @line = line
-    end
-
-    def render_buffer(camera, lights, fog, material, geometry_group, update_buffers)
-      mode = @line.mode == LineStrip ? GL_LINE_STRIP : GL_LINES
-
-      @renderer.state.set_line_width(material.line_width * @renderer.pixel_ratio)
-
-      glDrawArrays(mode, 0, geometry_group.line_count)
-
-      @renderer.info[:render][:calls] += 1
-    end
-
-    def update
-      # TODO: glBindVertexArray ???
-      geometry = @line.geometry
-      material = buffer_material(geometry)
-      material_impl = material.implementation(@renderer)
-      custom_attributes_dirty = material.attributes && material_impl.custom_attributes_dirty?
-
-      if geometry.vertices_need_update || geometry.colors_need_update || geometry.line_distances_need_update || custom_attributes_dirty
-        geometry_impl = geometry.implementation(self)
-        geometry_impl.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_impl.clear_custom_attributes
-    end
-
-    def init_geometry
-      geometry = @object.geometry
-      geometry_impl = geometry.implementation(@renderer)
-      if geometry_impl.vertex_buffer.nil?
-        geometry_impl.create_line_buffers
-        geometry_impl.init_line_buffers(@object)
-
-        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(@object.geometry, @object)
-    end
-  end
-end

data/lib/mittsu/renderers/opengl/scenes/opengl_scene.rb

@@ -1,8 +0,0 @@
-module Mittsu
-  class OpenGLScene < OpenGLObject3D
-    def project
-      return unless @object.visible
-      project_children
-    end
-  end
-end