roglew 0.2.3 → 0.2.4

data/lib/roglew/contexts/base.rb

@@ -20,7 +20,7 @@ module Roglew
       singleton_class.send(:include, @deferred ? DeferredContext : ImmediateContext)
       mod = self.class.instance_variable_get(@deferred ? :@deferred_mod : :@immediate_mod)
       singleton_class.send(:include, mod) if mod
-      run(&block) if block_given? && respond_to?(:run, true)
+      run(&block) if respond_to?(:run, true)
     end
 
     def self.included(c)

data/lib/roglew/extensions/GL_ARB_framebuffer_object/framebuffer.rb

@@ -7,14 +7,14 @@ module Roglew
     def initialize(context)
       @context = context
       @id = context.gen_framebuffers
-      self.class.finalize(self, @context, @id)
+      ObjectSpace.define_finalizer(self, self.class.finalize(@context, @id))
     end
 
-    def self.finalize(obj, ctx, id)
-      ObjectSpace.define_finalizer(obj, proc do
+    def self.finalize(ctx, id)
+      proc do
         puts "releasing framebuffer #{id}"
         ctx.delete_framebuffers(id)
-      end)
+      end
     end
 
     #target: one of GL::DRAW_FRAMEBUFFER, GL::READ_FRAMEBUFFER or GL::FRAMEBUFFER

data/lib/roglew/extensions/GL_ARB_framebuffer_object/renderbuffer.rb

@@ -7,14 +7,14 @@ module Roglew
     def initialize(context)
       @context = context
       @id = context.gen_renderbuffers
-      self.class.finalize(self, @context, @id)
+      ObjectSpace.define_finalizer(self, self.class.finalize(@context, @id))
     end
 
-    def self.finalize(obj, ctx, id)
-      ObjectSpace.define_finalizer(obj, proc do
+    def self.finalize(ctx, id)
+      proc do
         puts "releasing renderbuffer #{id}"
         ctx.delete_renderbuffers(id)
-      end)
+      end
     end
 
     def bind(deferred = nil, &block)

data/lib/roglew/extensions/GL_ARB_vertex_array_object/vertex_array.rb

@@ -6,14 +6,14 @@ module Roglew
     def initialize(context)
       @context = context
       @id = context.gen_vertex_arrays
-      self.class.finalize(self, @context, @id)
+      ObjectSpace.define_finalizer(self, self.class.finalize(@context, @id))
     end
 
-    def self.finalize(obj, ctx, id)
-      ObjectSpace.define_finalizer(obj, proc do
+    def self.finalize(ctx, id)
+      proc do
         puts "releasing vertex array #{id}"
         ctx.delete_vertex_arrays(id)
-      end)
+      end
     end
 
     def bind

data/lib/roglew/extensions/GL_EXT_framebuffer_object/framebuffer.rb

@@ -7,14 +7,14 @@ module Roglew
     def initialize(context)
       @context = context
       @id = context.gen_framebuffersEXT
-      self.class.finalize(self, @context, @id)
+      ObjectSpace.define_finalizer(self, self.class.finalize(@context, @id))
     end
 
-    def self.finalize(obj, ctx, id)
-      ObjectSpace.define_finalizer(obj, proc do
+    def self.finalize(ctx, id)
+      proc do
         puts "releasing framebuffer #{id}"
         ctx.delete_framebuffersEXT(id)
-      end)
+      end
     end
 
     #target: one of GL::DRAW_FRAMEBUFFER_EXT, GL::READ_FRAMEBUFFER_EXT or GL::FRAMEBUFFER_EXT

data/lib/roglew/extensions/GL_EXT_framebuffer_object/renderbuffer.rb

@@ -7,14 +7,14 @@ module Roglew
     def initialize(context)
       @context = context
       @id = context.gen_renderbuffersEXT
-      self.class.finalize(self, @context, @id)
+      ObjectSpace.define_finalizer(self, self.class.finalize(@context, @id))
     end
 
-    def self.finalize(obj, ctx, id)
-      ObjectSpace.define_finalizer(obj, proc do
+    def self.finalize(ctx, id)
+      proc do
         puts "releasing renderbuffer #{id}"
         ctx.delete_renderbuffersEXT(id)
-      end)
+      end
     end
 
     def bind(deferred = nil, &block)

data/lib/roglew/extensions/GL_VERSION_1_5/buffer.rb

@@ -8,14 +8,14 @@ module Roglew
       @context = context
       @id = context.gen_buffers
 
-      self.class.finalize(self, @context, @id)
+      ObjectSpace.define_finalizer(self, self.class.finalize(@context, @id))
     end
 
