opengl-bindings 1.5.2 → 1.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9d4a60f9ec6d0edcd730c35b05c2f9df9c9dff38
-  data.tar.gz: d8bfff5e139aef4e2b2bb0278a0824332db86b09
+  metadata.gz: 7d1181366105ac620b6d2bf3ac88f35b12e679b4
+  data.tar.gz: 6af43be448019a8dde0760bc21c0006236b62262
 SHA512:
-  metadata.gz: e5398895ad2c8c2c126672f22b45fb549f3c988fbe916abcb6a031371955ada73cb3f393d7259309ad0bb10c07ae69b3515b7a11f7ee330008e0f3041072c181
-  data.tar.gz: 7cbe82566492a6a5520173590cffaa320f5d512f9fea172c8b732e90b2aafa2ee0297f04b30898103b7949d4a32f5dc85bb653b1635f3f2911738016987faff6
+  metadata.gz: a53565b006f89a468591682d380180eae80943e73d833a2052fd32309c6849d3ee34f02b6a0f7680e4f2f1397ba53b480ff4c4b5f122cb30bdd748b6815eff60
+  data.tar.gz: e25ea1bb3898eb82b58aaa1c6a33a47e14af4cf25a33101191d282235ab659d2d1510c79ad38a4d98c63ae98dbc159e76c35fdd20ae43e8fe8869476c9bc3605

data/ChangeLog

