opengl 0.7.0 → 0.8.0.pre1

data/ext/opengl/opengl.c

@@ -3,9 +3,11 @@
 void Init_gl(void);
 void Init_glu(void);
 void Init_glut(void);
+void Init_glut_callbacks(void);
 
 DLLEXPORT void Init_opengl() {
   Init_gl();
   Init_glu();
   Init_glut();
+  Init_glut_callbacks();
 }

data/lib/opengl.rb

@@ -20,14 +20,9 @@
 # Thanks to Ilmari Heikkinen for a previous "reversed" version of this code,
 # and to Bill Kelly for a version before that one.
 
-# Extend the search path for Windows binary gem, depending of the current ruby version
-major_minor = RUBY_VERSION[ /^(\d+\.\d+)/ ] or
-  raise "Oops, can't extract the major/minor version from #{RUBY_VERSION.dump}"
-$: << File.join(File.dirname(__FILE__), major_minor)
-
 module OpenGL
 
-  VERSION = '0.7.0'
+  VERSION = '0.8.0.pre1'
 
 end
 
@@ -82,7 +77,6 @@ module GLUT
 
 	Glut.constants.each do |cn|
 		n = cn.to_s.sub(/^GLUT_/,'')
-		next if n =~ /^[0-9]/
 		const_set( n, Glut.const_get( cn ) )
 	end
 

data/test/test_opengl_buffer.rb

@@ -0,0 +1,137 @@
+require 'opengl/test_case'
+
+class TestOpenGLBuffer < OpenGL::TestCase
+
+  def test_class_map
+    buffer, = glGenBuffers 1
+
+    glBindBuffer GL_ARRAY_BUFFER, buffer
+
+    glBufferData GL_ARRAY_BUFFER, 5, 'hello', GL_STREAM_READ
+
+    buf = OpenGL::Buffer.map GL_ARRAY_BUFFER, GL_READ_ONLY
+
+    assert_equal 'hello', buf.read(5)
+
+  ensure
+    buf.unmap
+  end
+
+  def test_read_length
+    buffer, = glGenBuffers 1
+
+    glBindBuffer GL_ARRAY_BUFFER, buffer
+
+    glBufferData GL_ARRAY_BUFFER, 5, 'hello', GL_STREAM_READ
+
+    buf = OpenGL::Buffer.map GL_ARRAY_BUFFER, GL_READ_ONLY
+
+    assert_equal 'he', buf.read(2)
+  ensure
+    buf.unmap
+  end
+
+  def test_read_offset
+    buffer, = glGenBuffers 1
+
+    glBindBuffer GL_ARRAY_BUFFER, buffer
+
+    glBufferData GL_ARRAY_BUFFER, 5, 'hello', GL_STREAM_READ
+
+    buf = OpenGL::Buffer.map GL_ARRAY_BUFFER, GL_READ_ONLY
+
+    assert_equal 'el', buf.read(2, 1)
+  ensure
+    buf.unmap
+  end
+
+  def test_read_unbounded
+    buffer, = glGenBuffers 1
+
+    glBindBuffer GL_ARRAY_BUFFER, buffer
+
+    glBufferData GL_ARRAY_BUFFER, 5, 'hello', GL_STREAM_READ
+
+    buf = OpenGL::Buffer.map GL_ARRAY_BUFFER, GL_READ_ONLY
+
+    e = assert_raises ArgumentError do
+      buf.read
+    end
+
+    assert_equal 'length must be provided for unbounded buffer', e.message
+  ensure
+    buf.unmap
+  end
+
+  def test_write
+    buffer, = glGenBuffers 1
+
+    glBindBuffer GL_ARRAY_BUFFER, buffer
+
+    glBufferData GL_ARRAY_BUFFER, 5, 'hello', GL_STREAM_READ
+
+    buf = OpenGL::Buffer.map GL_ARRAY_BUFFER, GL_READ_WRITE
+
+    buf.write 'world'
+
+    assert_equal 'world', buf.read(5)
+
+    buf.unmap
+
+    assert_equal 'world', glGetBufferSubData(GL_ARRAY_BUFFER, 0, 5)
+
+  ensure
+    buf.unmap
+  end
+
+  def test_write_nil
+    buffer, = glGenBuffers 1
+
+    glBindBuffer GL_ARRAY_BUFFER, buffer
+
+    glBufferData GL_ARRAY_BUFFER, 5, 'hello', GL_STREAM_READ
+
+    buf = OpenGL::Buffer.map GL_ARRAY_BUFFER, GL_READ_WRITE
+
+    e = assert_raises ArgumentError do
+      buf.write nil
+    end
+
+    assert_equal 'cannot write nil to buffer', e.message
+
+  ensure
+    buf.unmap
+  end
+
+  def test_write_offset
+    buffer, = glGenBuffers 1
+
+    glBindBuffer GL_ARRAY_BUFFER, buffer
+
+    glBufferData GL_ARRAY_BUFFER, 5, 'hello', GL_STREAM_READ
+
+    buf = OpenGL::Buffer.map GL_ARRAY_BUFFER, GL_READ_WRITE
+
+    buf.write 'O', 4
+
+    assert_equal 'hellO', buf.read(5)
+  ensure
+    buf.unmap
+  end
+
+  def test_write_unmapped
+    buffer, = glGenBuffers 1
+
+    glBindBuffer GL_ARRAY_BUFFER, buffer
+
+    buf = OpenGL::Buffer.map GL_ARRAY_BUFFER, GL_READ_WRITE
+
+    e = assert_raises ArgumentError do
+      buf.write 'hello'
+    end
+
+    assert_equal 'write to unmapped buffer', e.message
+  end
+
+end
+

