opengl 0.8.0 → 0.9.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 329665f46d7e55e5354ff1b075b10c8292f302ec
+  data.tar.gz: eeb1fe5682a756b522ca487bae7941cd6d2acc52
+SHA512:
+  metadata.gz: 0238a43799ca1143991351cb82574bc6c6ff07082f62e7ee9b858c31990dddfb02e3e400e72977cae0ff5d59157f82d5a6a7eb78ac692c33b1ebd0129af1b542
+  data.tar.gz: 81626e5bb01a7771b7282a63298767e6f9e3b2e084db6fecb38d93f4e8b5f352ee4fa1c53552b59bbe643e4d255afb7b411eea2726999bc76c4eecd0e153fc69

checksums.yaml.gz.sig

@@ -0,0 +1 @@
+�(��a���B�A/���.~����Z�����9��Tqv(|l�/HY�O�4Ҧ��Ax�:XԄ���DK)��hJ��eA�|	�)u�k�z���)�Y16���4p���	14�|��C�	GMq���-kyn����iYz{XbF�?���I�Ա$J�)uK�~�2����m�j�7�<�n(�V����rp��WM��*}V�P�UMVIn��`j놬����fa��Q(��tq��L��R��

data/.gitignore

@@ -1,5 +1,6 @@
 *.swp
 /TAGS
-/lib/opengl/opengl.bundle
+/lib/opengl/*.so
+/lib/opengl/*.bundle
 /pkg
 /tmp

data/.travis.yml

@@ -0,0 +1,19 @@
+language: ruby
+rvm:
+#   - "1.9.3"
+  - "2.1"
+  - "rbx"
+#   - jruby-19mode # JRuby in 1.9 mode
+#   - rbx-19mode
+matrix:
+  allow_failures:
+    - rvm: rbx
+before_install:
+  - sudo apt-get install xpra xserver-xorg-video-dummy freeglut3-dev;
+  - gem install hoe rake-compiler glut glu;
+before_script:
+  - "xpra --xvfb=\"Xorg +extension GLX -config `pwd`/test/dummy.xorg.conf -logfile ${HOME}/.xpra/xorg.log\"  start :9"
+script: "env DISPLAY=:9 rake test"
+after_script:
+  - "xpra stop :9"
+  - "cat ~/.xpra/*"

data/History.rdoc

@@ -1,3 +1,29 @@
+=== 0.9.0 / 2014-03-14
+
+* Split glu and glut into seperate gems.
+* Add OpenGL 3.0 support.
+* Add x64-mingw platform for cross build and add ruby-2.0.0 to binary gems.
+* Don't pollute the global namespace. Use GL namespace.
+
+* Replace UINT2FIX with UINT2NUM since UINT2FIX is not defined in MRI ruby.
+* Don't return the terminating null from C in GetProgramInfoLog.
+* Remove the outdated website, use gh-pages now.
+* Fixes in tests, resolved some upstream mesa bugs.
+* glMaterial: Before converting using to_a, check if conversion is possible.
+* Fix incorrect conversion of bool arguments to functions, they were getting
+  converted from C instead of to C (`GL_TRUE/true` got converted to `41`).
+* Fix: some parts of GL_EXT_gpu_shader4 were checking for GL_ARB_vertex_shader
+support instead of GL_EXT_gpu_shader4.
+* Fix ProgramVertexLimitNV checked for GL_NV_gpu_program4 support instead of
+GL_EXT_geometry_shader4.
+* Fix build with Ruby-2.0 on OS X Mavericks.
+
+* Dropped support for 1.2 optional ARB_imaging subset. It is deprecated and
+support for it was dropped from all major drivers. Continuing support for it
+would lead to developers using deprecated coding practices.
+
+* Fix several test cases.
+
 === 0.8.0 / 2013-02-03
 
 * Drop support for Ruby 1.8.

data/Manifest.txt

@@ -1,21 +1,12 @@
 .autotest
 .gemtest
 .gitignore
+.travis.yml
 History.rdoc
 MIT-LICENSE
 Manifest.txt
 README.rdoc
 Rakefile
-Rakefile.cross
-docs/build_install.txt
-docs/extensions.txt.in
-docs/history.txt
-docs/requirements_and_design.txt
-docs/roadmap.txt
-docs/scientific_use.txt
-docs/supplies/page_template.html
-docs/thanks.txt
-docs/tutorial.txt
 examples/NeHe/NeHe.png
 examples/NeHe/crate.png
 examples/NeHe/glass.png
@@ -109,6 +100,7 @@ ext/opengl/gl-1.4.c
 ext/opengl/gl-1.5.c
 ext/opengl/gl-2.0.c
 ext/opengl/gl-2.1.c
+ext/opengl/gl-3.0.c
 ext/opengl/gl-enums.c
 ext/opengl/gl-enums.h
 ext/opengl/gl-error.c
@@ -122,17 +114,11 @@ ext/opengl/gl-ext-nv.c
 ext/opengl/gl-types.h
 ext/opengl/gl.c
 ext/opengl/gl_buffer.c
-ext/opengl/glu-enums.c
-ext/opengl/glu-enums.h
-ext/opengl/glu.c
-ext/opengl/glut.c
-ext/opengl/glut_callbacks.c
 ext/opengl/opengl.c
 lib/gl.rb
-lib/glu.rb
-lib/glut.rb
 lib/opengl.rb
 lib/opengl/test_case.rb
+test/dummy.xorg.conf
 test/test_gl.rb
 test/test_gl_10_11.rb
 test/test_gl_12.rb
@@ -146,13 +132,7 @@ test/test_gl_ext_ati.rb
 test/test_gl_ext_ext.rb
 test/test_gl_ext_gremedy.rb
 test/test_gl_ext_nv.rb
-test/test_glu.rb
 test/test_opengl_buffer.rb
 utils/README
 utils/enumgen.rb
 utils/extlistgen.rb
-utils/mkdn2html.rb
-utils/post-mkdn2html.rb
-website/images/ogl.jpg
-website/images/tab_bottom.gif
-website/style.css

data/README.rdoc

@@ -1,18 +1,24 @@
 = opengl
 
-source :: https://github.com/drbrain/opengl
-docs   :: http://ruby-opengl.rubyforge.org
-bugs   :: https://github.com/drbrain/opengl/issues
+source :: https://github.com/larskanis/opengl
+docs   :: http://larskanis.github.com/opengl
+bugs   :: https://github.com/larskanis/opengl/issues
 email  :: mailto:ruby-opengl-devel@rubyforge.org
 
+{<img src="https://travis-ci.org/larskanis/opengl.png?branch=master" alt="Build Status" />}[https://travis-ci.org/larskanis/opengl]
+
 == Description
 
-An OpenGL wrapper for Ruby.  ruby-opengl contains bindings for OpenGL and the
-GLU and GLUT libraries.
+An OpenGL wrapper for Ruby. opengl contains bindings for OpenGL.
+
+Be sure to check out
+{GLU}[https://github.com/larskanis/glu] and
+{GLUT}[https://github.com/larskanis/glut]
+gems.
 
 == Features and Problems
 
-* available for Windows, Linux, OS-X
+* available for Windows, Linux and OS X
 
 == Synopsis
 
@@ -22,8 +28,26 @@ GLU and GLUT libraries.
 == Requirements
 
 * Ruby 1.9.2+
-  *  see https://github.com/larskanis/opengl/tree/0.7 for Ruby 1.8.x compatible branch
-* proper OpenGL, GLU and (free-)GLUT development files installed
+  *  see {0.7}[https://github.com/larskanis/opengl/tree/0.7] for Ruby 1.8.x compatible branch
+* OpenGL development files installed
+
+== Tests
+
+Note that the tests have the adverse effect of testing the underlying OpenGL
+implementation, so depending on your GL provider, drivers or OS, the tests may
+fail, crash, or not run at all, without affecting your ability to use the bindings.
+
+Tests require both glut and glu gem.
+
+With our test suite, we were able to uncover and help fix upstream mesa bugs:
+
+* {#61026}[https://bugs.freedesktop.org/show_bug.cgi?id=61026] glBitmap segfault
+* {#61003}[https://bugs.freedesktop.org/show_bug.cgi?id=61003] gluSurface with Nurbs spits out debug code
+* {#61395}[https://bugs.freedesktop.org/show_bug.cgi?id=61395] glEdgeFlag can't be set to false
+
+Whenever a test or example fails, it should be quickly ported into a simple C
+test program, so we can determine whether it's a bug in the bindings or the
+OpenGL implementation.
 
 == Install
 
@@ -40,40 +64,22 @@ and generate the RDoc.
 
 == Cross compiling for Windows
 
-Using rake-compiler a cross compiled opengl gem can be build on a Linux or MacOS X
-host for the win32 platform. The generated gem is statically linked against
-libfreeglut. Freeglut is downloaded and compiled from the sources.
-There are no runtime dependencies to any but the standard Windows
-DLLs.
-
-Install mingw32 or w64 using the instructions in rake-compiler's README.
-For Debian/Ubuntu it is <tt>apt-get install gcc-mingw-w64</tt> .
-
-Download and cross compile ruby 1.9 for win32 with:
-
-  rake-compiler cross-ruby VERSION=1.9.3-p0
-
-Download and cross compile opengl for win32:
-
-  rake cross native gem
-
-or with custom versions:
-
-  rake cross native gem RUBY_CC_VERSION=1.9.3 LIBFREEGLUT_VERSION=2.8.0
-
-If everything works, there should be ruby-opengl-VERSION-x86-mingw32.gem in the pkg
-directory.
-
+Using rake-compiler a cross compiled opengl gem can be build in a
+{rake-compiler-dev-box}[https://github.com/tjschuck/rake-compiler-dev-box]
+the win32 platform. There are no runtime dependencies to any but the
+standard Windows DLLs. Use the standard package_win32_fat_binary
+script.
 
 == License
 
 (The MIT License)
 
-Copyright (c) Eric Hodel  (current maintainer)
-Copyright (c) Alain Hoang (previous maintainer)
-Copyright (c) Jan Dvorak  (contributor)
-Copyright (c) Minh Thu Vo (contributor)
-Copyright (c) James Adam  (contributor)
+Copyright (c) Blaž Hrastnik (current maintainer)
+Copyright (c) Eric Hodel    (current maintainer)
+Copyright (c) Alain Hoang   (previous maintainer)
+Copyright (c) Jan Dvorak    (contributor)
+Copyright (c) Minh Thu Vo   (contributor)
+Copyright (c) James Adam    (contributor)
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -1,3 +1,4 @@
+# -*- coding: UTF-8 -*-
 #-*-ruby-*-
 #
 # Copyright (C) 2006 John M. Gabriele <jmg3000@gmail.com>
@@ -14,14 +15,13 @@
 # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-require 'rubygems'
-
 require 'hoe'
 require 'rake/extensiontask'
-load 'Rakefile.cross'
 
 hoe = Hoe.spec 'opengl' do
   developer 'Eric Hodel', 'drbrain@segment7.net'
+  developer 'Lars Kanis',  'lars@greiz-reinsdorf.de'
+  developer 'Blaž Hrastnik', 'speed.the.bboy@gmail.com'
   developer 'Alain Hoang', ''
   developer 'Jan Dvorak',  ''
   developer 'Minh Thu Vo', ''
@@ -32,6 +32,8 @@ hoe = Hoe.spec 'opengl' do
   self.extra_rdoc_files = FileList['*.rdoc']
 
   extra_dev_deps << ['rake-compiler', '~> 0.7', '>= 0.7.9']
+  extra_dev_deps << ['glu', '~> 8.1']
+  extra_dev_deps << ['glut', '~> 8.1']
 
   self.spec_extras = {
     :extensions            => %w[ext/opengl/extconf.rb],
@@ -43,74 +45,16 @@ Rake::ExtensionTask.new 'opengl', hoe.spec do |ext|
   ext.lib_dir = 'lib/opengl'
 
   ext.cross_compile = true
-  ext.cross_platform = ['i386-mingw32']
-  ext.cross_config_options += [
-    "--with-installed-dir=#{STATIC_INSTALLDIR}",
-  ]
+  ext.cross_platform = ['i386-mingw32', 'x64-mingw32']
 end
 
 task :test => :compile
 
-# Generate html docs from the markdown source and upload to the site.
-# All doc files that are destined for the website have filenames that
-# end in .txt.
-
-WEBSITE_MKDN = FileList['./docs/*.txt'] << 'README.txt'
-NICE_HTML_DOCS = WEBSITE_MKDN.ext('html')
-
 # defines columns in the HTML extension list
 GLEXT_VERSIONS = %w[svn 0.60 0.50]
 
-desc 'Show contents of some variables related to website doc generation.'
-task :explain_website do
-  puts "WEBSITE_MKDN:"
-  WEBSITE_MKDN.each do |doc|
-    puts "\t#{doc}"
-  end
-
-  puts "NICE_HTML_DOCS:"
-  NICE_HTML_DOCS.each do |doc|
-    puts "\t#{doc}"
-  end
-end
-
 desc 'Generate supported extension list.'
 task :gen_glext_list do
 	sh "./utils/extlistgen.rb", "doc/extensions.txt.in", "doc/extensions.txt", *GLEXT_VERSIONS
 end
 
-desc 'Generate website html.'
-task :gen_website => [:gen_glext_list] + NICE_HTML_DOCS do
-  # Now that the website docs have been generated, copy them to ./website.
-  cp "README.html", "website/index.html"
-  cp "doc/*.html", "ebsite"
-end
-
-# You'll see some intermediate .plain files get generated. These are html,
-# but don't yet have their code snippets syntax highlighted.
-rule '.html' => '.plain' do |t|
-  puts "Turning #{t.source} into #{t.name} ..."
-  sh "./utils/post-mkdn2html.rb", t.source, t.name
-end
-
-# Process the markdown docs into plain html.
-rule '.plain' => '.txt' do |t|
-  puts "Turning #{t.source} into #{t.name} ..."
-  sh "./utils/mkdn2html.rb", t.source, t.name
-end
-
-RUBYFORGE = "rubyforge.org:/var/www/gforge-projects/ruby-opengl"
-
-desc 'Upload the newly-built site to RubyForge.'
-task :upload_website => [:gen_website] do
-  sh "scp", "website/*.html", RUBYFORGE
-  sh "scp", "website/images/*", "#{RUBYFORGE}/images/"
-end
-
-desc 'Upload entire site, including stylesheet and the images directory.'
-task :upload_entire_website => [:gen_website] do
-  sh "scp", "website/*.html", RUBYFORGE
-  sh "scp", "website/*.css", RUBYFORGE
-  sh "scp", "-r", "website", "images", RUBYFORGE
-end
-

data/examples/NeHe/nehe_lesson02.rb

@@ -1,10 +1,12 @@
-#!/usr/bin/env ruby -rubygems
+#!/usr/bin/env ruby
 # Name:  nehe_lesson02.rb
 # Purpose: An implementation of NeHe's OpenGL Lesson #02
 #          using ruby-opengl (http://nehe.gamedev.net/)
 #
 
 require 'opengl'
+require 'glu'
+require 'glut'
 require 'mathn'
 
 # Add GL and GLUT namespaces in to make porting easier
@@ -113,4 +115,3 @@ glutReshapeFunc :reshape
 glutKeyboardFunc keyboard
 init_gl_window 640, 480
 glutMainLoop
-

data/examples/NeHe/nehe_lesson03.rb

@@ -1,10 +1,12 @@
-#!/usr/bin/env ruby -rubygems
+#!/usr/bin/env ruby
 # Name:  nehe_lesson03.rb
 # Purpose: An implementation of NeHe's OpenGL Lesson #03
 #          using ruby-opengl (http://nehe.gamedev.net/)
 #
 
 require 'opengl'
+require 'glu'
+require 'glut'
 require 'mathn'
 
 # Add GL and GLUT namespaces in to make porting easier
@@ -119,4 +121,3 @@ glutReshapeFunc :reshape
 glutKeyboardFunc keyboard
 init_gl_window 640, 480
 glutMainLoop
-

data/examples/NeHe/nehe_lesson04.rb

@@ -1,9 +1,11 @@
-#!/usr/bin/env ruby -rubygems
+#!/usr/bin/env ruby
 # Name:  nehe_lesson04.rb
 # Purpose: An implementation of NeHe's OpenGL Lesson #04
 #          using ruby-opengl  http://nehe.gamedev.net/
 
 require 'opengl'
+require 'glu'
+require 'glut'
 
 # Add GL and GLUT namespaces in to make porting easier
 include Gl

data/examples/NeHe/nehe_lesson05.rb

@@ -1,4 +1,8 @@
+#!/usr/bin/env ruby
+
 require 'opengl'
+require 'glu'
+require 'glut'
 
 class Lesson05
   include Gl
@@ -176,4 +180,3 @@ class Lesson05
 end
 
 Lesson05.new if $0 == __FILE__
-

data/examples/NeHe/nehe_lesson06.rb

@@ -1,6 +1,9 @@
+#!/usr/bin/env ruby
+
 require 'opengl'
-require 'png'
-require 'png/reader'
+require 'glu'
+require 'glut'
+require 'chunky_png'
 
 class Lesson06
   include Gl
@@ -150,7 +153,7 @@ class Lesson06
     when ?\e
       glutDestroyWindow @window
       exit 0
-    when 'F' then 
+    when 'F' then
       @fullscreen = !@fullscreen
 
       if @fullscreen then
@@ -164,11 +167,12 @@ class Lesson06
   end
 
   def load_texture
-    png = PNG.load_file File.expand_path('../NeHe.png', __FILE__)
+    png = ChunkyPNG::Image.from_file(File.expand_path('../NeHe.png', __FILE__))
+
     height = png.height
     width = png.width
 
-    image = png.data.flatten.map { |c| c.values }.join
+    image = png.to_rgba_stream.each_byte.to_a
 
     @textures = glGenTextures 1
     glBindTexture GL_TEXTURE_2D, @textures[0]
@@ -180,4 +184,3 @@ class Lesson06
 end
 
 Lesson06.new
-