roglew 0.1.3 → 0.1.4

data/lib/roglew/contexts/base.rb

@@ -16,11 +16,11 @@ module Roglew
     attr_reader :obj
 
     def initialize(obj, deferred, &block)
-      @obj, @deferred = obj, @obj.is_deferred?(deferred)
+      @obj, @deferred = obj, obj.is_deferred?(deferred)
       singleton_class.send(:include, @deferred ? DeferredContext : ImmediateContext)
-      mod = self.class.instance_variable_get(@deferred ? :@deferred_mod : @immediate_mod)
+      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)
+      run(&block) if block_given? && respond_to?(:run, true)
     end
 
     def self.included(c)

data/lib/roglew/contexts/deferred.rb

@@ -20,7 +20,7 @@ module Roglew
 
     def run
       return unless block_given?
-      yield
+      yield self
       finished
     end
   end

data/lib/roglew/contexts/immediate.rb

@@ -12,7 +12,7 @@ module Roglew
     def run
       bind
       return unless block_given?
-      yield
+      yield self
       finished
     end
   end

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

@@ -5,7 +5,8 @@ module Roglew
     attr_reader :context, :id
 
     def initialize(context)
-      @context = context.bind { @id = context.gen_framebuffers }
+      @context = context
+      @id = context.gen_framebuffers
       self.class.finalize(self, @context, @id)
     end
 

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

@@ -5,7 +5,8 @@ module Roglew
     attr_reader :context, :id
 
     def initialize(context)
-      @context = context.bind { @id = context.gen_renderbuffers }
+      @context = context
+      @id = context.gen_renderbuffers
       self.class.finalize(self, @context, @id)
     end
 

data/lib/roglew/extensions/GL_ARB_framebuffer_object.rb

@@ -86,7 +86,6 @@ end
 module GL_ARB_framebuffer_object
   module RenderContext
     include Roglew::GLExtension
-    include Roglew::GLObject
 
     functions [:glBindFramebuffer, [ :uint, :uint ], :void],
               [:glBindRenderbuffer, [ :uint, :uint ], :void],

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

@@ -4,7 +4,8 @@ module Roglew
     attr_reader :context, :id
 
     def initialize(context)
-      @context = context.bind { @id = context.gen_vertex_arrays }
+      @context = context
+      @id = context.gen_vertex_arrays
       self.class.finalize(self, @context, @id)
     end
 
@@ -15,11 +16,13 @@ module Roglew
       end)
     end
 
-    def bind(&block)
+    def bind
       @context.glBindVertexArray(@id)
-      return unless block_given?
-      yield &block
-      @context.glBindVertexArray(0)
+      if block_given?
+        yield
+        @context.glBindVertexArray(0)
+      end
+      self
     end
   end
-end
+end

data/lib/roglew/extensions/GL_ARB_vertex_array_object.rb

@@ -7,7 +7,10 @@ end
 module GL_ARB_vertex_array_object
   module RenderContext
     include Roglew::GLExtension
-    include Roglew::GLObject
+
+    def create_vertex_array
+      Roglew::VertexArray.new(self)
+    end
 
     functions [:glBindVertexArray, [ :uint ], :void],
               [:glDeleteVertexArrays, [ :int, :pointer ], :void],
@@ -19,3 +22,6 @@ module GL_ARB_vertex_array_object
   end
 end
 
+%w'
+vertex_array
+'.each { |f| require "#{File.expand_path(__FILE__)[0..-4]}/#{f}" }

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

@@ -5,7 +5,8 @@ module Roglew
     attr_reader :context, :id
 
     def initialize(context)
-      @context = context.bind { @id = context.gen_framebuffersEXT }
+      @context = context
+      @id = context.gen_framebuffersEXT
       self.class.finalize(self, @context, @id)
     end
 

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

@@ -5,7 +5,8 @@ module Roglew
     attr_reader :context, :id
 
     def initialize(context)
-      @context = context.bind { @id = context.gen_renderbuffersEXT }
+      @context = context
+      @id = context.gen_renderbuffersEXT
       self.class.finalize(self, @context, @id)
     end
 

data/lib/roglew/extensions/GL_EXT_framebuffer_object.rb

@@ -63,7 +63,6 @@ end
 module GL_EXT_framebuffer_object
   module RenderContext
     include Roglew::GLExtension
-    include Roglew::GLObject
 
     functions [:glBindFramebufferEXT, [ :uint, :uint ], :void],
               [:glBindRenderbufferEXT, [ :uint, :uint ], :void],

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

@@ -0,0 +1,24 @@
+module Roglew
+  class Buffer
+    include Roglew::Contextual(BufferContext)
+
+    attr_reader :context, :id
+
+    def initialize(context)
+      @context = context
+      @id = context.gen_buffers
+      self.class.finalize(self, @context, @id)
+    end
+
+    def self.finalize(obj, ctx, id)
+      ObjectSpace.define_finalizer(obj, proc do
+        puts "releasing buffer #{id}"
+        ctx.delete_buffers(id)
+      end)
+    end
+
+    def bind(target, deferred = nil, &block)
+      create_binding(deferred, target, &block)
+    end
+  end
+end

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

@@ -0,0 +1,23 @@
+module Roglew
+  class BufferContext
+    include Roglew::BaseContext(:buffer)
+
+    def initialize(buffer, deferred, target, &block)
+      @target = target
+      super(buffer, deferred, &block)
+    end
+
+    def data(usage, type = nil, buffer = nil)
+      make_call(:buffer_data, @target, usage, type, buffer)
+    end
+
+    private
+    def bind
+      context.glBindBuffer(@target, buffer.id)
+    end
+
+    def unbind
+      context.glBindBuffer(@target, 0)
+    end
+  end
+end

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

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

