ruby-opengl 0.50.0 → 0.60.0

data/ext/glu/mkrf_conf.rb

@@ -16,17 +16,20 @@
 require 'rubygems'
 require 'mkrf'
 
+RUBYVER = " -DRUBY_VERSION=" + RUBY_VERSION.split(".").join
+
 Mkrf::Generator.new( 'glu' ) do |g|
-    case RUBY_PLATFORM
-    when /darwin/
-        g.ldshared << ' -framework OpenGL'
-    when /mswin32/
-        g.cflags << ' -DWIN32'
-        g.include_library( 'opengl32.lib', 'glVertex3d')
-        g.include_library( 'glu32.lib', 'gluLookAt')
-    else
-        g.cflags << ' -Wall'
-        g.include_library( 'GLU', 'gluLookAt' )
-        g.include_library( 'GL', 'glVertex3d')
-    end
+	case RUBY_PLATFORM
+	when /darwin/
+		g.cflags << RUBYVER
+		g.ldshared << ' -framework OpenGL'
+	when /mswin32/
+		g.cflags << ' -DWIN32' + RUBYVER
+		g.include_library( 'opengl32.lib', 'glVertex3d')
+		g.include_library( 'glu32.lib', 'gluLookAt')
+	else
+		g.cflags << ' -Wall' + RUBYVER
+		g.include_library( 'GLU', 'gluLookAt' )
+		g.include_library( 'GL', 'glVertex3d')
+	end
 end

data/ext/glut/glut.c

@@ -73,7 +73,6 @@ VALUE obj; \
  */
 
 /* GLUT initialization sub-API. */
-static VALUE g_arg_array;
 
 static VALUE glut_Init( int argc, VALUE * argv, VALUE obj)
 {
@@ -120,7 +119,7 @@ glut_InitDisplayString(obj,arg1)
 VALUE obj,arg1;
 {
 	Check_Type(arg1,T_STRING);
-	glutInitDisplayString(RSTRING(arg1)->ptr);
+	glutInitDisplayString(RSTRING_PTR(arg1));
 	return Qnil;
 }
 
@@ -201,7 +200,7 @@ VALUE obj,arg1,arg2;
 	int win;
 	int pollinterval;
 	if (!rb_obj_is_kind_of(arg1,rb_cProc) && !NIL_P(arg1))
-		rb_raise(rb_eTypeError, "glutJoystickFunc", rb_class2name(CLASS_OF(arg1)));
+		rb_raise(rb_eTypeError, "glutJoystickFunc:%s", rb_class2name(CLASS_OF(arg1)));
 	pollinterval=NUM2INT(arg2);
 	win = glutGetWindow();
 	if (win == 0)
@@ -226,7 +225,7 @@ VALUE obj;
 	if (argc == 0)
 		title = rb_eval_string("$0");
 	Check_Type(title,T_STRING);
-	ret = glutCreateWindow(RSTRING(title)->ptr);
+	ret = glutCreateWindow(RSTRING_PTR(title));
 	return INT2NUM(ret);
 }
 
@@ -286,7 +285,7 @@ glut_SetWindowTitle(obj,arg1)
 VALUE obj,arg1;
 {
 	Check_Type(arg1,T_STRING);
-	glutSetWindowTitle(RSTRING(arg1)->ptr);
+	glutSetWindowTitle(RSTRING_PTR(arg1));
 	return Qnil;
 }
 
@@ -296,7 +295,7 @@ glut_SetIconTitle(obj, arg1)
 VALUE obj,arg1;
 {
 	Check_Type(arg1,T_STRING);
-	glutSetIconTitle(RSTRING(arg1)->ptr);
+	glutSetIconTitle(RSTRING_PTR(arg1));
 	return Qnil;
 }
 
@@ -372,15 +371,14 @@ glut_UseLayer(obj,arg1)
 
 /* GLUT menu sub-API. */
 static VALUE g_menucallback = Qnil;