@@ -1,3 +1,9 @@
+2015-12-29  vaiorabbit  <http://twitter.com/vaiorabbit>
+
+	* lib/glfw.rb, lib/glfw30.rb, lib/glut.rb: 'create_callback' now creates
+	callback functions as an instance of Fiddle::Closure::BlockCaller. Old
+	methods are still available (renamed to create_callback_function').
+
 2015-11-14  vaiorabbit  <http://twitter.com/vaiorabbit>
 
 	* lib/opengl_linux.rb (glXGetCurrentDisplay): Fixed wrong signature.

data/README.md

@@ -5,7 +5,7 @@
 ...and wrapper code generator.
 
 *   Created : 2013-08-28
-*   Last modified : 2015-11-14
+*   Last modified : 2015-12-29
 
 
 ## Features ##
@@ -104,6 +104,7 @@ Use GLFW or GLUT for creating windows and OpenGL rendering contexts.
 ## Tested Environment ##
 
 *   Ruby
+    *   ruby 2.3.0p0 (2015-12-25 revision 53290) [x86_64-darwin15]
     *   ruby 2.2.3p173 (2015-08-18 revision 51636) [x86_64-darwin14]
     *   ruby 2.2.2p95 (2015-04-13 revision 50295) [x86_64-linux]
     *   ruby 2.2.2p95 (2015-04-13 revision 50295) [x86_64-darwin14]
@@ -311,6 +312,7 @@ GLFW か GLUT を用意してください。ウィンドウやレンダリング
 ## テストした環境 ##
 
 *   Ruby
+    *   ruby 2.3.0p0 (2015-12-25 revision 53290) [x86_64-darwin15]
     *   ruby 2.2.3p173 (2015-08-18 revision 51636) [x86_64-darwin14]
     *   ruby 2.2.2p95 (2015-04-13 revision 50295) [x86_64-linux]
     *   ruby 2.2.2p95 (2015-04-13 revision 50295) [x86_64-darwin14]

data/lib/glfw.rb

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+# A GLFW wrapper (for version 3.1)
 require 'fiddle/import'
 
 module GLFW
@@ -284,35 +285,106 @@ module GLFW
   GLFW_DONT_CARE = -1
 
   # typedefs
-  @@glfw_cb_signature = {
-    :GLFWglproc => "void GLFWglproc()",
-    :GLFWerrorfun => "void GLFWerrorfun(int,const char*)",
-    :GLFWwindowposfun => "void GLFWwindowposfun(void*,int,int)",
-    :GLFWwindowsizefun => "void GLFWwindowsizefun(void*,int,int)",
-    :GLFWwindowclosefun => "void GLFWwindowclosefun(void*)",
-    :GLFWwindowrefreshfun => "void GLFWwindowrefreshfun(void*)",
-    :GLFWwindowfocusfun => "void GLFWwindowfocusfun(void*,int)",
-    :GLFWwindowiconifyfun => "void GLFWwindowiconifyfun(void*,int)",
+  @@glfw_cb_function_signature = {
+    :GLFWerrorfun           => "void GLFWerrorfun(int,const char*)",
+    :GLFWwindowposfun       => "void GLFWwindowposfun(void*,int,int)",
+    :GLFWwindowsizefun      => "void GLFWwindowsizefun(void*,int,int)",
+    :GLFWwindowclosefun     => "void GLFWwindowclosefun(void*)",
+    :GLFWwindowrefreshfun   => "void GLFWwindowrefreshfun(void*)",
+    :GLFWwindowfocusfun     => "void GLFWwindowfocusfun(void*,int)",
+    :GLFWwindowiconifyfun   => "void GLFWwindowiconifyfun(void*,int)",
     :GLFWframebuffersizefun => "void GLFWframebuffersizefun(void*,int,int)",
-    :GLFWmousebuttonfun => "void GLFWmousebuttonfun(void*,int,int,int)",
-    :GLFWcursorposfun => "void GLFWcursorposfun(void*,double,double)",
-    :GLFWcursorenterfun => "void GLFWcursorenterfun(void*,int)",
-    :GLFWscrollfun => "void GLFWscrollfun(void*,double,double)",
-    :GLFWkeyfun => "void GLFWkeyfun(void*,int,int,int,int)",
-    :GLFWcharfun => "void GLFWcharfun(void*,unsigned int)",
-    :GLFWcharmodsfun => "void GLFWcharmodsfun(void*,unsigned int,int)",
-    :GLFWdropfun => "void GLFWdropfun(void*,int,const char**)",
-    :GLFWmonitorfun => "void GLFWmonitorfun(void*,int)",
+    :GLFWmousebuttonfun     => "void GLFWmousebuttonfun(void*,int,int,int)",
+    :GLFWcursorposfun       => "void GLFWcursorposfun(void*,double,double)",
+    :GLFWcursorenterfun     => "void GLFWcursorenterfun(void*,int)",
+    :GLFWscrollfun          => "void GLFWscrollfun(void*,double,double)",
+    :GLFWkeyfun             => "void GLFWkeyfun(void*,int,int,int,int)",
+    :GLFWcharfun            => "void GLFWcharfun(void*,unsigned int)",
+    :GLFWcharmodsfun        => "void GLFWcharmodsfun(void*,unsigned int,int)",
+    :GLFWdropfun            => "void GLFWdropfun(void*,int,const char**)",
+    :GLFWmonitorfun         => "void GLFWmonitorfun(void*,int)",
   }
 
-  def self.create_callback( sym, proc=nil, &blk )
+  # Creates a callback as an instance of Fiddle::Function
+  def self.create_callback_function( sym, proc=nil, &blk )
     if block_given?
-      return bind( @@glfw_cb_signature[sym], nil, &blk )
+      return bind( @@glfw_cb_function_signature[sym], nil, &blk )
     else
-      return bind( @@glfw_cb_signature[sym], nil, &proc )
+      return bind( @@glfw_cb_function_signature[sym], nil, &proc )
     end
   end
 
+  GLFWerrorfun_cb_args             = [Fiddle::TYPE_INT, Fiddle::TYPE_VOIDP]
+  GLFWerrorfun_cb_retval           = Fiddle::TYPE_VOID
+  GLFWwindowposfun_cb_args         = [Fiddle::TYPE_VOIDP, Fiddle::TYPE_INT, Fiddle::TYPE_INT]
+  GLFWwindowposfun_cb_retval       = Fiddle::TYPE_VOID
+  GLFWwindowsizefun_cb_args        = [Fiddle::TYPE_VOIDP, Fiddle::TYPE_INT, Fiddle::TYPE_INT]
+  GLFWwindowsizefun_cb_retval      = Fiddle::TYPE_VOID
+  GLFWwindowclosefun_cb_args       = [Fiddle::TYPE_VOIDP]
+  GLFWwindowclosefun_cb_retval     = Fiddle::TYPE_VOID
+  GLFWwindowrefreshfun_cb_args     = [Fiddle::TYPE_VOIDP]
+  GLFWwindowrefreshfun_cb_retval   = Fiddle::TYPE_VOID
+  GLFWwindowfocusfun_cb_args       = [Fiddle::TYPE_VOIDP, Fiddle::TYPE_INT]
+  GLFWwindowfocusfun_cb_retval     = Fiddle::TYPE_VOID
+  GLFWwindowiconifyfun_cb_args     = [Fiddle::TYPE_VOIDP, Fiddle::TYPE_INT]
+  GLFWwindowiconifyfun_cb_retval   = Fiddle::TYPE_VOID
+  GLFWframebuffersizefun_cb_args   = [Fiddle::TYPE_VOIDP, Fiddle::TYPE_INT, Fiddle::TYPE_INT]
+  GLFWframebuffersizefun_cb_retval = Fiddle::TYPE_VOID
+  GLFWmousebuttonfun_cb_args       = [Fiddle::TYPE_VOIDP, Fiddle::TYPE_INT, Fiddle::TYPE_INT, Fiddle::TYPE_INT]
+  GLFWmousebuttonfun_cb_retval     = Fiddle::TYPE_VOID
+  GLFWcursorposfun_cb_args         = [Fiddle::TYPE_VOIDP, Fiddle::TYPE_DOUBLE, Fiddle::TYPE_DOUBLE]
+  GLFWcursorposfun_cb_retval       = Fiddle::TYPE_VOID
+  GLFWcursorenterfun_cb_args       = [Fiddle::TYPE_VOIDP, Fiddle::TYPE_INT]
+  GLFWcursorenterfun_cb_retval     = Fiddle::TYPE_VOID
+  GLFWscrollfun_cb_args            = [Fiddle::TYPE_VOIDP, Fiddle::TYPE_DOUBLE, Fiddle::TYPE_DOUBLE]
+  GLFWscrollfun_cb_retval          = Fiddle::TYPE_VOID
+  GLFWkeyfun_cb_args               = [Fiddle::TYPE_VOIDP, Fiddle::TYPE_INT, Fiddle::TYPE_INT, Fiddle::TYPE_INT, Fiddle::TYPE_INT]
+  GLFWkeyfun_cb_retval             = Fiddle::TYPE_VOID
+  GLFWcharfun_cb_args              = [Fiddle::TYPE_VOIDP, -Fiddle::TYPE_INT]
+  GLFWcharfun_cb_retval            = Fiddle::TYPE_VOID
+  GLFWcharmodsfun_cb_args          = [Fiddle::TYPE_VOIDP, -Fiddle::TYPE_INT, Fiddle::TYPE_INT]
+  GLFWcharmodsfun_cb_retval        = Fiddle::TYPE_VOID
+  GLFWdropfun_cb_args              = [Fiddle::TYPE_VOIDP, Fiddle::TYPE_INT, Fiddle::TYPE_VOIDP]
+  GLFWdropfun_cb_retval            = Fiddle::TYPE_VOID
+  GLFWmonitorfun_cb_args           = [Fiddle::TYPE_VOIDP, Fiddle::TYPE_INT]
+  GLFWmonitorfun_cb_retval         = Fiddle::TYPE_VOID
+
+  @@glfw_cb_closure_signature = {
+    :GLFWerrorfun           => [GLFWerrorfun_cb_retval, GLFWerrorfun_cb_args],
+    :GLFWwindowposfun       => [GLFWwindowposfun_cb_retval, GLFWwindowposfun_cb_args],
+    :GLFWwindowsizefun      => [GLFWwindowsizefun_cb_retval, GLFWwindowsizefun_cb_args],
+    :GLFWwindowclosefun     => [GLFWwindowclosefun_cb_retval, GLFWwindowclosefun_cb_args],
+    :GLFWwindowrefreshfun   => [GLFWwindowrefreshfun_cb_retval, GLFWwindowrefreshfun_cb_args],
+    :GLFWwindowfocusfun     => [GLFWwindowfocusfun_cb_retval, GLFWwindowfocusfun_cb_args],
+    :GLFWwindowiconifyfun   => [GLFWwindowiconifyfun_cb_retval, GLFWwindowiconifyfun_cb_args],
+    :GLFWframebuffersizefun => [GLFWframebuffersizefun_cb_retval, GLFWframebuffersizefun_cb_args],
+    :GLFWmousebuttonfun     => [GLFWmousebuttonfun_cb_retval, GLFWmousebuttonfun_cb_args],
+    :GLFWcursorposfun       => [GLFWcursorposfun_cb_retval, GLFWcursorposfun_cb_args],
+    :GLFWcursorenterfun     => [GLFWcursorenterfun_cb_retval, GLFWcursorenterfun_cb_args],
+    :GLFWscrollfun          => [GLFWscrollfun_cb_retval, GLFWscrollfun_cb_args],
+    :GLFWkeyfun             => [GLFWkeyfun_cb_retval, GLFWkeyfun_cb_args],
+    :GLFWcharfun            => [GLFWcharfun_cb_retval, GLFWcharfun_cb_args],
+    :GLFWcharmodsfun        => [GLFWcharmodsfun_cb_retval, GLFWcharmodsfun_cb_args],
+    :GLFWdropfun            => [GLFWdropfun_cb_retval, GLFWdropfun_cb_args],
+    :GLFWmonitorfun         => [GLFWmonitorfun_cb_retval, GLFWmonitorfun_cb_args],
+  }
+
+  # Creates a callback as an instance of Fiddle::Closure::BlockCaller
+  def self.create_callback_closure( sym, proc=nil, &blk )
+    cb_retval = @@glfw_cb_closure_signature[sym][0]
+    cb_args   = @@glfw_cb_closure_signature[sym][1]
+    if block_given?
+      return Fiddle::Closure::BlockCaller.new( cb_retval, cb_args, Fiddle::Function::DEFAULT, &blk )
+    else
+      return Fiddle::Closure::BlockCaller.new( cb_retval, cb_args, Fiddle::Function::DEFAULT, &proc )
+    end
+  end
+
+  # NOTE : Use 'create_callback_function' for backward compatibility.
+  def self.create_callback( sym, proc=nil, &blk )
+    return self.create_callback_closure( sym, proc, &blk )
+  end
+
   # struct
   GLFWvidmode = struct(["int width",
                         "int height",

data/lib/glfw30.rb

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+# A GLFW wrapper (for version 3.0)
 require 'fiddle/import'
 
 module GLFW
@@ -266,9 +267,102 @@ module GLFW
   GLFW_CONNECTED     = 0x00040001
   GLFW_DISCONNECTED  = 0x00040002
 
+  # typedefs
+  @@glfw_cb_function_signature = {
+    :GLFWerrorfun           => "void GLFWerrorfun(int,const char*)",
+    :GLFWwindowposfun       => "void GLFWwindowposfun(void*,int,int)",
+    :GLFWwindowsizefun      => "void GLFWwindowsizefun(void*,int,int)",
+    :GLFWwindowclosefun     => "void GLFWwindowclosefun(void*)",
+    :GLFWwindowrefreshfun   => "void GLFWwindowrefreshfun(void*)",
+    :GLFWwindowfocusfun     => "void GLFWwindowfocusfun(void*,int)",
+    :GLFWwindowiconifyfun   => "void GLFWwindowiconifyfun(void*,int)",
+    :GLFWframebuffersizefun => "void GLFWframebuffersizefun(void*,int,int)",
+    :GLFWmousebuttonfun     => "void GLFWmousebuttonfun(void*,int,int,int)",
+    :GLFWcursorposfun       => "void GLFWcursorposfun(void*,double,double)",
+    :GLFWcursorenterfun     => "void GLFWcursorenterfun(void*,int)",
+    :GLFWscrollfun          => "void GLFWscrollfun(void*,double,double)",
+    :GLFWkeyfun             => "void GLFWkeyfun(void*,int,int,int,int)",
+    :GLFWcharfun            => "void GLFWcharfun(void*,unsigned int)",
+    :GLFWmonitorfun         => "void GLFWmonitorfun(void*,int)",
+  }
+
+  # Creates a callback as an instance of Fiddle::Function
+  def self.create_callback_function( sym, proc=nil, &blk )
+    if block_given?
+      return bind( @@glfw_cb_function_signature[sym], nil, &blk )
+    else
+      return bind( @@glfw_cb_function_signature[sym], nil, &proc )
+    end
+  end
+
+  GLFWerrorfun_cb_args             = [Fiddle::TYPE_INT, Fiddle::TYPE_VOIDP]
+  GLFWerrorfun_cb_retval           = Fiddle::TYPE_VOID
+  GLFWwindowposfun_cb_args         = [Fiddle::TYPE_VOIDP, Fiddle::TYPE_INT, Fiddle::TYPE_INT]
+  GLFWwindowposfun_cb_retval       = Fiddle::TYPE_VOID
+  GLFWwindowsizefun_cb_args        = [Fiddle::TYPE_VOIDP, Fiddle::TYPE_INT, Fiddle::TYPE_INT]
+  GLFWwindowsizefun_cb_retval      = Fiddle::TYPE_VOID
+  GLFWwindowclosefun_cb_args       = [Fiddle::TYPE_VOIDP]
+  GLFWwindowclosefun_cb_retval     = Fiddle::TYPE_VOID
+  GLFWwindowrefreshfun_cb_args     = [Fiddle::TYPE_VOIDP]
+  GLFWwindowrefreshfun_cb_retval   = Fiddle::TYPE_VOID
+  GLFWwindowfocusfun_cb_args       = [Fiddle::TYPE_VOIDP, Fiddle::TYPE_INT]
+  GLFWwindowfocusfun_cb_retval     = Fiddle::TYPE_VOID
+  GLFWwindowiconifyfun_cb_args     = [Fiddle::TYPE_VOIDP, Fiddle::TYPE_INT]
+  GLFWwindowiconifyfun_cb_retval   = Fiddle::TYPE_VOID
+  GLFWframebuffersizefun_cb_args   = [Fiddle::TYPE_VOIDP, Fiddle::TYPE_INT, Fiddle::TYPE_INT]
+  GLFWframebuffersizefun_cb_retval = Fiddle::TYPE_VOID
+  GLFWmousebuttonfun_cb_args       = [Fiddle::TYPE_VOIDP, Fiddle::TYPE_INT, Fiddle::TYPE_INT, Fiddle::TYPE_INT]
+  GLFWmousebuttonfun_cb_retval     = Fiddle::TYPE_VOID
+  GLFWcursorposfun_cb_args         = [Fiddle::TYPE_VOIDP, Fiddle::TYPE_DOUBLE, Fiddle::TYPE_DOUBLE]
+  GLFWcursorposfun_cb_retval       = Fiddle::TYPE_VOID
+  GLFWcursorenterfun_cb_args       = [Fiddle::TYPE_VOIDP, Fiddle::TYPE_INT]
+  GLFWcursorenterfun_cb_retval     = Fiddle::TYPE_VOID
+  GLFWscrollfun_cb_args            = [Fiddle::TYPE_VOIDP, Fiddle::TYPE_DOUBLE, Fiddle::TYPE_DOUBLE]
+  GLFWscrollfun_cb_retval          = Fiddle::TYPE_VOID
+  GLFWkeyfun_cb_args               = [Fiddle::TYPE_VOIDP, Fiddle::TYPE_INT, Fiddle::TYPE_INT, Fiddle::TYPE_INT, Fiddle::TYPE_INT]
+  GLFWkeyfun_cb_retval             = Fiddle::TYPE_VOID
+  GLFWcharfun_cb_args              = [Fiddle::TYPE_VOIDP, -Fiddle::TYPE_INT]
+  GLFWcharfun_cb_retval            = Fiddle::TYPE_VOID
+  GLFWmonitorfun_cb_args           = [Fiddle::TYPE_VOIDP, Fiddle::TYPE_INT]
+  GLFWmonitorfun_cb_retval         = Fiddle::TYPE_VOID
+
+  @@glfw_cb_closure_signature = {
+    :GLFWerrorfun           => [GLFWerrorfun_cb_retval, GLFWerrorfun_cb_args],
+    :GLFWwindowposfun       => [GLFWwindowposfun_cb_retval, GLFWwindowposfun_cb_args],
+    :GLFWwindowsizefun      => [GLFWwindowsizefun_cb_retval, GLFWwindowsizefun_cb_args],
+    :GLFWwindowclosefun     => [GLFWwindowclosefun_cb_retval, GLFWwindowclosefun_cb_args],
+    :GLFWwindowrefreshfun   => [GLFWwindowrefreshfun_cb_retval, GLFWwindowrefreshfun_cb_args],
+    :GLFWwindowfocusfun     => [GLFWwindowfocusfun_cb_retval, GLFWwindowfocusfun_cb_args],
+    :GLFWwindowiconifyfun   => [GLFWwindowiconifyfun_cb_retval, GLFWwindowiconifyfun_cb_args],
+    :GLFWframebuffersizefun => [GLFWframebuffersizefun_cb_retval, GLFWframebuffersizefun_cb_args],
+    :GLFWmousebuttonfun     => [GLFWmousebuttonfun_cb_retval, GLFWmousebuttonfun_cb_args],
+    :GLFWcursorposfun       => [GLFWcursorposfun_cb_retval, GLFWcursorposfun_cb_args],
+    :GLFWcursorenterfun     => [GLFWcursorenterfun_cb_retval, GLFWcursorenterfun_cb_args],
+    :GLFWscrollfun          => [GLFWscrollfun_cb_retval, GLFWscrollfun_cb_args],
+    :GLFWkeyfun             => [GLFWkeyfun_cb_retval, GLFWkeyfun_cb_args],
+    :GLFWcharfun            => [GLFWcharfun_cb_retval, GLFWcharfun_cb_args],
+    :GLFWmonitorfun         => [GLFWmonitorfun_cb_retval, GLFWmonitorfun_cb_args],
+  }
+
+  # Creates a callback as an instance of Fiddle::Closure::BlockCaller
+  def self.create_callback_closure( sym, proc=nil, &blk )
+    cb_retval = @@glfw_cb_closure_signature[sym][0]
+    cb_args   = @@glfw_cb_closure_signature[sym][1]
+    if block_given?
+      return Fiddle::Closure::BlockCaller.new( cb_retval, cb_args, Fiddle::Function::DEFAULT, &blk )
+    else
+      return Fiddle::Closure::BlockCaller.new( cb_retval, cb_args, Fiddle::Function::DEFAULT, &proc )
+    end
+  end
+
+  # NOTE : Use 'create_callback_function' for backward compatibility.
+  def self.create_callback( sym, proc=nil, &blk )
+    return self.create_callback_closure( sym, proc, &blk )
+  end
+
+
   # typedefs
   @@glfw_cb_signature = {
-    :GLFWglproc => "void GLFWglproc()",
     :GLFWerrorfun => "void GLFWerrorfun(int,const char*)",
     :GLFWwindowposfun => "void GLFWwindowposfun(void*,int,int)",
     :GLFWwindowsizefun => "void GLFWwindowsizefun(void*,int,int)",

data/lib/glut.rb

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+# A FreeGLUT wrapper
 require 'fiddle/import'
 require_relative 'opengl_platform'
 
@@ -218,7 +219,7 @@ module GLUT
   GLUT_GAME_MODE_DISPLAY_CHANGED = 0x0006
 
   # typedefs
-  @@glut_cb_signature = {
+  @@glut_cb_function_signature = {
     :GLUTMenuFunc            => "void GLUTMenuFunc(int)",
 
     :GLUTTimerFunc           => "void GLUTTimerFunc(int)",
@@ -251,14 +252,113 @@ module GLUT
     :GLUTTabletButtonFunc    => "void GLUTTabletButtonFunc(int, int, int, int)",
   }
 
+  # Creates a callback as an instance of Fiddle::Function
   def self.create_callback( sym, proc=nil, &blk )
     if block_given?
-      return bind( @@glut_cb_signature[sym], nil, &blk )
+      return bind( @@glut_cb_function_signature[sym], nil, &blk )
     else
-      return bind( @@glut_cb_signature[sym], nil, &proc )
+      return bind( @@glut_cb_function_signature[sym], nil, &proc )
     end
   end
 
+  GLUTMenuFunc_cb_args              = [Fiddle::TYPE_INT]
+  GLUTMenuFunc_cb_retval            = Fiddle::TYPE_VOID
+  GLUTTimerFunc_cb_args             = [Fiddle::TYPE_INT]
+  GLUTTimerFunc_cb_retval           = Fiddle::TYPE_VOID
+  GLUTIdleFunc_cb_args              = []
+  GLUTIdleFunc_cb_retval            = Fiddle::TYPE_VOID
+  GLUTKeyboardFunc_cb_args          = [-Fiddle::TYPE_CHAR, Fiddle::TYPE_INT, Fiddle::TYPE_INT]
+  GLUTKeyboardFunc_cb_retval        = Fiddle::TYPE_VOID
+  GLUTSpecialFunc_cb_args           = [Fiddle::TYPE_INT, Fiddle::TYPE_INT, Fiddle::TYPE_INT]
+  GLUTSpecialFunc_cb_retval         = Fiddle::TYPE_VOID
+  GLUTReshapeFunc_cb_args           = [Fiddle::TYPE_INT, Fiddle::TYPE_INT]
+  GLUTReshapeFunc_cb_retval         = Fiddle::TYPE_VOID
+  GLUTVisibilityFunc_cb_args        = [Fiddle::TYPE_INT]
+  GLUTVisibilityFunc_cb_retval      = Fiddle::TYPE_VOID
+  GLUTDisplayFunc_cb_args           = []
+  GLUTDisplayFunc_cb_retval         = Fiddle::TYPE_VOID
+  GLUTMouseFunc_cb_args             = [Fiddle::TYPE_INT, Fiddle::TYPE_INT, Fiddle::TYPE_INT, Fiddle::TYPE_INT]
+  GLUTMouseFunc_cb_retval           = Fiddle::TYPE_VOID
+  GLUTMotionFunc_cb_args            = [Fiddle::TYPE_INT, Fiddle::TYPE_INT]
+  GLUTMotionFunc_cb_retval          = Fiddle::TYPE_VOID
+  GLUTPassiveMotionFunc_cb_args     = [Fiddle::TYPE_INT, Fiddle::TYPE_INT]
+  GLUTPassiveMotionFunc_cb_retval   = Fiddle::TYPE_VOID
+  GLUTEntryFunc_cb_args             = [Fiddle::TYPE_INT]
+  GLUTEntryFunc_cb_retval           = Fiddle::TYPE_VOID
+  GLUTKeyboardUpFunc_cb_args        = [-Fiddle::TYPE_CHAR, Fiddle::TYPE_INT, Fiddle::TYPE_INT]
+  GLUTKeyboardUpFunc_cb_retval      = Fiddle::TYPE_VOID
+  GLUTSpecialUpFunc_cb_args         = [Fiddle::TYPE_INT, Fiddle::TYPE_INT, Fiddle::TYPE_INT]
+  GLUTSpecialUpFunc_cb_retval       = Fiddle::TYPE_VOID
+  GLUTJoystickFunc_cb_args          = [-Fiddle::TYPE_INT, Fiddle::TYPE_INT, Fiddle::TYPE_INT, Fiddle::TYPE_INT]
+  GLUTJoystickFunc_cb_retval        = Fiddle::TYPE_VOID
+  GLUTMenuStateFunc_cb_args         = [Fiddle::TYPE_INT]
+  GLUTMenuStateFunc_cb_retval       = Fiddle::TYPE_VOID
+  GLUTMenuStatusFunc_cb_args        = [Fiddle::TYPE_INT, Fiddle::TYPE_INT, Fiddle::TYPE_INT]
+  GLUTMenuStatusFunc_cb_retval      = Fiddle::TYPE_VOID
+  GLUTOverlayDisplayFunc_cb_args    = []
+  GLUTOverlayDisplayFunc_cb_retval  = Fiddle::TYPE_VOID
+  GLUTWindowStatusFunc_cb_args      = [Fiddle::TYPE_INT]
+  GLUTWindowStatusFunc_cb_retval    = Fiddle::TYPE_VOID
+  GLUTSpaceballMotionFunc_cb_args   = [Fiddle::TYPE_INT, Fiddle::TYPE_INT, Fiddle::TYPE_INT]
+  GLUTSpaceballMotionFunc_cb_retval = Fiddle::TYPE_VOID
+  GLUTSpaceballRotateFunc_cb_args   = [Fiddle::TYPE_INT, Fiddle::TYPE_INT, Fiddle::TYPE_INT]
+  GLUTSpaceballRotateFunc_cb_retval = Fiddle::TYPE_VOID
+  GLUTSpaceballButtonFunc_cb_args   = [Fiddle::TYPE_INT, Fiddle::TYPE_INT]
+  GLUTSpaceballButtonFunc_cb_retval = Fiddle::TYPE_VOID
+  GLUTButtonBoxFunc_cb_args         = [Fiddle::TYPE_INT, Fiddle::TYPE_INT]
+  GLUTButtonBoxFunc_cb_retval       = Fiddle::TYPE_VOID
+  GLUTDialsFunc_cb_args             = [Fiddle::TYPE_INT, Fiddle::TYPE_INT]
+  GLUTDialsFunc_cb_retval           = Fiddle::TYPE_VOID
+  GLUTTabletMotionFunc_cb_args      = [Fiddle::TYPE_INT, Fiddle::TYPE_INT]
+  GLUTTabletMotionFunc_cb_retval    = Fiddle::TYPE_VOID
+  GLUTTabletButtonFunc_cb_args      = [Fiddle::TYPE_INT, Fiddle::TYPE_INT, Fiddle::TYPE_INT, Fiddle::TYPE_INT]
+  GLUTTabletButtonFunc_cb_retval    = Fiddle::TYPE_VOID
+
+  @@glut_cb_closure_signature = {
+    :GLUTMenuFunc            => [GLUTMenuFunc_cb_retval, GLUTMenuFunc_cb_args],
+    :GLUTTimerFunc           => [GLUTTimerFunc_cb_retval, GLUTTimerFunc_cb_args],
+    :GLUTIdleFunc            => [GLUTIdleFunc_cb_retval, GLUTIdleFunc_cb_args],
+    :GLUTKeyboardFunc        => [GLUTKeyboardFunc_cb_retval, GLUTKeyboardFunc_cb_args],
+    :GLUTSpecialFunc         => [GLUTSpecialFunc_cb_retval, GLUTSpecialFunc_cb_args],
+    :GLUTReshapeFunc         => [GLUTReshapeFunc_cb_retval, GLUTReshapeFunc_cb_args],
+    :GLUTVisibilityFunc      => [GLUTVisibilityFunc_cb_retval, GLUTVisibilityFunc_cb_args],
+    :GLUTDisplayFunc         => [GLUTDisplayFunc_cb_retval, GLUTDisplayFunc_cb_args],
+    :GLUTMouseFunc           => [GLUTMouseFunc_cb_retval, GLUTMouseFunc_cb_args],
+    :GLUTMotionFunc          => [GLUTMotionFunc_cb_retval, GLUTMotionFunc_cb_args],
+    :GLUTPassiveMotionFunc   => [GLUTPassiveMotionFunc_cb_retval, GLUTPassiveMotionFunc_cb_args],
+    :GLUTEntryFunc           => [GLUTEntryFunc_cb_retval, GLUTEntryFunc_cb_args],
+    :GLUTKeyboardUpFunc      => [GLUTKeyboardUpFunc_cb_retval, GLUTKeyboardUpFunc_cb_args],
+    :GLUTSpecialUpFunc       => [GLUTSpecialUpFunc_cb_retval, GLUTSpecialUpFunc_cb_args],
+    :GLUTJoystickFunc        => [GLUTJoystickFunc_cb_retval, GLUTJoystickFunc_cb_args],
+    :GLUTMenuStateFunc       => [GLUTMenuStateFunc_cb_retval, GLUTMenuStateFunc_cb_args],
+    :GLUTMenuStatusFunc      => [GLUTMenuStatusFunc_cb_retval, GLUTMenuStatusFunc_cb_args],
+    :GLUTOverlayDisplayFunc  => [GLUTOverlayDisplayFunc_cb_retval, GLUTOverlayDisplayFunc_cb_args],
+    :GLUTWindowStatusFunc    => [GLUTWindowStatusFunc_cb_retval, GLUTWindowStatusFunc_cb_args],
+    :GLUTSpaceballMotionFunc => [GLUTSpaceballMotionFunc_cb_retval, GLUTSpaceballMotionFunc_cb_args],
+    :GLUTSpaceballRotateFunc => [GLUTSpaceballRotateFunc_cb_retval, GLUTSpaceballRotateFunc_cb_args],
+    :GLUTSpaceballButtonFunc => [GLUTSpaceballButtonFunc_cb_retval, GLUTSpaceballButtonFunc_cb_args],
+    :GLUTButtonBoxFunc       => [GLUTButtonBoxFunc_cb_retval, GLUTButtonBoxFunc_cb_args],
+    :GLUTDialsFunc           => [GLUTDialsFunc_cb_retval, GLUTDialsFunc_cb_args],
+    :GLUTTabletMotionFunc    => [GLUTTabletMotionFunc_cb_retval, GLUTTabletMotionFunc_cb_args],
+    :GLUTTabletButtonFunc    => [GLUTTabletButtonFunc_cb_retval, GLUTTabletButtonFunc_cb_args],
+  }
+
+  # Creates a callback as an instance of Fiddle::Closure::BlockCaller
+  def self.create_callback_closure( sym, proc=nil, &blk )
+    cb_retval = @@glut_cb_closure_signature[sym][0]
+    cb_args   = @@glut_cb_closure_signature[sym][1]
+    if block_given?
+      return Fiddle::Closure::BlockCaller.new( cb_retval, cb_args, Fiddle::Function::DEFAULT, &blk )
+    else
+      return Fiddle::Closure::BlockCaller.new( cb_retval, cb_args, Fiddle::Function::DEFAULT, &proc )
+    end
+  end
+
+  # NOTE : Use 'create_callback_function' for backward compatibility.
+  def self.create_callback( sym, proc=nil, &blk )
+    return self.create_callback_closure( sym, proc, &blk )
+  end
+
   @@glut_import_done = false
 
   # Load native library.

metadata

@@ -1,17 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: opengl-bindings
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.5.3
 platform: ruby
 authors:
 - vaiorabbit
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-21 00:00:00.000000000 Z
+date: 2015-12-30 00:00:00.000000000 Z
 dependencies: []
-description: |
-  Ruby bindings for OpenGL - 4.5, OpenGL ES - 3.2 and all extensions using Fiddle (For MRI >= 2.0.0). GLFW/GLUT/GLU bindings are also available.
+description: 'Ruby bindings for OpenGL - 4.5, OpenGL ES - 3.2 and all extensions using
+  Fiddle (For MRI >= 2.0.0). GLFW/GLUT/GLU bindings are also available.
+
+'
 email:
 - vaiorabbit@gmail.com
 executables: []