data/lib/roglew/extensions/GL_VERSION_1_5.rb

@@ -56,6 +56,14 @@ module GL_VERSION_1_5
   module RenderContext
     include Roglew::GLExtension
 
+    def create_buffer
+      Roglew::Buffer.new(self)
+    end
+
+    def create_query
+      Roglew::Query.new(context)
+    end
+
     functions [:glBeginQuery, [ :uint, :uint ], :void],
               [:glBindBuffer, [ :uint, :uint ], :void],
               [:glBufferData, [ :uint, :size_t, :pointer, :uint ], :void],
@@ -75,5 +83,24 @@ module GL_VERSION_1_5
               [:glIsQuery, [ :uint ], :uchar],
               [:glMapBuffer, [ :uint, :uint ], :pointer],
               [:glUnmapBuffer, [ :uint ], :uchar]
+
+    def_object :Buffers
+    def_object :Queries
+
+    def buffer_data(target, usage, type = nil, buffer = nil)
+      glBufferData(target, *if buffer && buffer.size > 0
+        p = FFI::MemoryPointer.new(type, buffer.size)
+        p.write_array_of_float(buffer)
+        [p.size, p]
+      else
+        [0, nil]
+      end, usage)
+    end
   end
-end
+end
+
+%w'
+buffer_context
+buffer
+query
+'.each { |f| require "#{File.expand_path(__FILE__)[0..-4]}/#{f}" }

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

@@ -3,13 +3,14 @@ module Roglew
     attr_reader :context, :id, :type
 
     def initialize(context, type, src = nil)
-      @context = context.bind { @id = context.glCreateShader(type) }
+      @context = context
+      @id = context.glCreateShader(type)
       @type = type
       raise OpenGLError, "couldn't create a shader of type #{type.to_s(16)}" if @id == 0
 
       if src
         src = File.read(src) if File.file? src
-        @context.bind { compile(src) }
+        compile(src)
       end
 
       self.class.finalize(self, @id, @context)

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

@@ -5,7 +5,8 @@ module Roglew
                 :shaders
 
     def initialize(context)
-      @context = context.bind { @id = context.glCreateProgram() }
+      @context = context
+      @id = context.glCreateProgram()
     end
 
     def attach(*shaders)
@@ -27,6 +28,10 @@ module Roglew
       @context.glUseProgram(@id)
     end
 
+    def uniform_locations(*names)
+      names.map { |name| @context.glGetUniformLocation(@id, name) }
+    end
+
     alias_method :link, :link_program
     alias_method :use,  :use_program
   end

data/lib/roglew/extensions/GL_VERSION_2_0.rb

@@ -103,10 +103,8 @@ module GL_VERSION_2_0
       else
         raise ArgumentError, "It must be Hash or Array. Given: #{shaders.class}"
       end
-      bind do
-        program.attach(*shaders)
-        program.link
-      end
+      program.attach(*shaders)
+      program.link
       program
     end
 
@@ -206,7 +204,7 @@ module GL_VERSION_2_0
               [:glVertexAttrib4ubv,         [:uint, :pointer],                                            :void],
               [:glVertexAttrib4uiv,         [:uint, :pointer],                                            :void],
               [:glVertexAttrib4usv,         [:uint, :pointer],                                            :void],
-              [:glVertexAttribPointer,      [:uint, :int, :uint, :bool, :int, :pointer],                  :void]
+              [:glVertexAttribPointer,      [:uint, :int, :uint, :bool, :int, :size_t],                   :void]
 
     def get_program(program, pname)
       p = FFI::MemoryPointer.new(:int)

data/lib/roglew/gl_extension.rb

@@ -16,6 +16,7 @@ module Roglew
 
     def self.included(c)
       c.extend ClassMethods
+      c.extend GLObject::ClassMethods
     end
   end
 end

data/lib/roglew/texture2d.rb

@@ -5,7 +5,8 @@ module Roglew
     attr_reader :context, :id
 
     def initialize(context)
-      @context = context.bind { |c| @id = c.gen_textures }
+      @context = context
+      @id = context.gen_textures
       self.class.finalize(self, @context, @id)
     end
 

data/lib/roglew.rb

@@ -1,7 +1,7 @@
 #Raw Glue - the Ruby OpenGL and Extensions Wrapper
 
 module Roglew
-  VERSION = '0.1.3'
+  VERSION = '0.1.4'
 end
 
 #external dependencies

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roglew
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-10 00:00:00.000000000 Z
+date: 2012-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ducktape
@@ -477,6 +477,9 @@ files:
 - lib/roglew/extensions/GL_VERSION_1_2.rb
 - lib/roglew/extensions/GL_VERSION_1_3.rb
 - lib/roglew/extensions/GL_VERSION_1_4.rb
+- lib/roglew/extensions/GL_VERSION_1_5/buffer.rb
+- lib/roglew/extensions/GL_VERSION_1_5/buffer_context.rb
+- lib/roglew/extensions/GL_VERSION_1_5/query.rb
 - lib/roglew/extensions/GL_VERSION_1_5.rb
 - lib/roglew/extensions/GL_VERSION_2_0/shader.rb
 - lib/roglew/extensions/GL_VERSION_2_0/shader_program.rb