opengl-bindings 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b7922691c7757c04002be934f5375426dd32c0df
-  data.tar.gz: 044ec7aeef1fffb1a561a30fb35d6006477f621b
+  metadata.gz: 2d859718ed8f6ade732fae66f2d3c1dbfee15c2d
+  data.tar.gz: 8f7cda9742fc340c11334026f5ace952548f0d4f
 SHA512:
-  metadata.gz: 3556717d2f992ad75a8e28c4123b0e52892f5b5c54d5b8e19bbe5f06ef1180278cb308f54ecad73edc0eed71d1b226683e569267960f18edb5de1cedfb91dc8e
-  data.tar.gz: e68f024a9680d7e4f445bebb9f4f0c7fe978edd2547b938075d41c8a6762b8691f8d2bba87c54dfdf5d1183f8006384e9bf8b5087563b39ee5a7a6692ed98309
+  metadata.gz: 3488767d45d010c57b55839e95becb81a6fdaf3c8158856f45ac22628691c415b2d6757e0e661cbc2cfd192de5e7d6b79c506ac53a740a78a829f1d3e2a92157
+  data.tar.gz: 849de0186d2fb4fcceb9184a11ee06236829108efbf9ff73753066dcfb2bb05f4721e4eda774591c072ac9568b2612a976ec5d1e6109674a175247c60d5a1cc9

data/ChangeLog

@@ -1,3 +1,9 @@
+2013-09-21  vaiorabbit  <https://twitter.com/vaiorabbit>
+
+	* glut.rb: Minimal GLUT wrapper.
+	* sample/GLUT: Added.
+	* glfw.rb, glut.rb (load_dll): Now searches dll/dylib/so from current execution path.
+
 2013-09-16  vaiorabbit  <https://twitter.com/vaiorabbit>
 
 	* lib/glfw.rb (GLFW.create_callback): Now accepts Proc object. (ex.) "method(:key_callback).to_proc".

data/README.md

@@ -5,7 +5,7 @@
 ...and wrapper code generator.
 
 *   Created : 2013-08-28
-*   Last modified : 2013-09-16
+*   Last modified : 2013-09-21
 
 
 ## Features ##
@@ -18,6 +18,17 @@
 	*   Supports OpenGL 1.0 - 4.4, and all OpenGL extensions.
 
 