-static VALUE g_menuargs = Qnil;
 static void GLUTCALLBACK
 glut_CreateMenuCallback(int value)
 {
-	VALUE arg_pair;
 	VALUE func;
-	arg_pair = (VALUE)value;
-	func = rb_hash_aref(g_menucallback, rb_ary_entry(arg_pair, 0));
-	rb_funcall(func, callId, 1, rb_ary_entry(arg_pair, 1));
+	int menu;
+	menu = glutGetMenu();
+	func = rb_ary_entry(g_menucallback,menu);
+	rb_funcall(func, callId, 1, INT2NUM(value));
 }
 
     
@@ -389,14 +387,16 @@ glut_CreateMenu(obj,arg1)
 VALUE obj,arg1;
 {
 	int menu;
-	VALUE ret;
-	if (!rb_obj_is_kind_of(arg1,rb_cProc))
+	if (!rb_obj_is_kind_of(arg1,rb_cProc) && !NIL_P(arg1))
 		rb_raise(rb_eTypeError, "glutCreateMenu:%s", rb_class2name(CLASS_OF(arg1)));
-	menu = glutCreateMenu(glut_CreateMenuCallback);
-	ret = INT2FIX(menu);
-	rb_hash_aset(g_menucallback, ret, arg1);
-	rb_hash_aset(g_menuargs, ret, rb_ary_new());
-	return ret;
+
+	if (NIL_P(arg1))
+		menu = glutCreateMenu(NULL);
+	else
+		menu = glutCreateMenu(glut_CreateMenuCallback);
+
+	rb_ary_store(g_menucallback,menu,arg1);
+	return INT2FIX(menu);
 }
 
     
@@ -407,8 +407,8 @@ VALUE obj,arg1;
 	int menu;
 	menu = INT2FIX(arg1);
 	glutDestroyMenu(menu);
-	rb_hash_aset(g_menucallback, menu, Qnil);
-	rb_hash_aset(g_menuargs, menu, Qnil);
+	//rb_hash_aset(g_menucallback, menu, Qnil);
+	//rb_hash_aset(g_menuargs, menu, Qnil);
 	return Qnil;
 }
 
@@ -427,9 +427,7 @@ static VALUE
 glut_SetMenu(obj,arg1)
 VALUE obj,arg1;
 {
-	int menu;
-	menu = NUM2INT(arg1);
-	glutSetMenu(menu);
+	glutSetMenu(NUM2INT(arg1));
 	return Qnil;
 }
 
@@ -438,19 +436,8 @@ static VALUE
 glut_AddMenuEntry(obj,arg1,arg2)
 VALUE obj,arg1,arg2;
 {
-	int curmenuid;
-	VALUE arg_ary;
-	VALUE arg_pair;
 	Check_Type(arg1,T_STRING);
-	curmenuid = glutGetMenu();
-	if (curmenuid == 0)
-		rb_raise(rb_eRuntimeError, "glutAddMenuEntry needs current menu");
-	arg_ary = rb_hash_aref(g_menuargs, INT2FIX(curmenuid));
-	arg_pair = rb_ary_new2(2);
-	rb_ary_store(arg_pair, 0, INT2FIX(curmenuid));
-	rb_ary_store(arg_pair, 1, arg2);
-	rb_ary_push(arg_ary, arg_pair);
-	glutAddMenuEntry(RSTRING(arg1)->ptr, arg_pair);
+	glutAddMenuEntry(RSTRING_PTR(arg1), NUM2INT(arg2));
 	return Qnil;
 }
 
@@ -459,10 +446,8 @@ static VALUE
 glut_AddSubMenu(obj,arg1,arg2)
 VALUE obj,arg1,arg2;
 {
-	int value;
 	Check_Type(arg1,T_STRING);
-	value = NUM2INT(arg2);
-	glutAddSubMenu(RSTRING(arg1)->ptr, value);
+	glutAddSubMenu(RSTRING_PTR(arg1), NUM2INT(arg2));
 	return Qnil;
 }
 