-    def self.finalize(obj, ctx, id)
-      ObjectSpace.define_finalizer(obj, proc do
+    def self.finalize(ctx, id)
+      proc do
         puts "releasing buffer #{id}"
         ctx.delete_buffers(id)
-      end)
+      end
     end
 
     def bind(target, deferred = nil, &block)

data/lib/roglew/extensions/GL_VERSION_1_5/buffer_context.rb

@@ -7,8 +7,12 @@ module Roglew
       super(buffer, deferred, &block)
     end
 
-    def data(usage, type = nil, buffer = nil)
-      make_call(:buffer_data, @target, usage, type, buffer)
+    def data(usage, buffer = nil, type = nil)
+      make_call(:buffer_data, @target, usage, buffer, type)
+    end
+
+    def sub_data(offset, type, buffer)
+      make_call(:buffer_sub_data, @target, offset, type, buffer)
     end
 
     private

data/lib/roglew/extensions/GL_VERSION_1_5/query.rb

@@ -6,14 +6,14 @@ module Roglew
     def initialize(context)
       @context = context
       @id = context.gen_queries
-      self.class.finalize(self, @context, @id)
+      ObjectSpace.define_finalizer(self, self.class.finalize(@context, @id))
     end
 
-    def self.finalize(obj, ctx, id)
-      ObjectSpace.define_finalizer(obj, proc do
+    def self.finalize(ctx, id)
+      proc do
         puts "releasing query #{id}"
         ctx.delete_queries(id)
-      end)
+      end
     end
   end
 end

data/lib/roglew/extensions/GL_VERSION_1_5.rb

@@ -87,15 +87,29 @@ module GL_VERSION_1_5
     def_object :Buffers
     def_object :Queries
 
-    def buffer_data(target, usage, type = nil, buffer = nil)
-      glBufferData(target, *if buffer && buffer.size > 0
+    def buffer_data(target, usage, buffer = nil, type = nil)
+      glBufferData(target, *if buffer.is_a?(Array) && buffer.size > 0
         p = FFI::MemoryPointer.new(type, buffer.size)
-        p.write_array_of_float(buffer)
+        p.send("write_array_of_#{type}", buffer)
         [p.size, p]
       else
-        [0, nil]
+        size = buffer.respond_to?(:to_i) ? buffer.to_i : 0
+        size *= if size > 0 && type
+          type = FFI.find_type(type) if type.is_a?(Symbol)
+          type.size
+        else
+          1
+        end
+
+        [size, nil]
       end, usage)
     end
+
+    def buffer_sub_data(target, offset, type, buffer)
+      pointer = FFI::MemoryPointer.new(type, buffer.size)
+      pointer.send("write_array_of_#{type}", buffer)
+      glBufferSubData(target, offset, buffer.size, pointer)
+    end
   end
 end
 

data/lib/roglew/extensions/GL_VERSION_2_0/shader.rb

@@ -13,13 +13,14 @@ module Roglew
         compile(src)
       end
 
-      self.class.finalize(self, @id, @context)
+      ObjectSpace.define_finalizer(self, self.class.finalize(@id, @context))
     end
 
-    def self.finalize(obj, id, ctx)
-      ObjectSpace.define_finalizer(obj, proc do
+    def self.finalize(id, ctx)
+      proc do
+        puts "releasing shader #{id}"
         ctx.glDeleteShader(id)
-      end)
+      end
     end
 
     def compile(src)

data/lib/roglew/extensions/GL_VERSION_2_0/shader_program.rb

@@ -7,14 +7,16 @@ module Roglew
     def initialize(context)
       @context = context
       @id = context.glCreateProgram()
+      @attribs, @uniforms = {}, {}
 
-      self.class.finalize(self, @id, @context)
+      ObjectSpace.define_finalizer(self, self.class.finalize(@id, @context))
     end
 
-    def self.finalize(obj, id, ctx)
-      ObjectSpace.define_finalizer(obj, proc do
+    def self.finalize(id, ctx)
+      proc do
+        puts "releasing program #{id}"
         ctx.glDeleteProgram(id)
-      end)
+      end
     end
 
     def attach(*shaders)
@@ -34,10 +36,36 @@ module Roglew
 
     def use_program
       @context.glUseProgram(@id)
+      if block_given?
+        yield
+        @context.glUseProgram(0)
+      end
+    end
+
+    def attrib_location(name)
+      name = name.to_sym
+      loc = @attribs[name]
+      return loc if loc
+      loc = @context.glGetAttribLocation(@id, name.to_s)
+      return nil if loc < 0
+      @attribs[name] = loc
+    end
+
+    def attrib_locations(*names)
+      names.map { |name| attrib_location(name) }
+    end
+
+    def uniform_location(name)
+      name = name.to_sym
+      loc = @uniforms[name]
+      return loc if loc
+      loc = @context.glGetUniformLocation(@id, name.to_s)
+      return nil if loc < 0
+      @uniforms[name] = loc
     end
 
     def uniform_locations(*names)
-      names.map { |name| @context.glGetUniformLocation(@id, name) }
+      names.map { |name| uniform_location(name) }
     end
 
     alias_method :link, :link_program

data/lib/roglew/texture2d.rb

@@ -17,8 +17,8 @@ module Roglew
       end)
     end
 
