opengl3 0.0.1.pre3 → 0.0.1.pre4

data/lib/glut.rb

@@ -9,7 +9,11 @@ module GLUT
     ffi_lib "/System/Library/Frameworks/GLUT.framework/GLUT"
   when "linux"
     ffi_lib "libglut.so.3"
-  else raise RuntimeError, "GLUT: Unsupported OS"
+  when "windows"
+    path = File.expand_path("../glut/#{FFI::Platform::ARCH}", __FILE__)
+    ffi_lib ["freeglut.dll", "#{path}/freeglut.dll"]
+  else
+    raise RuntimeError, "GLUT: Unsupported OS"
   end
   
   # keyboard / mouse callback constants

data/lib/opengl/platform/windows.rb

@@ -0,0 +1,28 @@
+module OpenGL::Platform
+  # @private
+  module Windows
+    extend Base
+    
+    def self.current_context?
+      not OpenGL32.wglGetCurrentContext().null?
+    end
+    
+    def self.find_function_address(name)
+      return OpenGL32.lib.find_function(name.to_s) ||
+             OpenGL32.wglGetProcAddress(name.to_s)
+    end
+    
+    module OpenGL32
+      extend FFI::Library
+      ffi_lib 'OpenGL32.dll'
+      callback :PROC, [], :void
+      def self.lib; ffi_libraries.last; end
+      attach_function :wglGetCurrentContext, [], :pointer
+      attach_function :wglGetProcAddress, [:string], :PROC
+    end
+  end
+  
+  def self.current
+    Windows
+  end
+end

data/lib/opengl/type.rb

@@ -82,11 +82,24 @@ module OpenGL
     #
     def self.pointer(ptr)
       if ptr.is_a? Integer
-        ptr = FFI::MemoryPointer(:pointer, n)
+        ptr = FFI::MemoryPointer.new(:pointer, n)
       end
       ptr.extend MemoryPointerInstanceMethods
       ptr.null? ? nil : ptr
     end
     
+    # Make sure offset is a pointer type
+    # @param [Integer, FFI::Pointer, nil] offset
+    # @return [FFI::Pointer]
+    #
+    def self.pointer_offset(offset)
+      case offset
+      when Integer then FFI::Pointer.new(offset)
+      when nil then FFI::Pointer.new(0)
+      when FFI::Pointer then offset
+      else raise ArgumentError, "Invalid type of 'offset'(=#{offset})"
+      end
+    end
+    
   end
 end

data/lib/opengl/type/default.yml

@@ -17,6 +17,7 @@
 :GLsizei:     :int32
 :GLint64:     :int64
 :GLuint64:    :uint64
+:GLhalf:      :uint16
 :GLfloat:     :float
 :GLclampf:    :float
 :GLdouble:    :double

data/lib/opengl/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opengl3
 version: !ruby/object:Gem::Version
-  version: 0.0.1.pre3
+  version: 0.0.1.pre4
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-10 00:00:00.000000000 Z
+date: 2013-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -66,23 +66,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .yardopts
-- Gemfile
-- LICENSE.txt
-- README.md
-- Rakefile
-- examples/math3d.rb
-- examples/ogl-2_1-basic.rb
-- examples/ogl-3_2-attribute_less.rb
-- examples/ogl-3_2-basic.rb
-- examples/ogl-3_2-cube.rb
-- examples/ogl-3_2-texture.rb
-- examples/ogl-4_0-quad_tessellation.rb
-- examples/ogl-4_0-triangle_tessellation.rb
+- lib/glut/i386/freeglut.dll.gitkeep
+- lib/glut/x86_64/freeglut.dll.gitkeep
 - lib/glut.rb
-- lib/opengl.rb
-- lib/opengl/constants.rb
 - lib/opengl/constants/core/2_x/GL_VERSION_1_1.yml
 - lib/opengl/constants/core/2_x/GL_VERSION_1_2.yml
 - lib/opengl/constants/core/2_x/GL_VERSION_1_3.yml
@@ -136,8 +122,8 @@ files:
 - lib/opengl/constants/core/4_2/GL_ARB_shader_image_load_store.yml
 - lib/opengl/constants/core/4_2/GL_ARB_texture_storage.yml
 - lib/opengl/constants/core/4_2/GL_VERSION_4_2.yml
-- lib/opengl/constants/core/4_3/GL_ARB_ES3_compatibility.yml
 - lib/opengl/constants/core/4_3/GL_ARB_compute_shader.yml