metadata

@@ -1,15 +1,10 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: opengl
-version: !ruby/object:Gem::Version 
-  hash: 3
-  prerelease: 
-  segments: 
-  - 0
-  - 7
-  - 0
-  version: 0.7.0
+version: !ruby/object:Gem::Version
+  version: 0.8.0.pre1
+  prerelease: 6
 platform: ruby
-authors: 
+authors:
 - Eric Hodel
 - Alain Hoang
 - Jan Dvorak
@@ -18,94 +13,58 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-02-03 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: rdoc
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 3
-        - 10
-        version: "3.10"
-  type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+date: 2012-06-14 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rake-compiler
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &6409680 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 0
-        - 7
-        version: "0.7"
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 17
-        segments: 
-        - 0
-        - 7
-        - 9
+      - !ruby/object:Gem::Version
+        version: '0.7'
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.7.9
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: minitest
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *6409680
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: &6406920 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        version: "3.0"
+      - !ruby/object:Gem::Version
+        version: '3.10'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: hoe
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *6406920
+- !ruby/object:Gem::Dependency
+  name: hoe
+  requirement: &6420080 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 3
-        - 5
-        version: "3.5"
+      - !ruby/object:Gem::Version
+        version: '2.16'
   type: :development
-  version_requirements: *id004
-description: |-
-  An OpenGL wrapper for Ruby.  ruby-opengl contains bindings for OpenGL and the
-  GLU and GLUT libraries.
-  
-  * This branch is for compatibility with Ruby 1.8. Latest development is for
-    Ruby 1.9.2+ only, on master branch: https://github.com/larskanis/opengl
-email: 
+  prerelease: false
+  version_requirements: *6420080
+description: ! 'An OpenGL wrapper for Ruby.  ruby-opengl contains bindings for OpenGL
+  and the
+
+  GLU and GLUT libraries.'
+email:
 - drbrain@segment7.net
-- ""
-- ""
-- ""
-- ""
+- ''
+- ''
+- ''
+- ''
 executables: []
-
-extensions: 
+extensions:
 - ext/opengl/extconf.rb
-extra_rdoc_files: 
+extra_rdoc_files:
 - History.rdoc
 - Manifest.txt
 - README.rdoc
@@ -117,7 +76,7 @@ extra_rdoc_files:
 - docs/thanks.txt
 - docs/tutorial.txt
 - examples/OrangeBook/3Dlabs-License.txt
-files: 
+files:
 - .autotest
 - .gemtest
 - .gitignore
@@ -241,10 +200,12 @@ files:
 - ext/opengl/gl-ext-nv.c
 - ext/opengl/gl-types.h
 - ext/opengl/gl.c
+- ext/opengl/gl_buffer.c
 - ext/opengl/glu-enums.c
 - ext/opengl/glu-enums.h
 - ext/opengl/glu.c
 - ext/opengl/glut.c
+- ext/opengl/glut_callbacks.c
 - ext/opengl/opengl.c
 - lib/gl.rb
 - lib/glu.rb
@@ -265,6 +226,7 @@ files:
 - test/test_gl_ext_gremedy.rb
 - test/test_gl_ext_nv.rb
 - test/test_glu.rb
+- test/test_opengl_buffer.rb
 - utils/README
 - utils/enumgen.rb
 - utils/extlistgen.rb
@@ -273,54 +235,45 @@ files:
 - website/images/ogl.jpg
 - website/images/tab_bottom.gif
 - website/style.css
-homepage: http://ruby-opengl.rubyforge.org
+homepage: https://github.com/drbrain/opengl
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --main
 - README.rdoc
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 57
-      segments: 
-      - 1
-      - 8
-      - 7
-      version: 1.8.7
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: 1.9.2
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>'
+    - !ruby/object:Gem::Version
+      version: 1.3.1
 requirements: []
-
 rubyforge_project: opengl
-rubygems_version: 1.8.15
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: An OpenGL wrapper for Ruby
-test_files: 
-- test/test_gl_ext_ext.rb
+test_files:
+- test/test_gl_13.rb
+- test/test_gl_10_11.rb
 - test/test_gl_12.rb
-- test/test_gl_15.rb
+- test/test_gl_14.rb
 - test/test_glu.rb
+- test/test_opengl_buffer.rb
+- test/test_gl_15.rb
+- test/test_gl_ext_nv.rb
+- test/test_gl_ext_ati.rb
+- test/test_gl_ext_ext.rb
+- test/test_gl_21.rb
 - test/test_gl_20.rb
-- test/test_gl_13.rb
 - test/test_gl_ext_gremedy.rb
 - test/test_gl.rb
-- test/test_gl_ext_nv.rb
 - test/test_gl_ext_arb.rb
-- test/test_gl_10_11.rb
-- test/test_gl_ext_ati.rb
-- test/test_gl_14.rb
-- test/test_gl_21.rb