@@ -470,21 +455,8 @@ VALUE obj,arg1,arg2;
 static VALUE glut_ChangeToMenuEntry(obj,arg1,arg2,arg3)
 VALUE obj,arg1,arg2,arg3;
 {
-	VALUE arg_ary;
-	VALUE arg_pair;
-	int item;
-	int curmenuid;
-	item = NUM2INT(arg1);
 	Check_Type(arg2,T_STRING);
-	curmenuid = glutGetMenu();
-	if (curmenuid == 0)
-		rb_raise(rb_eRuntimeError, "glutChangeToMenuEntry needs current menu");
-	arg_ary = rb_hash_aref(g_menuargs, INT2FIX(curmenuid));
-	arg_pair = rb_ary_new2(2);
-	rb_ary_store(arg_pair, 0, INT2FIX(curmenuid));
-	rb_ary_store(arg_pair, 1, arg2);
-	rb_ary_store(arg_ary, item, arg_pair);
-	glutChangeToMenuEntry(item, RSTRING(arg2)->ptr, arg_pair);
+	glutChangeToMenuEntry(NUM2INT(arg1), RSTRING_PTR(arg2), NUM2INT(arg3));
 	return Qnil;
 }
 
@@ -492,27 +464,15 @@ VALUE obj,arg1,arg2,arg3;
 static VALUE glut_ChangeToSubMenu(obj,arg1,arg2,arg3)
 VALUE obj,arg1,arg2,arg3;
 {
-	int item,submenu;
-	item = NUM2INT(arg1);
-	submenu = NUM2INT(arg3);
 	Check_Type(arg2,T_STRING);
-	glutChangeToSubMenu(item, RSTRING(arg2)->ptr, submenu);
+	glutChangeToSubMenu(NUM2INT(arg1), RSTRING_PTR(arg2), NUM2INT(arg3));
 	return Qnil;
 }
 
 
 static VALUE glut_RemoveMenuItem( VALUE obj, VALUE arg1 )
 {
-	int item;
-	int curmenuid;
-	VALUE arg_ary;
-	item = NUM2INT(arg1);
-	glutRemoveMenuItem(item);
-	curmenuid = glutGetMenu();
-	if (curmenuid == 0)
-		rb_raise(rb_eRuntimeError, "glutRemoveMenuItem needs current menu");
-	arg_ary = rb_hash_aref(g_menuargs, INT2FIX(curmenuid));
-	rb_ary_delete(arg_ary, item);
+	glutRemoveMenuItem(NUM2INT(arg1));
 	return Qnil;
 }
 
@@ -521,9 +481,7 @@ static VALUE
 glut_AttachMenu(obj,arg1)
 VALUE obj, arg1;
 {
-	int button;
-	button = NUM2INT(arg1);
-	glutAttachMenu(button);
+	glutAttachMenu(NUM2INT(arg1));
 	return Qnil;
 }
 
@@ -532,9 +490,7 @@ static VALUE
 glut_DetachMenu(obj,arg1)
 VALUE obj, arg1;
 {
-	int button;
-	button = NUM2INT(arg1);
-	glutDetachMenu(button);
+	glutDetachMenu(NUM2INT(arg1));
 	return Qnil;
 }
 
@@ -568,7 +524,11 @@ int x,y;
 	VALUE func;
 	func = rb_ary_entry(KeyboardFunc, glutGetWindow());
 	if (!NIL_P(func))
+#if RUBY_VERSION <190
 		rb_funcall(func, callId, 3, INT2FIX(key), INT2FIX(x), INT2FIX(y));
+#else
+		rb_funcall(func, callId, 3, rb_funcall(INT2FIX(key),rb_intern("chr"),0), INT2FIX(x), INT2FIX(y));
+#endif
 }
 
 
@@ -939,7 +899,7 @@ VALUE obj,arg1;
 {
 	int ret;
 	Check_Type(arg1,T_STRING);
-	ret = glutExtensionSupported(RSTRING(arg1)->ptr);
+	ret = glutExtensionSupported(RSTRING_PTR(arg1));
 	return INT2NUM(ret);
 }
 
@@ -1060,7 +1020,7 @@ VALUE obj,arg1,arg2;
 	int ret;
 	Check_Type(arg2,T_STRING);
 	font = NUM2INT(arg1);
