opengl-bindings 1.5.1 → 1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 55b6e6b435b1fe04ac0be0e5095edab84d9627c8
-  data.tar.gz: 4cabf98166e02b2e43ab321c9da9cc0538b3bed9
+  metadata.gz: 9d4a60f9ec6d0edcd730c35b05c2f9df9c9dff38
+  data.tar.gz: d8bfff5e139aef4e2b2bb0278a0824332db86b09
 SHA512:
-  metadata.gz: 3cc184347f44b8e4d0bcbeb50642e543134466673d94bf8cb05c9f09d6e8f9eabf7b03f65988b97d0afd514e8ec16c10d7f1d6c115c83dc40c7d2dd06ff3d810
-  data.tar.gz: 6a0c188e965ff000ef95c5a83377167be5c0762b8e277622fb913c307c5896c2994591f057455dad1e9ebf2a198bf7ce2ad148c5576d301440347e23e1e123db
+  metadata.gz: e5398895ad2c8c2c126672f22b45fb549f3c988fbe916abcb6a031371955ada73cb3f393d7259309ad0bb10c07ae69b3515b7a11f7ee330008e0f3041072c181
+  data.tar.gz: 7cbe82566492a6a5520173590cffaa320f5d512f9fea172c8b732e90b2aafa2ee0297f04b30898103b7949d4a32f5dc85bb653b1635f3f2911738016987faff6

data/ChangeLog

@@ -1,3 +1,15 @@
+2015-11-14  vaiorabbit  <http://twitter.com/vaiorabbit>
+
+	* lib/opengl_linux.rb (glXGetCurrentDisplay): Fixed wrong signature.
+
+2015-11-07  vaiorabbit  <http://twitter.com/vaiorabbit>
+
+	* lib/opengl_macosx.rb, lib/opengl_linux.rb: Added.
+
+2015-11-03  vaiorabbit  <http://twitter.com/vaiorabbit>
+
+	* sample/DebugOutput/debug_output.rb: Fidex '$debug_log_callback' to '$debug_log_callback.to_i' (now runnable both C edition and pure-Ruby edition).
+
 2015-10-24  vaiorabbit  <http://twitter.com/vaiorabbit>
 
 	* Updated using latest gl.xml.

data/README.md

@@ -5,7 +5,7 @@
 ...and wrapper code generator.
 
 *   Created : 2013-08-28
-*   Last modified : 2015-10-24
+*   Last modified : 2015-11-14
 
 
 ## Features ##
@@ -44,7 +44,9 @@ https://github.com/vaiorabbit/ruby-opengl
     *   'opengl_enum.rb'         : OpenGL enum wrapper (GL_TRIANGLE_STRIP, etc.). Generated via generator/generate_enum.rb.
     *   'opengl_common.rb'       : Provides utility functions.
     *   'opengl_platform.rb'     : Provides platform check functions (OpneGL.get_platform).
-    *   'opengl_windows.rb'      : Provides functions for Windows platform (wglGetProcAddress).
+    *   'opengl_windows.rb'      : Provides functions for Windows platform (wglGetProcAddress, wglGetCurrentContext, wglGetCurrentDC).
+    *   'opengl_macosx.rb'       : Provides functions for Mac OS X platform (CGLGetCurrentContext, CGLGetShareGroup).
+    *   'opengl_linux.rb'        : Provides functions for Linux (X Window) platform (glXGetCurrentContext, glXGetCurrentDisplay).
 
 *   'opengl_es.rb' is almost the same with 'opengl.rb', except for including 'opengl_es_command.rb' and 'opengl_es_enum.rb'.
 
@@ -248,7 +250,9 @@ https://github.com/vaiorabbit/ruby-opengl
     *   'opengl_enum.rb'         : OpenGL enum のラッパーコード (GL_TRIANGLE_STRIP, etc.)。 generator/generate_enum.rb で自動生成されたものです。
     *   'opengl_common.rb'       : 共通のユーティリティ関数を提供しています。
     *   'opengl_platform.rb'     : 動作プラットフォームの判別機能を提供しています (OpneGL.get_platform)。
-    *   'opengl_windows.rb'      : Windows用の機能を提供しています (wglGetProcAddress)。
+    *   'opengl_windows.rb'      : Windows 用の機能を提供しています (wglGetProcAddress, wglGetCurrentContext, wglGetCurrentDC).
+    *   'opengl_macosx.rb'       : Mac OS X 用の機能を提供しています (CGLGetCurrentContext, CGLGetShareGroup).
+    *   'opengl_linux.rb'        : Linux (X Window) 用の機能を提供しています (glXGetCurrentContext, glXGetCurrentDisplay).
 
 *   'opengl_es.rb' は 'opengl_es_command.rb' と 'opengl_es_enum.rb' を取り込む以外は 'opengl.rb' と同じです。
 

data/lib/opengl.rb

@@ -10,4 +10,10 @@ rescue LoadError
   if OpenGL.get_platform == :OPENGL_PLATFORM_WINDOWS
     require_relative 'opengl_windows'
   end
+  if OpenGL.get_platform == :OPENGL_PLATFORM_MACOSX
+    require_relative 'opengl_macosx'
+  end
+  if OpenGL.get_platform == :OPENGL_PLATFORM_LINUX
+    require_relative 'opengl_linux'
+  end
 end

data/lib/opengl_linux.rb

