roglew 0.1.1 → 0.1.3

data/lib/roglew/contexts/deferred.rb

@@ -18,9 +18,9 @@ module Roglew
       nil
     end
 
-    def run(&block)
+    def run
       return unless block_given?
-      ergo &block
+      yield
       finished
     end
   end

data/lib/roglew/contexts/immediate.rb

@@ -9,10 +9,10 @@ module Roglew
       context.send(method, *args)
     end
 
-    def run(&block)
+    def run
       bind
       return unless block_given?
-      ergo &block
+      yield
       finished
     end
   end

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

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

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

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

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

@@ -0,0 +1,25 @@
+module Roglew
+  class VertexArray
+
+    attr_reader :context, :id
+
+    def initialize(context)
+      @context = context.bind { @id = context.gen_vertex_arrays }
+      self.class.finalize(self, @context, @id)
+    end
+
+    def self.finalize(obj, ctx, id)
+      ObjectSpace.define_finalizer(obj, proc do
+        puts "releasing vertex array #{id}"
+        ctx.delete_vertex_arrays(id)
+      end)
+    end
+
+    def bind(&block)
+      @context.glBindVertexArray(@id)
+      return unless block_given?
+      yield &block
+      @context.glBindVertexArray(0)
+    end
+  end
+end

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

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

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

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

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

@@ -3,13 +3,13 @@ module Roglew
     attr_reader :context, :id, :type
 
     def initialize(context, type, src = nil)
-      @context = context.bind { |c| @id = c.glCreateShader(type) }
+      @context = context.bind { @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) }
+        @context.bind { compile(src) }
       end
 
       self.class.finalize(self, @id, @context)

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

@@ -5,7 +5,7 @@ module Roglew
                 :shaders
 
     def initialize(context)
-      @context = context.bind { |c| @id = c.glCreateProgram() }
+      @context = context.bind { @id = context.glCreateProgram() }
     end
 
     def attach(*shaders)

data/lib/roglew/extensions/GL_VERSION_2_0.rb

@@ -103,10 +103,10 @@ module GL_VERSION_2_0
       else
         raise ArgumentError, "It must be Hash or Array. Given: #{shaders.class}"
       end
-      bind { |_|
+      bind do
         program.attach(*shaders)
         program.link
-      }
+      end
       program
     end
 

data/lib/roglew/render_context.rb

@@ -60,10 +60,10 @@ module Roglew
       singleton_class.send(:include, mod) if mod
     end
 
-    def bind(&block)
+    def bind
       wglMakeCurrent(@hdc, @hrc)
       if block_given?
-        ergo &block
+        yield
         unbind
       end
       self
@@ -85,10 +85,10 @@ module Roglew
 
     def_object :Textures
 
-    def begin(mode, &block)
+    def begin(mode)
       glBegin(mode)
       return unless block_given?
-      ergo &block
+      yield
       glEnd
     end
 

data/lib/roglew/render_handle.rb

@@ -14,7 +14,7 @@ module Roglew
       ctx = @context_class.new(self, deferred)
       GL.make_current(@hdc, @hrc) unless deferred
       return ctx unless block_given?
-      ctx.ergo &block
+      yield
       if deferred then ctx.apply else self.class.unbind end
 
       self

data/lib/roglew.rb

@@ -1,14 +1,13 @@
 #Raw Glue - the Ruby OpenGL and Extensions Wrapper
 
 module Roglew
-  VERSION = '0.1.1'
+  VERSION = '0.1.3'
 end
 
 #external dependencies
 %w'
   set
   ffi
-  facets/kernel/ergo
   facets/module/module_load
   facets/string/camelcase
   facets/string/snakecase

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roglew
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,55 @@ autorequire:
 bindir: bin
 cert_chain: []
 date: 2012-11-10 00:00:00.000000000 Z
-dependencies: []
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: ducktape
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.3.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.3.0
+- !ruby/object:Gem::Dependency
+  name: facets
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.9.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.9.3
+- !ruby/object:Gem::Dependency
+  name: ffi
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.1.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.1.5
 description: A gem to wrap OpenGL and extensions in an intuitive OO framework.
 email:
 - silver.phoenix99@gmail.com
@@ -158,6 +206,7 @@ files:
 - lib/roglew/extensions/GL_ARB_transpose_matrix.rb
 - lib/roglew/extensions/GL_ARB_uniform_buffer_object.rb
 - lib/roglew/extensions/GL_ARB_vertex_array_bgra.rb
+- lib/roglew/extensions/GL_ARB_vertex_array_object/vertex_array.rb
 - lib/roglew/extensions/GL_ARB_vertex_array_object.rb
 - lib/roglew/extensions/GL_ARB_vertex_attrib_64bit.rb
 - lib/roglew/extensions/GL_ARB_vertex_attrib_binding.rb