opengl3 0.0.1.pre2 → 0.0.1.pre3

data/README.md

@@ -6,9 +6,13 @@ OpenGL wrapper library for Ruby
 * OpenGL 2.1 ~ 4.2
 * automatic error checking each function call
 * Ruby-style wrapper (not complete)
-* Works on OS X 10.8 and Linux
 * Inspired by PyOpenGL
 
+Tested on
+
+* Mac OS X 10.8 (MRI 1.9.3, Rubinius)
+* Linux (MRI 1.9.3, JRuby 1.7)
+
 ## Notice
 
 Since the project is not complete, many functions are still C-style.
@@ -21,15 +25,16 @@ with C-style OpenGL entrypoints.
 Please take a look at `lib/opengl/wrapper/**/*.rb`
 to see if entrypoints are wrapped.
 
-* glGetString() -> String
-* glGen__Objects__(count) -> Array of Integer
-* glDelete__Objects__(Array of Integer) -> nil
-* glGet__Value__fv(\*args, count) -> Array of Float
-* glGet__Value__iv(\*args, count) -> Array of Integer
-* glGet__Value__uiv(\*args, count) -> Array of Integer
-* glShaderSource(shader, Array of String) -> nil
-* glGetShaderInfoLog(shader) / glGetProgramInfoLog(program) -> String
-* More will be added
+* glGetString(pname) -> String
+* glGen__Objects__(count) -> Array<Integer>
+* glDelete__Objects__(Array<Integer>) -> nil
+* glGet__Value__fv(\*args, count) -> Array<Float>
+* glGet__Value__iv(\*args, count) -> Array<Integer>
+* glGet__Value__uiv(\*args, count) -> Array<Integer>
+* glShaderSource(shader, Array<String>) -> nil
+* glGetShaderInfoLog(shader) -> String
+* glGetProgramInfoLog(program) -> String
+* More Ruby-style functions coming soon
 
 block-style glMapBuffer / glMapBufferRange:
 
@@ -41,12 +46,12 @@ end
 
 And helper functions
 
-* glGetVersion() -> Array of Integer
-* glGetShadingLanguageVersion() -> Array of Integer
-* glGetAvailableExtensions() -> Array of String
-* glIsShaderCompiled?(shader) -> boolean
-* glIsProgramLinked?(program) -> boolean
-* More will be added
+* glGetVersion() -> Array<Integer>
+* glGetShadingLanguageVersion() -> Array<Integer>
+* glGetAvailableExtensions() -> Array<String>
+* glIsShaderCompiled?(shader) -> Boolean
+* glIsProgramLinked?(program) -> Boolean
+* More helper functions coming soon
 
 ## Installation
 

data/Rakefile

@@ -1,6 +1,5 @@
 require "bundler/gem_tasks"
 require "rake/testtask"
-require "yard"
 
 Rake::TestTask.new :spec do |t|
   t.libs << "spec"
@@ -17,6 +16,11 @@ task :console do
   sh "irb -rubygems -I lib -r opengl"
 end
 
-YARD::Rake::YardocTask.new
-desc "Generate documentation"
-task(:doc => :yard)
+begin
+  require "yard"
+rescue LoadError => e
+else
+  YARD::Rake::YardocTask.new
+  desc "Generate documentation"
+  task(:doc => :yard)
+end

data/lib/glut.rb

@@ -41,12 +41,7 @@ module GLUT
   
   def glutInit
     argc = FFI::MemoryPointer.new(:int, 1).write_int(0)
-    argv = FFI::MemoryPointer.new(:pointer, 1)
-    if RUBY_ENGINE == 'rbx'
-      argv.write_pointer(FFI::MemoryPointer::NULL)
-    else
-      argv.write_pointer(nil)
-    end
+    argv = FFI::MemoryPointer.new(:pointer, 1).write_pointer(nil)
     raw_glutInit(argc, argv)
   end
   

data/lib/opengl/platform/base.rb

@@ -4,16 +4,6 @@ require 'yaml'
 module OpenGL::Platform
   module Base
     
-    def primitive_types
-      @primitive_types ||= begin
-          root = File.expand_path('../types', __FILE__)
-          table = YAML.load(File.read(File.join(root, 'default.yml')))
-          path = File.join(root, "#{FFI::Platform::OS}.yml")
-          table.merge! YAML.load(File.read(path)) if File.exists? path
-          table.freeze
-        end
-    end
-    
     def calling_convention
       :default
     end

data/lib/opengl/type.rb

@@ -1,22 +1,29 @@
 require 'ffi'
-require_relative 'platform'
+require 'yaml'
 
 module OpenGL
   
   # OpenGL Type mapper
   module Type
+    # Root path of type definition files
+    ROOT = File.expand_path("../type", __FILE__)
     