-    def bind(deferred = nil, &block)
-      create_binding(deferred, GL::TEXTURE_2D, &block)
+    def bind(level = 0, deferred = nil, &block)
+      create_binding(deferred, GL::TEXTURE_2D, level, &block)
     end
   end
 end

data/lib/roglew/texture_context.rb

@@ -2,8 +2,10 @@ module Roglew
   class TextureContext
     include Roglew::BaseContext(:texture)
 
-    def initialize(texture, deferred, target, &block)
-      @target = target
+    attr_accessor :level
+
+    def initialize(texture, deferred, target, level, &block)
+      @target, @level = target, level
       super(texture, deferred, &block)
     end
 
@@ -30,8 +32,12 @@ module Roglew
       make_call(:tex_parameter, @target, GL::TEXTURE_BORDER_COLOR, r, g, b, a)
     end
 
-    def tex_image_2d(width, height, internalFormat, format, type, data)
-      make_call(:glTexImage2D, @target, 0, internalFormat, width, height, 0, format, type, data)
+    def tex_image_2d(width, height, internalFormat, format, type, data = nil)
+      make_call(:glTexImage2D, @target, @level, internalFormat, width, height, 0, format, type, data)
+    end
+
+    def tex_subimage_2d(x, y, width, height, format, type, data = nil)
+      make_call(:glTexSubImage2D, @target, @level, x, y, width, height, format, type, data)
     end
 
     private

data/lib/roglew.rb

@@ -10,7 +10,7 @@
 '.each { |f| require f }
 
 module Roglew
-  VERSION = '0.2.3'
+  VERSION = '0.2.4'
 
   PLATFORM = case
                when Platform.local.windows? then 'windows'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roglew
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-22 00:00:00.000000000 Z
+date: 2012-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: facets
@@ -607,12 +607,20 @@ files:
 - README.md
 homepage: https://github.com/SilverPhoenix99/roglew
 licenses: []
-post_install_message: ! "+---------------------------------------------------+\n  Thanks
-  for choosing Roglew.\n\n  =================================================\n  0.2.3
-  Changes:\n    - Removed parameter `border` from\n        TextureContext#tex_image_2d.\n
-  \ =================================================\n\n  If you like what you see,
-  support us on Pledgie:\n    http://www.pledgie.com/campaigns/18830\n\n  If you find
-  any bugs, please report them on\n    https://github.com/SilverPhoenix99/roglew/issues\n\n+---------------------------------------------------+\n"
+post_install_message: ! "+----------------------------------------------------------------------------+\n
+  \ Thanks for choosing Roglew.\n\n  ==========================================================================\n
+  \ 0.2.4 Changes:\n    - Corrected a bug where contexts weren't calling the run method.\n
+  \   - Corrected the calls to ObjectSpace::define_finalizer.\n    - Changed RenderContext#buffer_data
+  method to accept ffi instance types\n      (e.g., Struct) as a parameter and calculates
+  the size automatically.\n    - ShaderProgram#use_program can act as a bind method.\n
+  \   - Optional level parameter for Texture2d#bind.\n    - Data parameter is now
+  optional for TextureContext#tex_image_2d.\n    - The level can now be changed in
+  TextureContext at any point.\n    - Added the methods:\n          RenderContext#buffer_sub_data\n
+  \         BufferContext#sub_data methods\n          ShaderProgram#attrib_location\n
+  \         ShaderProgram#attrib_locations\n          ShaderProgram#uniform_location\n
+  \         TextureContext#tex_subimage_2d\n  ==========================================================================\n\n
+  \ If you like what you see, support us on Pledgie:\n    http://www.pledgie.com/campaigns/18830\n\n
+  \ If you find any bugs, please report them on\n    https://github.com/SilverPhoenix99/roglew/issues\n\n+----------------------------------------------------------------------------+\n"
 rdoc_options: []
 require_paths:
 - lib