+## How to install ##
+
+Via RubyGems ( https://rubygems.org/gems/opengl-bindings ):
+
+    $ gem install opengl-bindings
+
+Or grab all library codes (`lib/*.rb') and use them by adding as one of the load paths like:
+
+    $ ruby -I ./lib your_app.rb
+
+
 ## How to use ##
 
 See sample/simple.rb.
@@ -40,7 +51,10 @@ https://github.com/vaiorabbit/ruby-opengl
     *   'opengl_ext_enum.rb'         : OpenGL extension enum wrapper Generated via generator/generate_ext_enum.rb.
 
 * 'glfw.rb'
-    * My handwirtten GLFW wrapper (https://github.com/vaiorabbit/ruby-glfw).
+    * My handwirtten GLFW wrapper.
+
+* 'glut.rb'
+    * Minimal GLUT wrapper.
 
 * 'glu.rb'
     * My handwirtten GLU wrapper.
@@ -105,7 +119,7 @@ https://github.com/vaiorabbit/ruby-opengl
 
 ## Note ##
 
-*   No Ruby-Style handy interfaces are available (like one in the ruby-opengl2 (http://ruby-opengl.rubyforge.org/))
+*   No Ruby-Style handy interfaces are available (like one in the ruby-opengl2 ( http://ruby-opengl.rubyforge.org/ ))
 	*   Example:
 		*   (Original C API)
 
@@ -123,22 +137,17 @@ https://github.com/vaiorabbit/ruby-opengl
 
 				tex_name = glGenTextures( 2 )[0]
 
-	*   Because:
-		*   I don't want to maintain this feature, which makes difficult to auto-generate.
-		*   I don't like to modify original OpenGL API.
-		*   Thanks to Fiddle, all these C-pointer issue can be simply handled with Array#pack and String#unpack.
-
 *   Reference : Other approaches after ruby-opengl2
-	*   OpenGL (opengl3) by davll (https://github.com/davll/ruby-opengl)
+	*   OpenGL (opengl3) by davll ( https://github.com/davll/ruby-opengl )
 		*   Built on Ruby-FFI, which is useful for JRuby users.
-	*   opengl-core by nilium (https://github.com/nilium/ruby-opengl)
+	*   opengl-core by nilium ( https://github.com/nilium/ruby-opengl )
 		*   Build on Fiddle.
 		*   Provides more customize points and handy utilities.
 
 
 ## License ##
 
-The zlib/libpng License (http://opensource.org/licenses/Zlib).
+The zlib/libpng License ( http://opensource.org/licenses/Zlib ).
 
     Copyright (c) 2013 vaiorabbit@twitter.com
 
@@ -163,6 +172,9 @@ The zlib/libpng License (http://opensource.org/licenses/Zlib).
 Sample codes/resources under sample/GLExcess are provided under the GNU General
 Public License version 2. See sample/GLExcess/GPL2.txt .
 
+Sample codes under sample/OrangeBook are provided under the BSD 3-Clause License.
+See sample/OrangeBook/3Dlabs-License.txt .
+
 -------------------------------------------------------------------------------
 
 # 自前 Ruby-OpenGL と自動生成スクリプト #
@@ -173,6 +185,17 @@ Public License version 2. See sample/GLExcess/GPL2.txt .
 *   関数とenumのラッパーコードは Khronos の XML API registry (gl.xml) から自動生成しています
 
 
+## インストール ##
+
+RubyGems経由で ( https://rubygems.org/gems/opengl-bindings ):
+
+    $ gem install opengl-bindings
+
+もしくは lib 以下の *.rb をコピー → その場所をロードパスに加えて次のように起動:
+
+    $ ruby -I ./lib your_app.rb
+
+
 ## 使い方 ##
 
 sample/simple.rb を参照してください。
@@ -195,7 +218,10 @@ https://github.com/vaiorabbit/ruby-opengl
     *   'opengl_ext_enum.rb'         : OpenGL 拡張enumのラッパーコード。 generator/generate_ext_enum.rb で自動生成されたものです。
 
 * 'glfw.rb'
-    * GLFW のラッパーコードです(自動生成ではありません) (https://github.com/vaiorabbit/ruby-glfw)。
+    * GLFW のラッパーコードです(自動生成ではありません)。
+
+* 'glut.rb'
+    * GLUT ラッパー (よく使う関数限定)
 
 * 'glu.rb'
     * GLU のラッパーコードです(自動生成ではありません)。
@@ -260,7 +286,7 @@ https://github.com/vaiorabbit/ruby-opengl
 
 ## メモ ##
 
-*   Rubyスタイルの便利なインターフェースはサポートしていません (ruby-opengl2 (http://ruby-opengl.rubyforge.org/) にあったような感じのもの)
+*   Rubyスタイルの便利なインターフェースはサポートしていません (ruby-opengl2 ( http://ruby-opengl.rubyforge.org/ ) にあったような感じのもの)
 	*   例:
 		*   (OpenGLオリジナルの C API)
 
@@ -278,22 +304,21 @@ https://github.com/vaiorabbit/ruby-opengl
 
 				tex_name = glGenTextures( 2 )[0] # glGenTextures が配列を返すように修正されています
 
-	*   なぜサポートしないのか:
-		*   面倒。自動生成になじまない。
-		*   OpenGL オリジナルの API を変更するのは個人的に嫌。
-		*   この手の C ポインタ関連の問題はすべて Array#pack と String#unpack だけで簡単に解決できます (Fiddleのおかげ)。
-
 *   参考 : ruby-opengl2 以降に出てきたその他のアプローチ
-	*   OpenGL (opengl3) by davll (https://github.com/davll/ruby-opengl)
+	*   OpenGL (opengl3) by davll ( https://github.com/davll/ruby-opengl )
 		*   Ruby-FFI を利用 ⇒ JRuby でも使えるようです
-	*   opengl-core by nilium (https://github.com/nilium/ruby-opengl)
+	*   opengl-core by nilium ( https://github.com/nilium/ruby-opengl )
 		*   Fiddle を利用
 		*   カスタマイズポイント・ユーティリティがこのライブラリよりも揃ってます
 
 
 ## ライセンス ##
 
-*   zlib/libpng ライセンスです (http://opensource.org/licenses/Zlib)。
+*   zlib/libpng ライセンスです ( http://opensource.org/licenses/Zlib )。
 
 *   sample/GLExcess 以下にあるものについては GNU General Public License version 2 です。
     sample/GLExcess/GPL2.txt を参照してください。
+
+*   sample/OrangeBook 以下にあるものについては修正BSDライセンスです。
+    sample/OrangeBook/3Dlabs-License.txt を参照してください。
+

data/lib/glfw.rb

@@ -310,7 +310,18 @@ module GLFW
   @@glfw_import_done = false
 
   # Load native library.
-  def self.load_dll(lib = 'libglfw.dylib', path = '.')
+  def self.load_dll(lib = nil, path = nil)
+    if lib == nil && path == nil
+      case OpenGL.get_platform
+      when :OPENGL_PLATFORM_WINDOWS
+        lib, path = 'GLFW3.dll', Dir.pwd
+      when :OPENGL_PLATFORM_MACOSX
+        lib, path = 'libglfw.dylib', Dir.pwd
+      else
+        lib, path = 'libglfw.so', Dir.pwd
+      end
+    end
+
     dlload (path + '/' + lib)
     import_symbols() unless @@glfw_import_done
   end

data/lib/glut.rb

@@ -0,0 +1,244 @@
+# -*- coding: utf-8 -*-
+require 'fiddle/import'
+require_relative 'opengl_platform'
+
+module GLUT
+
+  extend Fiddle::Importer
+
+  #
+  # Fiddle's default 'extern' stores all methods into local variable '@func_map', that makes difficult to 'include GLUT'.
+  # So I override it and replace '@func_map' into 'GLUT_FUNCTIONS_MAP'.
+  # Ref.: /lib/ruby/2.0.0/fiddle/import.rb
+  #
+  GLUT_FUNCTIONS_MAP = {}
+  def self.extern(signature, *opts)
+    symname, ctype, argtype = parse_signature(signature, @type_alias)
+    opt = parse_bind_options(opts)
+    f = import_function(symname, ctype, argtype, opt[:call_type])
+    name = symname.gsub(/@.+/,'')
+    GLUT_FUNCTIONS_MAP[name] = f
+    begin
+      /^(.+?):(\d+)/ =~ caller.first
+      file, line = $1, $2.to_i
+    rescue
+      file, line = __FILE__, __LINE__+3
+    end
+    args_str="*args"
+    module_eval(<<-EOS, file, line)
+      def #{name}(*args, &block)
+        GLUT_FUNCTIONS_MAP['#{name}'].call(*args,&block)
+      end
+    EOS
+    module_function(name)
+    f
+  end
+
+  # defines
+  GLUT_KEY_F1         = 0x0001
+  GLUT_KEY_F2         = 0x0002
+  GLUT_KEY_F3         = 0x0003
+  GLUT_KEY_F4         = 0x0004
+  GLUT_KEY_F5         = 0x0005
+  GLUT_KEY_F6         = 0x0006
+  GLUT_KEY_F7         = 0x0007
+  GLUT_KEY_F8         = 0x0008
+  GLUT_KEY_F9         = 0x0009
+  GLUT_KEY_F10        = 0x000A
+  GLUT_KEY_F11        = 0x000B
+  GLUT_KEY_F12        = 0x000C
+  GLUT_KEY_LEFT       = 0x0064
+  GLUT_KEY_UP         = 0x0065
+  GLUT_KEY_RIGHT      = 0x0066
+  GLUT_KEY_DOWN       = 0x0067
+  GLUT_KEY_PAGE_UP    = 0x0068
+  GLUT_KEY_PAGE_DOWN  = 0x0069
+  GLUT_KEY_HOME       = 0x006A
+  GLUT_KEY_END        = 0x006B
+  GLUT_KEY_INSERT     = 0x006C
+
+  GLUT_LEFT_BUTTON    = 0x0000
+  GLUT_MIDDLE_BUTTON  = 0x0001
+  GLUT_RIGHT_BUTTON   = 0x0002
+  GLUT_DOWN           = 0x0000
+  GLUT_UP             = 0x0001
+  GLUT_LEFT           = 0x0000
+  GLUT_ENTERED        = 0x0001
+
+  GLUT_RGB          = 0x0000
+  GLUT_RGBA         = 0x0000
+  GLUT_INDEX        = 0x0001
+  GLUT_SINGLE       = 0x0000
+  GLUT_DOUBLE       = 0x0002
+  GLUT_ACCUM        = 0x0004
+  GLUT_ALPHA        = 0x0008
+  GLUT_DEPTH        = 0x0010
+  GLUT_STENCIL      = 0x0020
+  GLUT_MULTISAMPLE  = 0x0080
+  GLUT_STEREO       = 0x0100
+  GLUT_LUMINANCE    = 0x0200
+
+  GLUT_MENU_NOT_IN_USE     = 0x0000
+  GLUT_MENU_IN_USE         = 0x0001
+  GLUT_NOT_VISIBLE         = 0x0000
+  GLUT_VISIBLE             = 0x0001
+  GLUT_HIDDEN              = 0x0000
+  GLUT_FULLY_RETAINED      = 0x0001
+  GLUT_PARTIALLY_RETAINED  = 0x0002
+  GLUT_FULLY_COVERED       = 0x0003
+
+  # typedefs
+  @@glut_cb_signature = {
+    :GLUTMenuFunc => "void GLUTMenuFunc(int)",
+    :GLUTDisplayFunc => "void GLUTDisplayFunc()",
+    :GLUTReshapeFunc => "void GLUTReshapeFunc(int, int)",
+    :GLUTKeyboardFunc => "void GLUTKeyboardFunc(unsigned char, int, int)",
+    :GLUTMouseFunc => "void GLUTMouseFunc(int, int, int, int)",
+    :GLUTMotionFunc => "void GLUTMotionFunc(int, int)",
+    :GLUTPassiveMotionFunc => "void GLUTPassiveMotionFunc(int x, int y)",
+    :GLUTEntryFunc => "void GLUTEntryFunc(int)",
+    :GLUTVisibilityFunc => "void GLUTVisibilityFunc(int)",
+    :GLUTIdleFunc => "void GLUTIdleFunc()",
+    :GLUTTimerFunc => "void GLUTTimerFunc(int)",
+    :GLUTMenuStateFunc => "void GLUTMenuStateFunc(int)",
+    :GLUTSpecialFunc => "void GLUTSpecialFunc(int, int, int)",
+    :GLUTMenuStatusFunc => "void GLUTMenuStatusFunc(int, int, int)",
+  }
+
+  def self.create_callback( sym, proc=nil, &blk )
+    if block_given?
+      return bind( @@glut_cb_signature[sym], nil, &blk )
+    else
+      return bind( @@glut_cb_signature[sym], nil, &proc )
+    end
+  end
+
+  @@glut_import_done = false
+
+  # Load native library.
+  def self.load_dll(lib = nil, path = nil)
+    if lib == nil && path == nil
+      case OpenGL.get_platform
+      when :OPENGL_PLATFORM_WINDOWS
+        lib, path = 'freeglut.dll', Dir.pwd
+      when :OPENGL_PLATFORM_MACOSX
+        lib, path = 'GLUT', '/System/Library/Frameworks/GLUT.framework'
+      else
+        lib, path = 'libglut.so', Dir.pwd
+      end
+    end
+
+    dlload (path + '/' + lib)
+    import_symbols() unless @@glut_import_done
+  end
+
+  def self.import_symbols
+    # defines
+    if OpenGL.get_platform == :OPENGL_PLATFORM_WINDOWS
+      const_set('GLUT_STROKE_ROMAN', Fiddle::Pointer.new(0x0000) )
+      const_set('GLUT_STROKE_MONO_ROMAN', Fiddle::Pointer.new(0x0001) )
+      const_set('GLUT_BITMAP_9_BY_15', Fiddle::Pointer.new(0x0002) )
+      const_set('GLUT_BITMAP_8_BY_13', Fiddle::Pointer.new(0x0003) )
+      const_set('GLUT_BITMAP_TIMES_ROMAN_10', Fiddle::Pointer.new(0x0004) )
+      const_set('GLUT_BITMAP_TIMES_ROMAN_24', Fiddle::Pointer.new(0x0005) )
+      const_set('GLUT_BITMAP_HELVETICA_10', Fiddle::Pointer.new(0x0006) )
+      const_set('GLUT_BITMAP_HELVETICA_12', Fiddle::Pointer.new(0x0007) )
+      const_set('GLUT_BITMAP_HELVETICA_18', Fiddle::Pointer.new(0x0008) )
+    else
+      const_set('GLUT_STROKE_ROMAN', import_symbol("glutStrokeRoman") )
+      const_set('GLUT_STROKE_MONO_ROMAN', import_symbol("glutStrokeMonoRoman") )
+      const_set('GLUT_BITMAP_9_BY_15', import_symbol("glutBitmap9By15") )
+      const_set('GLUT_BITMAP_8_BY_13', import_symbol("glutBitmap8By13") )
+      const_set('GLUT_BITMAP_TIMES_ROMAN_10', import_symbol("glutBitmapTimesRoman10") )
+      const_set('GLUT_BITMAP_TIMES_ROMAN_24', import_symbol("glutBitmapTimesRoman24") )
+      const_set('GLUT_BITMAP_HELVETICA_10', import_symbol("glutBitmapHelvetica10") )
+      const_set('GLUT_BITMAP_HELVETICA_12', import_symbol("glutBitmapHelvetica12") )
+      const_set('GLUT_BITMAP_HELVETICA_18', import_symbol("glutBitmapHelvetica18") )
+    end
+
+    # function
+    extern 'void glutInit(int*, char**)'
+    extern 'void glutInitDisplayMode(unsigned int)'
+
+    extern 'void glutInitWindowPosition(int, int)'
+    extern 'void glutInitWindowSize(int, int)'
+    extern 'void glutMainLoop()'
+
+    extern 'int glutCreateWindow(const char *)'
+    extern 'int glutCreateSubWindow(int, int, int, int, int)'
+    extern 'void glutDestroyWindow(int)'
+    extern 'void glutPostRedisplay()'
+
+    extern 'void glutSwapBuffers()'
+    extern 'int glutGetWindow()'
+    extern 'void glutSetWindow(int)'
+    extern 'void glutSetWindowTitle(const char *)'
+    extern 'void glutSetIconTitle(const char *)'
+    extern 'void glutPositionWindow(int, int)'
+    extern 'void glutReshapeWindow(int, int)'
+    extern 'void glutPopWindow()'
+    extern 'void glutPushWindow()'
+    extern 'void glutIconifyWindow()'
+    extern 'void glutShowWindow()'
+    extern 'void glutHideWindow()'
+
+    extern 'int glutCreateMenu(void *)'
+    extern 'void glutDestroyMenu(int)'
+    extern 'int glutGetMenu()'
+    extern 'void glutSetMenu(int)'
+    extern 'void glutAddMenuEntry(const char *, int)'
+    extern 'void glutAddSubMenu(const char *, int)'
+    extern 'void glutChangeToMenuEntry(int, const char *, int)'
+    extern 'void glutChangeToSubMenu(int, const char *, int)'
+    extern 'void glutRemoveMenuItem(int)'
+    extern 'void glutAttachMenu(int)'
+    extern 'void glutDetachMenu(int)'
+
+    extern 'void glutTimerFunc(unsigned int, void *)'
+    extern 'void glutIdleFunc(void *)'
+    extern 'void glutDisplayFunc(void *)'
+    extern 'void glutReshapeFunc(void *)'
+    extern 'void glutKeyboardFunc(void *)'
+    extern 'void glutMouseFunc(void *)'
+    extern 'void glutMotionFunc(void *)'
+    extern 'void glutPassiveMotionFunc(void *)'
+    extern 'void glutEntryFunc(void *)'
+    extern 'void glutVisibilityFunc(void *)'
+    extern 'void glutIdleFunc(void *)'
+    extern 'void glutTimerFunc(unsigned int, void *, int)'
+    extern 'void glutMenuStateFunc(void *)'
+    extern 'void glutSpecialFunc(void *)'
+    extern 'void glutMenuStatusFunc(void*)'
+    extern 'int glutGet(unsigned int)'
+    extern 'int glutDeviceGet(unsigned int)'
+
+    extern 'int glutExtensionSupported(const char *)'
+
+    extern 'void glutBitmapCharacter(void *, int)'
+    extern 'int glutBitmapWidth(void *, int)'
+    extern 'void glutStrokeCharacter(void *, int)'
+    extern 'int glutStrokeWidth(void *, int)'
+
+    extern 'void glutWireSphere(double, int, int)'
+    extern 'void glutSolidSphere(double, int, int)'
+    extern 'void glutWireCone(double, double, int, int)'
+    extern 'void glutSolidCone(double, double, int, int)'
+    extern 'void glutWireCube(double)'
+    extern 'void glutSolidCube(double)'
+    extern 'void glutWireTorus(double, double, int, int)'
+    extern 'void glutSolidTorus(double, double, int, int)'
+    extern 'void glutWireDodecahedron()'
+    extern 'void glutSolidDodecahedron()'
+    extern 'void glutWireTeapot(double)'
+    extern 'void glutSolidTeapot(double)'
+    extern 'void glutWireOctahedron()'
+    extern 'void glutSolidOctahedron()'
+    extern 'void glutWireTetrahedron()'
+    extern 'void glutSolidTetrahedron()'
+    extern 'void glutWireIcosahedron()'
+    extern 'void glutSolidIcosahedron()'
+
+    @@glut_import_done = true
+  end
+
+end

data/lib/opengl_command.rb

@@ -1,5 +1,8 @@
-# Ruby-OpenGL (http://github.com/vaiorabbit/ruby-opengl/)
-# [NOTICE] Automatically generated file
+# opengl-bindings
+# * http://rubygems.org/gems/opengl-bindings
+# * http://github.com/vaiorabbit/ruby-opengl
+#
+# [NOTICE] This is an automatically generated file.
 
 require 'fiddle'
 

data/lib/opengl_enum.rb

@@ -1,5 +1,8 @@
-# Ruby-OpenGL (http://github.com/vaiorabbit/ruby-opengl/)
-# [NOTICE] Automatically generated file
+# opengl-bindings
+# * http://rubygems.org/gems/opengl-bindings
+# * http://github.com/vaiorabbit/ruby-opengl
+#
+# [NOTICE] This is an automatically generated file.
 
 module OpenGL
 
@@ -1707,6 +1710,7 @@ module OpenGL
   GL_DISPLAY_LIST = 0x82E7
   GL_MAX_VERTEX_ATTRIB_STRIDE = 0x82E5
   GL_PRIMITIVE_RESTART_FOR_PATCHES_SUPPORTED = 0x8221
+  GL_TEXTURE_BUFFER_BINDING = 0x8C2A
   GL_MAP_PERSISTENT_BIT = 0x0040
   GL_MAP_COHERENT_BIT = 0x0080
   GL_DYNAMIC_STORAGE_BIT = 0x0100

data/lib/opengl_ext_command.rb

@@ -1,5 +1,8 @@
-# Ruby-OpenGL (http://github.com/vaiorabbit/ruby-opengl/)
-# [NOTICE] Automatically generated file
+# opengl-bindings
+# * http://rubygems.org/gems/opengl-bindings
+# * http://github.com/vaiorabbit/ruby-opengl
+#
+# [NOTICE] This is an automatically generated file.
 
 require 'fiddle'
 
@@ -11846,6 +11849,132 @@ module OpenGL
         f.call(_pipeline_)
       end
     SRC_GL_EXT_separate_shader_objects
+
+    GL_FUNCTIONS_ARGS_MAP[:glProgramUniform1uiEXT] = [-Fiddle::TYPE_INT, Fiddle::TYPE_INT, -Fiddle::TYPE_INT]
+    GL_FUNCTIONS_RETVAL_MAP[:glProgramUniform1uiEXT] = Fiddle::TYPE_VOID
+    module_eval(<<-SRC_GL_EXT_separate_shader_objects)
+      def glProgramUniform1uiEXT(_program_, _location_, _v0_)
+        f = OpenGL::get_command(:glProgramUniform1uiEXT)
+        f.call(_program_, _location_, _v0_)
+      end
+    SRC_GL_EXT_separate_shader_objects
+
+    GL_FUNCTIONS_ARGS_MAP[:glProgramUniform2uiEXT] = [-Fiddle::TYPE_INT, Fiddle::TYPE_INT, -Fiddle::TYPE_INT, -Fiddle::TYPE_INT]
+    GL_FUNCTIONS_RETVAL_MAP[:glProgramUniform2uiEXT] = Fiddle::TYPE_VOID
+    module_eval(<<-SRC_GL_EXT_separate_shader_objects)
+      def glProgramUniform2uiEXT(_program_, _location_, _v0_, _v1_)
+        f = OpenGL::get_command(:glProgramUniform2uiEXT)
+        f.call(_program_, _location_, _v0_, _v1_)
+      end
+    SRC_GL_EXT_separate_shader_objects
+
+    GL_FUNCTIONS_ARGS_MAP[:glProgramUniform3uiEXT] = [-Fiddle::TYPE_INT, Fiddle::TYPE_INT, -Fiddle::TYPE_INT, -Fiddle::TYPE_INT, -Fiddle::TYPE_INT]
+    GL_FUNCTIONS_RETVAL_MAP[:glProgramUniform3uiEXT] = Fiddle::TYPE_VOID
+    module_eval(<<-SRC_GL_EXT_separate_shader_objects)
+      def glProgramUniform3uiEXT(_program_, _location_, _v0_, _v1_, _v2_)
+        f = OpenGL::get_command(:glProgramUniform3uiEXT)
+        f.call(_program_, _location_, _v0_, _v1_, _v2_)
+      end
+    SRC_GL_EXT_separate_shader_objects
+
+    GL_FUNCTIONS_ARGS_MAP[:glProgramUniform4uiEXT] = [-Fiddle::TYPE_INT, Fiddle::TYPE_INT, -Fiddle::TYPE_INT, -Fiddle::TYPE_INT, -Fiddle::TYPE_INT, -Fiddle::TYPE_INT]
+    GL_FUNCTIONS_RETVAL_MAP[:glProgramUniform4uiEXT] = Fiddle::TYPE_VOID
+    module_eval(<<-SRC_GL_EXT_separate_shader_objects)
+      def glProgramUniform4uiEXT(_program_, _location_, _v0_, _v1_, _v2_, _v3_)
+        f = OpenGL::get_command(:glProgramUniform4uiEXT)
+        f.call(_program_, _location_, _v0_, _v1_, _v2_, _v3_)
+      end
+    SRC_GL_EXT_separate_shader_objects
+
+    GL_FUNCTIONS_ARGS_MAP[:glProgramUniform1uivEXT] = [-Fiddle::TYPE_INT, Fiddle::TYPE_INT, Fiddle::TYPE_INT, Fiddle::TYPE_VOIDP]
+    GL_FUNCTIONS_RETVAL_MAP[:glProgramUniform1uivEXT] = Fiddle::TYPE_VOID
+    module_eval(<<-SRC_GL_EXT_separate_shader_objects)
+      def glProgramUniform1uivEXT(_program_, _location_, _count_, _value_)
+        f = OpenGL::get_command(:glProgramUniform1uivEXT)
+        f.call(_program_, _location_, _count_, _value_)
+      end
+    SRC_GL_EXT_separate_shader_objects
+
+    GL_FUNCTIONS_ARGS_MAP[:glProgramUniform2uivEXT] = [-Fiddle::TYPE_INT, Fiddle::TYPE_INT, Fiddle::TYPE_INT, Fiddle::TYPE_VOIDP]
+    GL_FUNCTIONS_RETVAL_MAP[:glProgramUniform2uivEXT] = Fiddle::TYPE_VOID
+    module_eval(<<-SRC_GL_EXT_separate_shader_objects)
+      def glProgramUniform2uivEXT(_program_, _location_, _count_, _value_)
+        f = OpenGL::get_command(:glProgramUniform2uivEXT)
+        f.call(_program_, _location_, _count_, _value_)
+      end
+    SRC_GL_EXT_separate_shader_objects
+
+    GL_FUNCTIONS_ARGS_MAP[:glProgramUniform3uivEXT] = [-Fiddle::TYPE_INT, Fiddle::TYPE_INT, Fiddle::TYPE_INT, Fiddle::TYPE_VOIDP]
+    GL_FUNCTIONS_RETVAL_MAP[:glProgramUniform3uivEXT] = Fiddle::TYPE_VOID
+    module_eval(<<-SRC_GL_EXT_separate_shader_objects)
+      def glProgramUniform3uivEXT(_program_, _location_, _count_, _value_)
+        f = OpenGL::get_command(:glProgramUniform3uivEXT)
+        f.call(_program_, _location_, _count_, _value_)
+      end
+    SRC_GL_EXT_separate_shader_objects
+
+    GL_FUNCTIONS_ARGS_MAP[:glProgramUniform4uivEXT] = [-Fiddle::TYPE_INT, Fiddle::TYPE_INT, Fiddle::TYPE_INT, Fiddle::TYPE_VOIDP]
+    GL_FUNCTIONS_RETVAL_MAP[:glProgramUniform4uivEXT] = Fiddle::TYPE_VOID
+    module_eval(<<-SRC_GL_EXT_separate_shader_objects)
+      def glProgramUniform4uivEXT(_program_, _location_, _count_, _value_)
+        f = OpenGL::get_command(:glProgramUniform4uivEXT)
+        f.call(_program_, _location_, _count_, _value_)
+      end
+    SRC_GL_EXT_separate_shader_objects
+
+    GL_FUNCTIONS_ARGS_MAP[:glProgramUniformMatrix2x3fvEXT] = [-Fiddle::TYPE_INT, Fiddle::TYPE_INT, Fiddle::TYPE_INT, -Fiddle::TYPE_CHAR, Fiddle::TYPE_VOIDP]
+    GL_FUNCTIONS_RETVAL_MAP[:glProgramUniformMatrix2x3fvEXT] = Fiddle::TYPE_VOID
+    module_eval(<<-SRC_GL_EXT_separate_shader_objects)
+      def glProgramUniformMatrix2x3fvEXT(_program_, _location_, _count_, _transpose_, _value_)
+        f = OpenGL::get_command(:glProgramUniformMatrix2x3fvEXT)
+        f.call(_program_, _location_, _count_, _transpose_, _value_)
+      end
+    SRC_GL_EXT_separate_shader_objects
+
+    GL_FUNCTIONS_ARGS_MAP[:glProgramUniformMatrix3x2fvEXT] = [-Fiddle::TYPE_INT, Fiddle::TYPE_INT, Fiddle::TYPE_INT, -Fiddle::TYPE_CHAR, Fiddle::TYPE_VOIDP]
+    GL_FUNCTIONS_RETVAL_MAP[:glProgramUniformMatrix3x2fvEXT] = Fiddle::TYPE_VOID
+    module_eval(<<-SRC_GL_EXT_separate_shader_objects)
+      def glProgramUniformMatrix3x2fvEXT(_program_, _location_, _count_, _transpose_, _value_)
+        f = OpenGL::get_command(:glProgramUniformMatrix3x2fvEXT)
+        f.call(_program_, _location_, _count_, _transpose_, _value_)
+      end
+    SRC_GL_EXT_separate_shader_objects
+
+    GL_FUNCTIONS_ARGS_MAP[:glProgramUniformMatrix2x4fvEXT] = [-Fiddle::TYPE_INT, Fiddle::TYPE_INT, Fiddle::TYPE_INT, -Fiddle::TYPE_CHAR, Fiddle::TYPE_VOIDP]
+    GL_FUNCTIONS_RETVAL_MAP[:glProgramUniformMatrix2x4fvEXT] = Fiddle::TYPE_VOID
+    module_eval(<<-SRC_GL_EXT_separate_shader_objects)
+      def glProgramUniformMatrix2x4fvEXT(_program_, _location_, _count_, _transpose_, _value_)
+        f = OpenGL::get_command(:glProgramUniformMatrix2x4fvEXT)
+        f.call(_program_, _location_, _count_, _transpose_, _value_)
+      end
+    SRC_GL_EXT_separate_shader_objects
+
+    GL_FUNCTIONS_ARGS_MAP[:glProgramUniformMatrix4x2fvEXT] = [-Fiddle::TYPE_INT, Fiddle::TYPE_INT, Fiddle::TYPE_INT, -Fiddle::TYPE_CHAR, Fiddle::TYPE_VOIDP]
+    GL_FUNCTIONS_RETVAL_MAP[:glProgramUniformMatrix4x2fvEXT] = Fiddle::TYPE_VOID
+    module_eval(<<-SRC_GL_EXT_separate_shader_objects)
+      def glProgramUniformMatrix4x2fvEXT(_program_, _location_, _count_, _transpose_, _value_)
+        f = OpenGL::get_command(:glProgramUniformMatrix4x2fvEXT)
+        f.call(_program_, _location_, _count_, _transpose_, _value_)
+      end
+    SRC_GL_EXT_separate_shader_objects
+
+    GL_FUNCTIONS_ARGS_MAP[:glProgramUniformMatrix3x4fvEXT] = [-Fiddle::TYPE_INT, Fiddle::TYPE_INT, Fiddle::TYPE_INT, -Fiddle::TYPE_CHAR, Fiddle::TYPE_VOIDP]
+    GL_FUNCTIONS_RETVAL_MAP[:glProgramUniformMatrix3x4fvEXT] = Fiddle::TYPE_VOID
+    module_eval(<<-SRC_GL_EXT_separate_shader_objects)
+      def glProgramUniformMatrix3x4fvEXT(_program_, _location_, _count_, _transpose_, _value_)
+        f = OpenGL::get_command(:glProgramUniformMatrix3x4fvEXT)
+        f.call(_program_, _location_, _count_, _transpose_, _value_)
+      end
+    SRC_GL_EXT_separate_shader_objects
+
+    GL_FUNCTIONS_ARGS_MAP[:glProgramUniformMatrix4x3fvEXT] = [-Fiddle::TYPE_INT, Fiddle::TYPE_INT, Fiddle::TYPE_INT, -Fiddle::TYPE_CHAR, Fiddle::TYPE_VOIDP]
+    GL_FUNCTIONS_RETVAL_MAP[:glProgramUniformMatrix4x3fvEXT] = Fiddle::TYPE_VOID
+    module_eval(<<-SRC_GL_EXT_separate_shader_objects)
+      def glProgramUniformMatrix4x3fvEXT(_program_, _location_, _count_, _transpose_, _value_)
+        f = OpenGL::get_command(:glProgramUniformMatrix4x3fvEXT)
+        f.call(_program_, _location_, _count_, _transpose_, _value_)
+      end
+    SRC_GL_EXT_separate_shader_objects
   end # define_command_GL_EXT_separate_shader_objects
 
   def define_command_GL_EXT_separate_specular_color

data/lib/opengl_ext_enum.rb

@@ -1,5 +1,8 @@
-# Ruby-OpenGL (http://github.com/vaiorabbit/ruby-opengl/)
-# [NOTICE] Automatically generated file
+# opengl-bindings
+# * http://rubygems.org/gems/opengl-bindings
+# * http://github.com/vaiorabbit/ruby-opengl
+#
+# [NOTICE] This is an automatically generated file.
 
 module OpenGL
 
@@ -206,6 +209,7 @@ module OpenGL
     const_set('GL_RGB_422_APPLE', 0x8A1F) unless defined?(GL_RGB_422_APPLE)
     const_set('GL_UNSIGNED_SHORT_8_8_APPLE', 0x85BA) unless defined?(GL_UNSIGNED_SHORT_8_8_APPLE)
     const_set('GL_UNSIGNED_SHORT_8_8_REV_APPLE', 0x85BB) unless defined?(GL_UNSIGNED_SHORT_8_8_REV_APPLE)
+    const_set('GL_RGB_RAW_422_APPLE', 0x8A51) unless defined?(GL_RGB_RAW_422_APPLE)
   end # define_enum_GL_APPLE_rgb_422
 
   def define_enum_GL_APPLE_row_bytes

data/sample/report_env.rb

@@ -1,17 +1,12 @@
-require 'glfw'
 require 'opengl'
+require 'glfw'
+
+OpenGL.load_dll()
+GLFW.load_dll()
 
 include OpenGL
 include GLFW
 
-OpenGL.load_dll()
-case OpenGL.get_platform
-when :OPENGL_PLATFORM_WINDOWS
-  GLFW.load_dll('glfw3.dll', '.')
-when :OPENGL_PLATFORM_MACOSX
-  GLFW.load_dll('libglfw.dylib', '.')
-end
-
 if __FILE__ == $0
   glfwInit()
   window = glfwCreateWindow( 100, 100, "Report OpenGL Environment", nil, nil )
@@ -19,5 +14,6 @@ if __FILE__ == $0
   puts "Version: #{glGetString(GL_VERSION).to_s}"
   puts "Extensions:"
   puts glGetString(GL_EXTENSIONS).to_s.split(/ /)
+  glfwDestroyWindow( window )
   glfwTerminate()
 end

data/sample/simple.rb

@@ -1,18 +1,16 @@
+#
+# For more samples, visit https://github.com/vaiorabbit/ruby-opengl/tree/master/sample .
+#
 # Ref.: /glfw-3.0.1/examples/simple.c
-require 'glfw'
+#
 require 'opengl'
-
-include GLFW
-include OpenGL
+require 'glfw'
 
 OpenGL.load_dll()
+GLFW.load_dll()
 
-case OpenGL.get_platform
-when :OPENGL_PLATFORM_WINDOWS
-  GLFW.load_dll('glfw3.dll', '.')
-when :OPENGL_PLATFORM_MACOSX
-  GLFW.load_dll('libglfw.dylib', '.')
-end
+include OpenGL
+include GLFW
 
 # Press ESC to exit.
 key_callback = GLFW::create_callback(:GLFWkeyfun) do |window_handle, key, scancode, action, mods|

metadata

@@ -1,17 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: opengl-bindings
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - vaiorabbit
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-16 00:00:00.000000000 Z
+date: 2013-09-21 00:00:00.000000000 Z
 dependencies: []
 description: |
   Ruby bindings for OpenGL 1.0-4.4 and all extensions using Fiddle (For MRI >= 2.0.0).
+  For more information, please visit: http://github.com/vaiorabbit/ruby-opengl
 email:
 - vaiorabbit@gmail.com
 executables: []
@@ -20,6 +21,7 @@ extra_rdoc_files: []
 files:
 - lib/glfw.rb
 - lib/glu.rb
+- lib/glut.rb
 - lib/opengl.rb
 - lib/opengl_command.rb
 - lib/opengl_common.rb
@@ -56,7 +58,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.5
+rubygems_version: 2.1.4
 signing_key: 
 specification_version: 4
 summary: Bindings for OpenGL 1.0-4.4 and extensions (For MRI >= 2.0.0)