-    @primitive_types = Platform.current.primitive_types.dup
-    #@regex_buffer_in_types = /\A(#{@primitive_types.keys.join('|')})_in\z/
-    #@regex_buffer_out_types = /\A(#{@primitive_types.keys.join('|')})_out\z/
+    default_path = File.join(ROOT, "default.yml")
+    platform_path = File.join(ROOT, "#{FFI::Platform::NAME}.yml")
+    @primitive_types = YAML.load(File.read(default_path)).merge!(
+                         YAML.load(File.read(platform_path))
+                       )
     
     @type_map = Hash[
-      @primitive_types.to_a +
-      @primitive_types.keys.map {|t| [:"#{t}_in", :buffer_in] } +
-      @primitive_types.keys.map {|t| [:"#{t}_out", :buffer_out] } + 
-      [ [:pointer_out, :buffer_out], [:pointer_in, :buffer_in] ] + 
-      [ [:GLchar_pointer_in, :buffer_in] ]
-    ]
+                  @primitive_types.to_a +
+                  @primitive_types.keys.map {|t| [:"#{t}_in", :buffer_in] } +
+                  @primitive_types.keys.map {|t| [:"#{t}_out", :buffer_out] }
+                ].merge!({
+                  :pointer_out => :buffer_out, :pointer_in => :buffer_in,
+                  :void => :void, :string => :string, :pointer => :pointer,
+                  :buffer_in => :buffer_in, :buffer_out => :buffer_out,
+                  :GLchar_pointer_in => :buffer_in
+                })
     
     # Transform the OpenGL type to native type
     # 
@@ -24,13 +31,7 @@ module OpenGL
     # @return [Symbol] native
     #
     def self.find(type)
-      type = type.to_sym
-      type = @type_map.fetch(type, type)
-      if RUBY_ENGINE == "rbx" # work around for Rubinius
-        [:buffer_in, :buffer_out].include?(type) ? :pointer : type
-      else
-        type
-      end
+      return @type_map.fetch(type.to_sym)
     end
     
     # @private

data/lib/opengl/{platform/types → type}/default.yml

@@ -25,3 +25,4 @@
 
 # GL_ARB_sync
 :GLsync:      :pointer
+

data/lib/opengl/type/i386-linux.yml

@@ -0,0 +1,2 @@
+:GLintptr:    :long
+:GLsizeiptr:  :long

data/lib/opengl/type/i386-windows.yml

@@ -0,0 +1 @@
+{}

data/lib/opengl/type/x86_64-linux.yml

@@ -0,0 +1,2 @@
+:GLintptr:    :long
+:GLsizeiptr:  :long

data/lib/opengl/type/x86_64-windows.yml

@@ -0,0 +1,2 @@
+:GLintptr:    :long_long
+:GLsizeiptr:  :long_long

data/lib/opengl/version.rb

@@ -1,3 +1,3 @@
 module OpenGL
-  VERSION = "0.0.1.pre2"
+  VERSION = "0.0.1.pre3"
 end

data/opengl.gemspec

@@ -20,5 +20,5 @@ Gem::Specification.new do |gem|
   gem.required_ruby_version = ">= 1.9"
   gem.add_dependency "ffi", ">= 1.2.0"
   gem.add_development_dependency "rake", "~> 10.0.0"
-  gem.add_development_dependency "minitest", "~> 4.3.0"
+  gem.add_development_dependency "minitest", ">= 4.3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opengl3
 version: !ruby/object:Gem::Version
-  version: 0.0.1.pre2
+  version: 0.0.1.pre3
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-08 00:00:00.000000000 Z
+date: 2013-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -48,7 +48,7 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 4.3.0
   type: :development
@@ -56,7 +56,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 4.3.0
 description: An OpenGL wrapper library for Ruby (OpenGL 2.1-4.2)
@@ -158,9 +158,6 @@ files:
 - lib/opengl/platform/base.rb
 - lib/opengl/platform/darwin.rb
 - lib/opengl/platform/linux.rb
-- lib/opengl/platform/types/darwin.yml
-- lib/opengl/platform/types/default.yml
-- lib/opengl/platform/types/linux.yml
 - lib/opengl/raw.rb
 - lib/opengl/raw/core/2_x/GL_VERSION_1_0.yml
 - lib/opengl/raw/core/2_x/GL_VERSION_1_1.yml
@@ -208,6 +205,12 @@ files:
 - lib/opengl/raw/core/4_2/GL_ARB_transform_feedback_instanced.yml
 - lib/opengl/raw/core/4_2/GL_VERSION_4_2.yml
 - lib/opengl/type.rb
+- lib/opengl/type/default.yml
+- lib/opengl/type/i386-linux.yml
+- lib/opengl/type/i386-windows.yml
+- lib/opengl/type/x86_64-darwin.yml
+- lib/opengl/type/x86_64-linux.yml
+- lib/opengl/type/x86_64-windows.yml
 - lib/opengl/version.rb
 - lib/opengl/wrapper.rb
 - lib/opengl/wrapper/base.rb

data/lib/opengl/platform/types/linux.yml

@@ -1,2 +0,0 @@
-:GLintptr:    :__ssize_t
-:GLsizeiptr:  :__ssize_t