opengl 0.7.0.pre1 → 0.7.0.pre2

data/.autotest

@@ -0,0 +1,29 @@
+require 'autotest/restart'
+
+Autotest.add_hook :initialize do |at|
+  at.add_exception /\.git/
+  at.add_exception /doc/
+  at.add_exception /examples/
+  at.add_exception /utils/
+  at.add_exception /website/
+
+  at.add_mapping(/^lib\/.*(\.bundle|so|dll)$/) do |filename, match|
+    possible = File.basename(filename, match[1])
+    at.files_matching %r%^test/test_#{possible}%
+  end
+
+  def at.path_to_classname s
+    sep = File::SEPARATOR
+    n = s.sub(/^test#{sep}test_(.*)\.rb/, '\1')
+    c = if n =~ /^(glu?)_?(.*)/ then
+          "#{$1.capitalize}#{$2.split(/_|(\d+)/).map { |seg| seg.capitalize }.join}"
+        end
+
+    "Test#{c}"
+  end
+end
+
+Autotest.add_hook :run_command do |at|
+  at.unit_diff = 'cat'
+  system Gem.ruby, Gem.bin_path('rake', 'rake'), 'compile'
+end

data/.gitignore

@@ -1,8 +1,5 @@
-*.o
-*.log
-*.bundle
-*.so
-pkg/
-
-# generate Rakefiles
-ext/*/Rakefile
+*.swp
+/TAGS
+/lib/opengl/opengl.bundle
+/pkg
+/tmp

data/History.rdoc

@@ -0,0 +1,33 @@
+=== 0.8 / master HEAD
+
+* drop support for Ruby 1.8
+
+=== 0.60.1 / 2009-02-16
+
+* Bugfixes
+* Proper support for ruby 1.9/1.9.1+
+* Updated OpenGL enumerators in preparation for OpenGL 3.0
+
+=== 0.60.0 / 2008-01-06
+
+* Automatic error checking for GL/GLU calls, enabled by default (see
+  doc/tutorial)
+* Added support for many more OpenGL extensions
+* Support for Ruby 1.9.0+ (requires mkrf 0.2.3)
+* Ton of bugfixes.
+
+* API Changes:
+	* Boolean functions/parameters was changed to ruby true/false instead of
+	  GL_TRUE / GL_FALSE, which remains for compatibility
+	* glGet\* functions now returns +x+ instead of <code>[x]</code> when
+	  returning only one value
+	* Functions operating on packed strings (glTexture, glPointer etc.) now
+	  also accepts ruby arrays directly
+	* Matrix handling functions now also accepts instances of Matrix class, or
+	  any class that can be converted to array
+	* glUniform*v and glUniformmatrix*v now does not require 'count'
+	  parameter, they will calculate it from length of passed array
+	* glCallLists needs type specifier (previously was forced to GL_BYTE)
+	* On ruby 1.9, glut keyboard callback returns char ("x") instead of integer
+	  so using 'if key == ?x' works on both 1.8 and 1.9
+

data/Manifest.txt

@@ -1,25 +1,40 @@
+.autotest
 .gemtest
 .gitignore
-History.txt
+History.rdoc
 MIT-LICENSE
 Manifest.txt
 README.rdoc
 Rakefile
 Rakefile.cross
-doc/build_install.txt
-doc/extensions.txt.in
-doc/history.txt
-doc/requirements_and_design.txt
-doc/roadmap.txt
-doc/scientific_use.txt
-doc/supplies/page_template.html
-doc/thanks.txt
-doc/tutorial.txt
+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
 examples/NeHe/nehe_lesson02.rb
 examples/NeHe/nehe_lesson03.rb
 examples/NeHe/nehe_lesson04.rb
 examples/NeHe/nehe_lesson05.rb
+examples/NeHe/nehe_lesson06.rb
+examples/NeHe/nehe_lesson07.rb
+examples/NeHe/nehe_lesson08.rb
+examples/NeHe/nehe_lesson09.rb
+examples/NeHe/nehe_lesson11.rb
+examples/NeHe/nehe_lesson12.rb
+examples/NeHe/nehe_lesson16.rb
+examples/NeHe/nehe_lesson19.rb
 examples/NeHe/nehe_lesson36.rb
+examples/NeHe/particle.png
+examples/NeHe/star.png
+examples/NeHe/tim.png
 examples/OrangeBook/3Dlabs-License.txt
 examples/OrangeBook/brick.frag
 examples/OrangeBook/brick.rb
@@ -50,6 +65,7 @@ examples/RedBook/font.rb
 examples/RedBook/hello.rb
 examples/RedBook/image.rb
 examples/RedBook/jitter.rb
+examples/RedBook/light.rb
 examples/RedBook/lines.rb
 examples/RedBook/list.rb
 examples/RedBook/material.rb
@@ -82,54 +98,53 @@ examples/misc/plane.rb
 examples/misc/readpixel.rb
 examples/misc/sdltest.rb
 examples/misc/trislam.rb
-ext/common/common.h
-ext/common/conv.h
-ext/common/funcdef.h
-ext/common/gl-enums.h
-ext/common/gl-error.h
-ext/common/gl-types.h
-ext/common/glu-enums.h
-ext/gl/extconf.rb
-ext/gl/gl-1.0-1.1.c
-ext/gl/gl-1.2.c
-ext/gl/gl-1.3.c
-ext/gl/gl-1.4.c
-ext/gl/gl-1.5.c
-ext/gl/gl-2.0.c
-ext/gl/gl-2.1.c
-ext/gl/gl-enums.c
-ext/gl/gl-error.c
-ext/gl/gl-ext-3dfx.c
-ext/gl/gl-ext-arb.c
-ext/gl/gl-ext-ati.c
-ext/gl/gl-ext-ext.c
-ext/gl/gl-ext-gremedy.c
-ext/gl/gl-ext-nv.c
-ext/gl/gl.c
-ext/glu/extconf.rb
-ext/glu/glu-enums.c
-ext/glu/glu.c
-ext/glut/extconf.rb
-ext/glut/glut.c
+ext/opengl/common.h
+ext/opengl/conv.h
+ext/opengl/extconf.rb
+ext/opengl/funcdef.h
+ext/opengl/gl-1.0-1.1.c
+ext/opengl/gl-1.2.c
+ext/opengl/gl-1.3.c
+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-enums.c
+ext/opengl/gl-enums.h
+ext/opengl/gl-error.c
+ext/opengl/gl-error.h
+ext/opengl/gl-ext-3dfx.c
+ext/opengl/gl-ext-arb.c
+ext/opengl/gl-ext-ati.c
+ext/opengl/gl-ext-ext.c
+ext/opengl/gl-ext-gremedy.c
+ext/opengl/gl-ext-nv.c
+ext/opengl/gl-types.h
+ext/opengl/gl.c
+ext/opengl/glu-enums.c
+ext/opengl/glu-enums.h
+ext/opengl/glu.c
+ext/opengl/glut.c
+ext/opengl/opengl.c
+lib/gl.rb
+lib/glu.rb
+lib/glut.rb
 lib/opengl.rb
-test/README
-test/tc_common.rb
-test/tc_ext_arb.rb
-test/tc_ext_ati.rb
-test/tc_ext_ext.rb
-test/tc_ext_gremedy.rb
-test/tc_ext_nv.rb
-test/tc_func_10_11.rb
-test/tc_func_12.rb
-test/tc_func_13.rb
-test/tc_func_14.rb
-test/tc_func_15.rb
-test/tc_func_20.rb
-test/tc_func_21.rb
-test/tc_glu.rb
-test/tc_include_gl.rb
-test/tc_misc.rb
-test/tc_require_gl.rb
+lib/opengl/test_case.rb
+test/test_gl.rb
+test/test_gl_10_11.rb
+test/test_gl_12.rb
+test/test_gl_13.rb
+test/test_gl_14.rb
+test/test_gl_15.rb
+test/test_gl_20.rb
+test/test_gl_21.rb
+test/test_gl_ext_arb.rb
+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
 utils/README
 utils/enumgen.rb
 utils/extlistgen.rb

data/README.rdoc

@@ -1,51 +1,98 @@
-= Ruby-OpenGL
+= opengl
 
-* http://github.com/larskanis
+source :: https://github.com/larskanis/opengl/tree/0.7
+docs   :: http://ruby-opengl.rubyforge.org
+bugs   :: https://github.com/drbrain/opengl/issues
+email  :: mailto:ruby-opengl-devel@rubyforge.org
 
-== DESCRIPTION:
+== Description
 
-Ruby-OpenGL consists of Ruby extension modules that are bindings for
-the OpenGL, GLU, and GLUT libraries.
+An OpenGL wrapper for Ruby.  ruby-opengl contains bindings for OpenGL and the
+GLU and GLUT libraries.
 
+* This branch is for compatibility with Ruby 1.8. Latest development is for
+  Ruby 1.9.2+ only, on master branch: https://github.com/larskanis/opengl
 
-== FEATURES/PROBLEMS:
+== Features and Problems
 
 * available for Windows, Linux, OS-X
-* supports Ruby MRI 1.8/1.9 and Rubinius
 
-== SYNOPSIS:
+== Synopsis
 
   require 'opengl'
+  FIX (code sample of usage)
 
+== Requirements
 
-== REQUIREMENTS:
-
+* Ruby 1.8.7+
 * proper OpenGL, GLU and (free-)GLUT development files installed
 
-== INSTALL:
+== Install
+
+  gem install opengl -v "~>0.7.0" --pre
+
+== Developers
+
+After checking out the source, run:
+
+  $ rake newb
+
+This task will install any missing dependencies, run the tests/specs,
+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:
 
-* gem install opengl
+  rake cross native gem
 
-== LICENSE:
+or with custom versions:
 
-The MIT License
+  rake cross native gem RUBY_CC_VERSION=1.9.3 LIBFREEGLUT_VERSION=2.8.0
 
-ruby-opengl
-===========
+If everything works, there should be ruby-opengl-VERSION-x86-mingw32.gem in the pkg
+directory.
 
-[ruby-opengl][] consists of Ruby extension modules that are bindings for
-the [OpenGL][], GLU, and [GLUT][] libraries. It is intended to be a
-replacement for -- and uses the code from -- [Yoshi's ruby-opengl][].
 
-It's licensed under the MIT license. Please see the included MIT-LICENSE
-file for the terms of the license.
+== License
 
+(The MIT License)
 
-[ruby-opengl]: http://rubyforge.org/projects/ruby-opengl/
-[OpenGL]: http://www.opengl.org/
-[GLUT]: http://www.opengl.org/documentation/specs/glut/spec3/spec3.html
+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
+'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:
 
-[Yoshi's ruby-opengl]: http://www2.giganet.net/~yoshi/
+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/Rakefile

@@ -1,6 +1,7 @@
 #-*-ruby-*-
 #
 # Copyright (C) 2006 John M. Gabriele <jmg3000@gmail.com>
+# Copyright (C) Eric Hodel <drbrain@segment7.net>
 #
 # This program is distributed under the terms of the MIT license.
 # See the included MIT-LICENSE file for the terms of this license.
@@ -15,115 +16,102 @@
 
 require 'rubygems'
 
-require 'rake'
-require 'rake/extensiontask'
-require 'rake/clean'
-require 'rubygems/package_task'
-require 'rake/testtask'
 require 'hoe'
+require 'rake/extensiontask'
 load 'Rakefile.cross'
 
+hoe = Hoe.spec 'opengl' do
+  developer 'Eric Hodel', 'drbrain@segment7.net'
+  developer 'Alain Hoang', ''
+  developer 'Jan Dvorak',  ''
+  developer 'Minh Thu Vo', ''
+  developer 'James Adam',  ''
+
+  self.readme_file = 'README.rdoc'
+  self.history_file = 'History.rdoc'
+  self.extra_rdoc_files = FileList['*.rdoc']
+
+  extra_dev_deps << ['rake-compiler', '~> 0.7', '>= 0.7.9']
+  extra_dev_deps << ['minitest', '~> 3.0']
+
+  self.spec_extras = {
+    :extensions            => %w[ext/opengl/extconf.rb],
+    :required_ruby_version => '>= 1.8.7',
+  }
+end
+
+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}",
+  ]
+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['./doc/*.txt'] << 'README.txt'
+WEBSITE_MKDN = FileList['./docs/*.txt'] << 'README.txt'
 NICE_HTML_DOCS = WEBSITE_MKDN.ext('html')
 
 # defines columns in the HTML extension list
-GLEXT_VERSIONS = ["svn","0.60","0.50"]
-
-CLEAN.include("ext/gl*/Rakefile", "ext/*/mkrf.log", "ext/*/*.so",
-              "ext/**/*.bundle", "lib/*.so", "lib/*.bundle", "ext/*/*.o{,bj}",
-              "ext/*/*.lib", "ext/*/*.exp", "ext/*/*.pdb",
-              "pkg")
-CLOBBER.include("*.plain", "doc/*.plain", "doc/*.snip", "*.html",
-                "doc/*.html", "website/*.html", "website/images/*")
-# Make sure these files aren't deleted in a clobber op
-CLOBBER.exclude("website/images/tab_bottom.gif")
-CLOBBER.exclude("website/images/*.jpg")
+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
+  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.join(" ")
+	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.
-    puts
-    sh "cp README.html website/index.html"
-    sh "cp doc/*.html website"
+  # 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}"
+  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
-    puts "Turning #{t.source} into #{t.name} ..."
-    sh "./utils/mkdn2html.rb #{t.source} #{t.name}"
+  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 hoanga@rubyforge.org:/var/www/gforge-projects/ruby-opengl"
-    sh "scp website/images/* hoanga@rubyforge.org:/var/www/gforge-projects/ruby-opengl/images/"
+  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 hoanga@rubyforge.org:/var/www/gforge-projects/ruby-opengl"
-    sh "scp website/*.css hoanga@rubyforge.org:/var/www/gforge-projects/ruby-opengl"
-    sh "scp -r website/images hoanga@rubyforge.org:/var/www/gforge-projects/ruby-opengl"
-end
-
-
-
-
-############# gems #############
-
-
-hoe = Hoe.spec "opengl" do
-  self.author = [ "Alain Hoang", "Jan Dvorak", "Minh Thu Vo", "James Adam" ]
-  self.email = "ruby-opengl-devel@rubyforge.org"
-  self.url = "http://ruby-opengl.rubyforge.org"
-  self.rubyforge_name = 'ruby-opengl'
-  self.version = IO.read("ext/gl/gl.c")[/VERSION += +([\"\'])([\d][\w\.]+)\1/] && $2
-  self.local_rdoc_dir = 'rdoc'
-  self.readme_file = 'README.rdoc'
-  self.extra_rdoc_files << self.readme_file
-
-  spec_extras[:extensions] = ['ext/gl/extconf.rb', 'ext/glu/extconf.rb', 'ext/glut/extconf.rb']
-  extra_dev_deps << ['rake-compiler', '>= 0.8']
-end
-
-
-ext_block = proc do |ext|
-  ext.cross_compile = true
-  ext.cross_platform = ['i386-mingw32']
-  ext.cross_config_options += [
-    "--with-installed-dir=#{STATIC_INSTALLDIR}",
-  ]
+  sh "scp", "website/*.html", RUBYFORGE
+  sh "scp", "website/*.css", RUBYFORGE
+  sh "scp", "-r", "website", "images", RUBYFORGE
 end
 
-Rake::ExtensionTask.new 'gl', hoe.spec, &ext_block
-Rake::ExtensionTask.new 'glu', hoe.spec, &ext_block
-Rake::ExtensionTask.new 'glut', hoe.spec, &ext_block