opengl 0.7.0.pre2 → 0.7.0

data/History.rdoc

@@ -1,6 +1,18 @@
-=== 0.8 / master HEAD
+=== 0.7.0 / 2013-02-03
 
-* drop support for Ruby 1.8
+* Better support of 64 bit systems.
+* Replace mkrf with extconf.rb, hoe and rake-compiler.
+* Switch to dlopen() from deprecated NSAddImage() and friends for OS X.
+* glBegin, glPushMatrix, glEnable and glEnableClientState now accept a block.
+* glEnable/glDisable and glEnableClientState/glDisableClientState now accept
+  multiple arguments.
+* Allow to_a-able objects for glColor*v, glRasterPos*v, glRect*v, glTexCoord*v,
+  glMaterial, glNormal and glVertex.
+* Fix unused param count in ARY2CMAT.
+* Fix a lot of bugs in the test suite.
+* Merge opengl C extensions into a single extension to avoid code duplication
+  in extconf.rb and simplify rebuilding based on header changes.
+* Add cross compilation tasks with download of freeglut for binary windows gems
 
 === 0.60.1 / 2009-02-16
 

data/README.rdoc

@@ -29,7 +29,7 @@ GLU and GLUT libraries.
 
 == Install
 
-  gem install opengl -v "~>0.7.0" --pre
+  gem install opengl -v "~>0.7.0"
 
 == Developers
 
@@ -50,9 +50,11 @@ 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> .
+Use ruby-1.8.7 for the following commands.
 
-Download and cross compile ruby 1.9 for win32 with:
+Download and cross compile ruby 1.8 and 1.9 for win32 with:
 
+  rake-compiler cross-ruby VERSION=1.8.7-p357
   rake-compiler cross-ruby VERSION=1.9.3-p0
 
 Download and cross compile opengl for win32:
@@ -61,7 +63,7 @@ Download and cross compile opengl for win32:
 
 or with custom versions:
 
-  rake cross native gem RUBY_CC_VERSION=1.9.3 LIBFREEGLUT_VERSION=2.8.0
+  rake cross native gem RUBY_CC_VERSION=1.8.7:1.9.3 LIBFREEGLUT_VERSION=2.8.0
 
 If everything works, there should be ruby-opengl-VERSION-x86-mingw32.gem in the pkg
 directory.

data/Rakefile.cross

@@ -9,7 +9,7 @@ require 'uri'
 require 'rbconfig'
 require 'pathname'
 
-ENV['RUBY_CC_VERSION'] ||= '1.9.3'
+ENV['RUBY_CC_VERSION'] ||= '1.8.7:1.9.3'
 
 # Cross-compilation constants
 COMPILE_HOME               = Pathname( "build" ).expand_path

data/ext/opengl/gl-1.0-1.1.c