-	ret = glutBitmapLength(bitmap_font_map(font), (const unsigned char*)RSTRING(arg2)->ptr);
+	ret = glutBitmapLength(bitmap_font_map(font), (const unsigned char*)RSTRING_PTR(arg2));
 	return INT2NUM(ret);
 }
 
@@ -1073,7 +1033,7 @@ VALUE obj,arg1,arg2;
 	int ret;
 	Check_Type(arg2,T_STRING);
 	font = NUM2INT(arg1);
-	ret = glutStrokeLength(stroke_font_map(font), (const unsigned char*)RSTRING(arg2)->ptr);
+	ret = glutStrokeLength(stroke_font_map(font), (const unsigned char*)RSTRING_PTR(arg2));
 	return INT2NUM(ret);
 }
 
@@ -1284,7 +1244,7 @@ glut_GameModeString(obj,arg1)
 VALUE obj,arg1;
 {
 	Check_Type(arg1,T_STRING);
-	glutGameModeString((const char*)RSTRING(arg1)->ptr);
+	glutGameModeString((const char*)RSTRING_PTR(arg1));
 	return Qnil;
 }
 
@@ -1350,11 +1310,8 @@ DLLEXPORT void Init_glut()
 {
 	module = rb_define_module("Glut");
 	
-	rb_global_variable( &g_arg_array );
 	rb_global_variable( &g_menucallback );
-	rb_global_variable( &g_menuargs );
-	g_menucallback = rb_hash_new();
-	g_menuargs = rb_hash_new();
+	g_menucallback = rb_ary_new();
 	
 	rb_define_module_function(module, "glutInit", glut_Init, -1);
 	rb_define_module_function(module, "glutInitDisplayMode", glut_InitDisplayMode, 1);

data/ext/glut/mkrf_conf.rb

@@ -16,18 +16,22 @@
 require 'rubygems'
 require 'mkrf'
 
+RUBYVER = " -DRUBY_VERSION=" + RUBY_VERSION.split(".").join
+
 Mkrf::Generator.new( 'glut' ) do |g|
-    case RUBY_PLATFORM
-    when /darwin/
-        g.ldshared << ' -framework GLUT -framework OpenGL -framework Cocoa'
-    when /mswin32/
-        g.cflags << ' -DWIN32'
-        g.include_library( 'glut32.lib', 'glutSolidTeapot' )
-        g.include_library( 'glu32.lib', 'gluLookAt' )
-        g.include_library( 'opengl32.lib', 'glVertex3d' )
-    else
-        g.include_library( 'glut', 'glutSolidTeapot' )
-        g.include_library( 'GLU', 'gluLookAt' )
-        g.include_library( 'GL', 'glVertex3d')
-    end
+	case RUBY_PLATFORM
+	when /darwin/
+		g.cflags << RUBYVER
+		g.ldshared << ' -framework GLUT -framework OpenGL -framework Cocoa'
+	when /mswin32/
+		g.cflags << ' -DWIN32' + RUBYVER
+		g.include_library( 'glut32.lib', 'glutSolidTeapot' )
+		g.include_library( 'glu32.lib', 'gluLookAt' )
+		g.include_library( 'opengl32.lib', 'glVertex3d' )
+	else
+		g.cflags << RUBYVER
+		g.include_library( 'glut', 'glutSolidTeapot' )
+		g.include_library( 'GLU', 'gluLookAt' )
+		g.include_library( 'GL', 'glVertex3d')
+	end
 end

data/lib/opengl.rb

@@ -37,72 +37,48 @@ module GL
 		# due to ruby naming scheme, we can't export constants with leading decimal,
 		# e.g. (Gl::)GL_2D would under old syntax become (GL::)2D which is illegal
 		next if n =~ /^[0-9]/ 
-		begin
-			const_set( n, Gl.const_get( cn ) )
-		rescue
-			puts "=== #{__FILE__} FAILED on Constant: #{cn} --> #{n}"
-		end
+		const_set( n, Gl.const_get( cn ) )
 	end
 	
 	Gl.methods( false ).each do |mn|
 		n = mn.to_s.sub(/^gl/,'')
-		begin
-			alias_method( n, mn )
-			public( n )
-		rescue
-			puts "=== #{__FILE__} FAILED on Method: #{mn} --> #{n}"
-		end
+		alias_method( n, mn )
+		public( n )
 	end
 end
 
 # (Glu.)gluSphere -> GLU.Sphere
 # (Glu::)GLU_INSIDE -> GLU::INSIDE
 module GLU
-    extend self
-    include Glu
-
-    Glu.constants.each do |cn|
-        n = cn.to_s.sub(/^GLU_/,'')
-        begin
-            const_set( n, Glu.const_get( cn ) )
-        rescue
-            puts "=== #{__FILE__} FAILED on Constant: #{cn} --> #{n}"
-        end
-    end
-
-    Glu.methods( false ).each do |mn|
-        n = mn.to_s.sub(/^glu/,'')
-        begin
-            alias_method( n, mn )
-            public( n )
-        rescue
-            puts "=== #{__FILE__} FAILED on Method: #{mn} --> #{n}"
-        end
-    end
+	extend self
+	include Glu
+	
+	Glu.constants.each do |cn|
+		n = cn.to_s.sub(/^GLU_/,'')
+		const_set( n, Glu.const_get( cn ) )
+	end
+	
+	Glu.methods( false ).each do |mn|
+		n = mn.to_s.sub(/^glu/,'')
+		alias_method( n, mn )
+		public( n )
+	end
 end
 
 # (Glut.)glutInit -> GLUT.Init
 # (Glut::)GLUT_RGBA -> GLUT::RGBA
 module GLUT
-    extend self
-    include Glut
-
-    Glut.constants.each do |cn|
-        n = cn.to_s.sub(/^GLUT_/,'')
-        begin
-            const_set( n, Glut.const_get( cn ) )
-        rescue
-            puts "=== #{__FILE__} FAILED on Constant: #{cn} --> #{n}"
-        end
-    end
-
-    Glut.methods( false ).each do |mn|
-        n = mn.to_s.sub(/^glut/,'')
-        begin
-            alias_method( n, mn )
-            public( n )
-        rescue
-            puts "=== #{__FILE__} FAILED on Method: #{mn} --> #{n}"
-        end
-    end
+	extend self
+	include Glut
+	
+	Glut.constants.each do |cn|
+		n = cn.to_s.sub(/^GLUT_/,'')
+		const_set( n, Glut.const_get( cn ) )
+	end
+	
+	Glut.methods( false ).each do |mn|
+		n = mn.to_s.sub(/^glut/,'')
+		alias_method( n, mn )
+		public( n )
+	end
 end

data/test/tc_common.rb

@@ -22,9 +22,12 @@ end
 require 'test/unit'
 require 'gl'
 require 'glut'
+require 'matrix'
 include Gl
 include Glut
 
+Gl.enable_error_checking
+
 $window_size = 512
 
 def glut_init()
@@ -37,8 +40,9 @@ def glut_init()
 	glutInitWindowPosition(1, 1)
 	glutInitWindowSize($window_size, $window_size)
 	glutCreateWindow("test")
-	glutDisplayFunc(display_func)
+
 	# hack the need to call glutMainLoop on some implementations
+	glutDisplayFunc(display_func)
 	begin
 		glutMainLoop()
 	rescue
@@ -75,16 +79,18 @@ end
 def common_teardown
 	glPopAttrib()
 	glPopClientAttrib()
+	glRenderMode(GL_RENDER)
+	# in case there is an GL error that escaped error checking routines ...
 	error = glGetError()
 	p gluErrorString(error)	if (error!=0)
-	assert_equal(error,0) # all expected GL errors must be handled by the method itself
+	assert_equal(error,0)
 end
 
 def supported?(funcs)
 	Array(funcs).each do |name| # convert to array if it isn't already
 		if !Gl.is_available?(name)
 			puts ""				
-			puts "#{name} not supported, test skipped"
+			print "#{name} not supported, test skipped"
 			return false
 		end
 	end