+- lib/opengl/constants/core/4_3/GL_ARB_ES3_compatibility.yml
 - lib/opengl/constants/core/4_3/GL_ARB_explicit_uniform_location.yml
 - lib/opengl/constants/core/4_3/GL_ARB_framebuffer_no_attachments.yml
 - lib/opengl/constants/core/4_3/GL_ARB_internalformat_query2.yml
@@ -152,13 +138,14 @@ files:
 - lib/opengl/constants/ext/GL_EXT_texture_compression_s3tc.yml
 - lib/opengl/constants/ext/GL_EXT_texture_filter_anisotropic.yml
 - lib/opengl/constants/ext/GL_EXT_texture_sRGB.yml
+- lib/opengl/constants.rb
 - lib/opengl/debugging.rb
 - lib/opengl/gl.rb
-- lib/opengl/platform.rb
 - lib/opengl/platform/base.rb
 - lib/opengl/platform/darwin.rb
 - lib/opengl/platform/linux.rb
-- lib/opengl/raw.rb
+- lib/opengl/platform/windows.rb
+- lib/opengl/platform.rb
 - lib/opengl/raw/core/2_x/GL_VERSION_1_0.yml
 - lib/opengl/raw/core/2_x/GL_VERSION_1_1.yml
 - lib/opengl/raw/core/2_x/GL_VERSION_1_2.yml
@@ -204,15 +191,15 @@ files:
 - lib/opengl/raw/core/4_2/GL_ARB_texture_storage.yml
 - 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/raw.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/type.rb
 - lib/opengl/version.rb
-- lib/opengl/wrapper.rb
 - lib/opengl/wrapper/base.rb
 - lib/opengl/wrapper/core/2_x/GL_VERSION_1_0.rb
 - lib/opengl/wrapper/core/2_x/GL_VERSION_1_1.rb
@@ -259,12 +246,8 @@ files:
 - lib/opengl/wrapper/core/4_2/GL_ARB_texture_storage.rb
 - lib/opengl/wrapper/core/4_2/GL_ARB_transform_feedback_instanced.rb
 - lib/opengl/wrapper/core/4_2/GL_VERSION_4_2.rb
-- opengl.gemspec
-- spec/spec_helper.rb
-- test/test_helper.rb
-- yard/database.rb
-- yard/dsl_handler.rb
-- yard/wrapper_handler.rb
+- lib/opengl/wrapper.rb
+- lib/opengl.rb
 homepage: https://github.com/davll/ruby-opengl
 licenses: []
 post_install_message: 
@@ -289,7 +272,5 @@ rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: OpenGL
-test_files:
-- spec/spec_helper.rb
-- test/test_helper.rb
+test_files: []
 has_rdoc: 

data/.gitignore

@@ -1,21 +0,0 @@
-*.gem
-*.rbc
-.bundle
-.config
-.yardoc
-Gemfile.lock
-InstalledFiles
-_yardoc
-coverage
-doc/
-lib/bundler/man
-pkg
-rdoc
-spec/reports
-test/tmp
-test/version_tmp
-tmp
-.DS_Store
-*~
-*.swp
-.rbx

data/.yardopts

@@ -1,6 +0,0 @@
---no-private
---load yard/wrapper_handler.rb
---load yard/dsl_handler.rb
-lib/opengl/**/*.rb
--
-lib/glut.rb

data/Gemfile

@@ -1,8 +0,0 @@
-source 'https://rubygems.org'
-
-# Specify your gem's dependencies in opengl.gemspec
-gemspec
-
-gem 'yard', :platform => 'mri'
-gem 'redcarpet', :platform => 'mri'
-

data/LICENSE.txt