@@ -2609,7 +2609,7 @@ gl_Material(VALUE self, VALUE face, VALUE pname, VALUE param)
 {
   VALUE ary;
 
-	if (RB_TYPE_P(param, T_ARRAY)) {
+	if (TYPE(param) == T_ARRAY) {
 		gl_Materialfv(self, face, pname, param);
   } else if (ary = rb_convert_type(param, T_ARRAY, "Array", "to_a")) {
 		gl_Materialfv(self, face, pname, ary);

data/ext/opengl/glut.c

@@ -100,9 +100,9 @@ static VALUE glut_Init( int argc, VALUE * argv, VALUE obj)
 
 	if (rb_scan_args(argc, argv, "01", &orig_arg) == 0)
 		orig_arg = rb_eval_string("[$0] + ARGV");
-	else 
+	else
 		Check_Type(orig_arg, T_ARRAY);
-	
+
 	/* converts commandline parameters from ruby to C, passes them
 	to glutInit and returns the parameters stripped of glut-specific
 	commands ("-display","-geometry" etc.) */
@@ -110,9 +110,9 @@ static VALUE glut_Init( int argc, VALUE * argv, VALUE obj)
 	largv = ALLOCA_N(char*, largc);
 	for (i = 0; i < largc; i++)
 		largv[i] = StringValueCStr(RARRAY_PTR(orig_arg)[i]);
-	
+
 	glutInit(&largc, largv);
-	
+
 	new_argv = rb_ary_new2(largc);
 	for (i = 0; i < largc; i++)
 		rb_ary_push(new_argv,rb_str_new2(largv[i]));
@@ -256,7 +256,7 @@ VALUE obj,callback,arg2;
 	return Qnil;
 }
 
-/* GLUT window sub-API. */ 
+/* GLUT window sub-API. */
 static VALUE glut_CreateWindow(argc, argv, obj)
 int argc;
 VALUE* argv;
@@ -988,7 +988,7 @@ static inline void * bitmap_font_map(int f)
 	switch (f) {
 		case 0: return (void *)GLUT_BITMAP_9_BY_15;
 		case 1: return (void *)GLUT_BITMAP_8_BY_13;
-		case 2: return (void *)GLUT_BITMAP_TIMES_ROMAN_10; 
+		case 2: return (void *)GLUT_BITMAP_TIMES_ROMAN_10;
 		case 3: return (void *)GLUT_BITMAP_TIMES_ROMAN_24;
 		case 4: return (void *)GLUT_BITMAP_HELVETICA_10;
 		case 5: return (void *)GLUT_BITMAP_HELVETICA_12;
@@ -1460,7 +1460,7 @@ DLLEXPORT void Init_glut()
 	rb_define_module_function(module, "glutIgnoreKeyRepeat", glut_IgnoreKeyRepeat, 1);
 	rb_define_module_function(module, "glutPostWindowOverlayRedisplay", glut_PostWindowOverlayRedisplay, 1);
 	rb_define_module_function(module, "glutPostWindowRedisplay", glut_PostWindowRedisplay, 1);
-	
+
 	rb_define_const(module, "GLUT_API_VERSION", INT2NUM(GLUT_API_VERSION));
 	rb_define_const(module, "GLUT_XLIB_IMPLEMENTATION", INT2NUM(GLUT_XLIB_IMPLEMENTATION));
 	rb_define_const(module, "GLUT_RGB", INT2NUM(GLUT_RGB));
@@ -1637,6 +1637,14 @@ DLLEXPORT void Init_glut()
 	rb_define_const(module, "GLUT_GAME_MODE_PIXEL_DEPTH", INT2NUM(GLUT_GAME_MODE_PIXEL_DEPTH));
 	rb_define_const(module, "GLUT_GAME_MODE_REFRESH_RATE", INT2NUM(GLUT_GAME_MODE_REFRESH_RATE));
 	rb_define_const(module, "GLUT_GAME_MODE_DISPLAY_CHANGED", INT2NUM(GLUT_GAME_MODE_DISPLAY_CHANGED));
+ 
+	// Some OSX specific constants
+#ifdef GLUT_NO_RECOVERY
+	rb_define_const(mGlut, "GLUT_NO_RECOVERY", INT2NUM(GLUT_NO_RECOVERY));
+#endif
+#ifdef GLUT_3_2_CORE_PROFILE
+	rb_define_const(mGlut, "GLUT_3_2_CORE_PROFILE", INT2NUM(GLUT_3_2_CORE_PROFILE));
+#endif
 	
 	
 	callId = rb_intern("call");

data/lib/opengl.rb

@@ -20,9 +20,14 @@
 # Thanks to Ilmari Heikkinen for a previous "reversed" version of this code,
 # and to Bill Kelly for a version before that one.
 
+# Extend the search path for Windows binary gem, depending of the current ruby version
+major_minor = RUBY_VERSION[ /^(\d+\.\d+)/ ] or
+  raise "Oops, can't extract the major/minor version from #{RUBY_VERSION.dump}"
+$: << File.join(File.dirname(__FILE__), major_minor)
+
 module OpenGL
 
-  VERSION = '0.7.0.pre2'
+  VERSION = '0.7.0'
 
 end
 
@@ -77,6 +82,7 @@ module GLUT
 
 	Glut.constants.each do |cn|
 		n = cn.to_s.sub(/^GLUT_/,'')
+		next if n =~ /^[0-9]/
 		const_set( n, Glut.const_get( cn ) )
 	end
 

metadata

@@ -1,15 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: opengl
 version: !ruby/object:Gem::Version 
-  hash: 933985875
-  prerelease: 6
+  hash: 3
+  prerelease: 
   segments: 
   - 0
   - 7
   - 0
-  - pre
-  - 2
-  version: 0.7.0.pre2
+  version: 0.7.0
 platform: ruby
 authors: 
 - Eric Hodel
@@ -21,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-14 00:00:00 Z
+date: 2013-02-03 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rdoc
@@ -84,11 +82,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 13
         segments: 
         - 3
-        - 0
-        version: "3.0"
+        - 5
+        version: "3.5"
   type: :development
   version_requirements: *id004
 description: |-
@@ -298,33 +296,31 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      hash: 25
+      hash: 3
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: opengl
-rubygems_version: 1.8.17
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: An OpenGL wrapper for Ruby
 test_files: 
-- test/test_gl_13.rb
-- test/test_gl_10_11.rb
+- test/test_gl_ext_ext.rb
 - test/test_gl_12.rb
-- test/test_gl_14.rb
-- test/test_glu.rb
 - test/test_gl_15.rb
-- test/test_gl_ext_nv.rb
-- test/test_gl_ext_ati.rb
-- test/test_gl_ext_ext.rb
-- test/test_gl_21.rb
+- test/test_glu.rb
 - test/test_gl_20.rb
+- test/test_gl_13.rb
 - test/test_gl_ext_gremedy.rb
 - test/test_gl.rb
+- test/test_gl_ext_nv.rb
 - test/test_gl_ext_arb.rb
+- test/test_gl_10_11.rb
+- test/test_gl_ext_ati.rb
+- test/test_gl_14.rb
+- test/test_gl_21.rb