@@ -0,0 +1,39 @@
+require 'fiddle'
+
+module OpenGL
+
+  GLX_FUNCTIONS_MAP = {}
+  GLX_FUNCTIONS_ARGS_MAP = {}
+  GLX_FUNCTIONS_RETVAL_MAP = {}
+
+  def self.get_glx_command( sym )
+    if GLX_FUNCTIONS_MAP[sym] == nil
+      bind_glx_command( sym )
+    end
+    return GLX_FUNCTIONS_MAP[sym]
+  end
+
+  def self.bind_glx_command( sym )
+    GLX_FUNCTIONS_MAP[sym] = Fiddle::Function.new( @@gl_dll[sym.to_s], 
+                                                   GLX_FUNCTIONS_ARGS_MAP[sym],
+                                                   GLX_FUNCTIONS_RETVAL_MAP[sym] )
+    raise RuntimeError if GLX_FUNCTIONS_RETVAL_MAP[sym] == nil
+  end
+
+  GLX_FUNCTIONS_ARGS_MAP[:glXGetCurrentContext] = []
+  GLX_FUNCTIONS_RETVAL_MAP[:glXGetCurrentContext] = Fiddle::TYPE_VOIDP
+
+  def glXGetCurrentContext()
+    f = OpenGL::get_glx_command(:glXGetCurrentContext)
+    f.call()
+  end
+
+  GLX_FUNCTIONS_ARGS_MAP[:glXGetCurrentDisplay] = [Fiddle::TYPE_VOIDP]
+  GLX_FUNCTIONS_RETVAL_MAP[:glXGetCurrentDisplay] = Fiddle::TYPE_VOIDP
+
+  def glXGetCurrentDisplay(_glx_ctxobj_)
+    f = OpenGL::get_glx_command(:glXGetCurrentDisplay)
+    f.call(_glx_ctxobj_)
+  end
+
+end

data/lib/opengl_macosx.rb

@@ -0,0 +1,44 @@
+require 'fiddle'
+
+module OpenGL
+
+  CGL_FUNCTIONS_MAP = {}
+  CGL_FUNCTIONS_ARGS_MAP = {}
+  CGL_FUNCTIONS_RETVAL_MAP = {}
+
+  @@cgl_dll = nil
+
+  def self.get_cgl_command( sym )
+    if @@cgl_dll == nil
+      @@cgl_dll = Fiddle.dlopen('/System/Library/Frameworks/OpenGL.framework/OpenGL')
+    end
+    if CGL_FUNCTIONS_MAP[sym] == nil
+      bind_cgl_command( sym )
+    end
+    return CGL_FUNCTIONS_MAP[sym]
+  end
+
+  def self.bind_cgl_command( sym )
+    CGL_FUNCTIONS_MAP[sym] = Fiddle::Function.new( @@cgl_dll[sym.to_s], 
+                                                   CGL_FUNCTIONS_ARGS_MAP[sym],
+                                                   CGL_FUNCTIONS_RETVAL_MAP[sym] )
+    raise RuntimeError if CGL_FUNCTIONS_RETVAL_MAP[sym] == nil
+  end
+
+  CGL_FUNCTIONS_ARGS_MAP[:CGLGetCurrentContext] = []
+  CGL_FUNCTIONS_RETVAL_MAP[:CGLGetCurrentContext] = Fiddle::TYPE_VOIDP
+
+  def CGLGetCurrentContext()
+    f = OpenGL::get_cgl_command(:CGLGetCurrentContext)
+    f.call()
+  end
+
+  CGL_FUNCTIONS_ARGS_MAP[:CGLGetShareGroup] = [Fiddle::TYPE_VOIDP]
+  CGL_FUNCTIONS_RETVAL_MAP[:CGLGetShareGroup] = Fiddle::TYPE_VOIDP
+
+  def CGLGetShareGroup(_cgl_ctxobj_)
+    f = OpenGL::get_cgl_command(:CGLGetShareGroup)
+    f.call(_cgl_ctxobj_)
+  end
+
+end

data/lib/opengl_windows.rb

@@ -28,4 +28,20 @@ module OpenGL
     f.call(_lpszProc_)
   end
 
+  WGL_FUNCTIONS_ARGS_MAP[:wglGetCurrentContext] = []
+  WGL_FUNCTIONS_RETVAL_MAP[:wglGetCurrentContext] = Fiddle::TYPE_VOIDP
+
+  def wglGetCurrentContext()
+    f = OpenGL::get_wgl_command(:wglGetCurrentContext)
+    f.call()
+  end
+
+  WGL_FUNCTIONS_ARGS_MAP[:wglGetCurrentDC] = []
+  WGL_FUNCTIONS_RETVAL_MAP[:wglGetCurrentDC] = Fiddle::TYPE_VOIDP
+
+  def wglGetCurrentDC()
+    f = OpenGL::get_wgl_command(:wglGetCurrentDC)
+    f.call()
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opengl-bindings
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.2
 platform: ruby
 authors:
 - vaiorabbit
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-24 00:00:00.000000000 Z
+date: 2015-11-21 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.
@@ -39,6 +39,8 @@ files:
 - lib/opengl_ext_command.rb
 - lib/opengl_ext_common.rb
 - lib/opengl_ext_enum.rb
+- lib/opengl_linux.rb
+- lib/opengl_macosx.rb
 - lib/opengl_platform.rb
 - lib/opengl_windows.rb
 - sample/README.md