@@ -1,22 +0,0 @@
-Copyright (c) 2012 David Lin
-
-MIT License
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -1,92 +0,0 @@
-# OpenGL (opengl3)
-
-OpenGL wrapper library for Ruby
-
-* Pure Ruby, no C/C++/Java extension included (thanks to ffi gem)
-* OpenGL 2.1 ~ 4.2
-* automatic error checking each function call
-* Ruby-style wrapper (not complete)
-* 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.
-But don't worry, the gem makes use of `ffi` gem to import functions, and 
-therefore you can use ffi objects like `FFI::MemoryPointer` to work 
-with C-style OpenGL entrypoints.
-
-## Ruby-Style OpenGL APIs
-
-Please take a look at `lib/opengl/wrapper/**/*.rb`
-to see if entrypoints are wrapped.
-
-* 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:
-
-```ruby
-glMapBuffer(GL_ARRAY_BUFFER, GL_WRITE_ONLY) do |ptr|
-  ptr.put_array_of_GLfloat(offset_in_bytes, [ 1.0, 2.0, 3.0 ])
-end
-```
-
-And helper functions
-
-* glGetVersion() -> Array<Integer>
-* glGetShadingLanguageVersion() -> Array<Integer>
-* glGetAvailableExtensions() -> Array<String>
-* glIsShaderCompiled?(shader) -> Boolean
-* glIsProgramLinked?(program) -> Boolean
-* More helper functions coming soon
-
-## Installation
-
-Add this line to your application's Gemfile:
-
-    gem 'opengl3', :require => 'opengl'
-
-And then execute:
-
-    $ bundle
-
-Or install it yourself as:
-
-    $ gem install opengl3
-
-## Usage
-
-```ruby
-require 'opengl'
-class App
-  include OpenGL::Constants
-  
-  def initialize
-    # ... (window created)
-    self.extend OpenGL::GL.entrypoints
-    # OK, you can use OpenGL now
-  end
-  
-end
-```
-
-## Contributing
-
-1. Fork it
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request

data/Rakefile

@@ -1,26 +0,0 @@
-require "bundler/gem_tasks"
-require "rake/testtask"
-
-Rake::TestTask.new :spec do |t|
-  t.libs << "spec"
-  t.pattern = "spec/**/*_spec.rb"
-end
-
-Rake::TestTask.new :test do |t|
-  t.libs << "test"
-  t.pattern = "test/**/*_test.rb"
-end
-
-desc "Open an irb session preloaded with this library"
-task :console do
-  sh "irb -rubygems -I lib -r opengl"
-end
-
-begin
-  require "yard"
-rescue LoadError => e
-else
-  YARD::Rake::YardocTask.new
-  desc "Generate documentation"
-  task(:doc => :yard)
-end

data/examples/math3d.rb

@@ -1,65 +0,0 @@
-require 'matrix'
-
-class Matrix
-  
-  def self.perspective(fovy, aspect, z_near, z_far)
-    f, z_diff = Math.tan(Math::PI * 0.5 - fovy * 0.5), (z_near-z_far)
-    return self[
-      [ f/aspect, 0.0, 0.0, 0.0 ],
-      [ 0.0, f, 0.0, 0.0 ],
-      [ 0.0, 0.0, (z_far+z_near)/z_diff, (2.0*z_far*z_near)/z_diff ],
-      [ 0.0, 0.0, -1.0, 0.0 ]
-    ]
-  end
-  
-  def self.translate(x, y, z)
-    x, y, z = Float(x), Float(y), Float(z)
-    return self[
-      [ 1.0, 0.0, 0.0,   x ],
-      [ 0.0, 1.0, 0.0,   y ],
-      [ 0.0, 0.0, 1.0,   z ],
-      [ 0.0, 0.0, 0.0, 1.0 ]
-    ]
-  end
-  
-  def self.scale(x, y, z)
-    x, y, z = Float(x), Float(y), Float(z)
-    return self[
-      [   x, 0.0, 0.0, 0.0 ],
-      [ 0.0,   y, 0.0, 0.0 ],
-      [ 0.0, 0.0,   z, 0.0 ],
-      [ 0.0, 0.0, 0.0, 1.0 ]
-    ]
-  end
-  
-  def self.rotate_x(angle)
-    c, s = Math.cos(angle), Math.sin(angle)
-    return self[
-      [ 1.0, 0.0, 0.0, 0.0 ],
-      [ 0.0,   c,  -s, 0.0 ],
-      [ 0.0,   s,   c, 0.0 ],
-      [ 0.0, 0.0, 0.0, 1.0 ]
-    ]
-  end
-  
-  def self.rotate_y(angle)
-    c, s = Math.cos(angle), Math.sin(angle)
-    return self[
-      [   c, 0.0,   s, 0.0 ],
-      [ 0.0, 1.0, 0.0, 0.0 ],
-      [  -s, 0.0,   c, 0.0 ],
-      [ 0.0, 0.0, 0.0, 1.0 ]
-    ]
-  end
-  
-  def self.rotate_z(angle)
-    c, s = Math.cos(angle), Math.sin(angle)
-    return self[
-      [   c,  -s, 0.0, 0.0 ],
-      [   s,   c, 0.0, 0.0 ],
-      [ 0.0, 0.0, 1.0, 0.0 ],
-      [ 0.0, 0.0, 0.0, 1.0 ]
-    ]
-  end
-  
-end