ruby-opengl 0.50.0 → 0.60.0

data/ext/gl/gl.c

@@ -27,8 +27,13 @@ void gl_init_functions_1_4(VALUE);
 void gl_init_functions_1_5(VALUE);
 void gl_init_functions_2_0(VALUE);
 void gl_init_functions_2_1(VALUE);
+void gl_init_functions_ext_3dfx(VALUE);
 void gl_init_functions_ext_arb(VALUE);
+void gl_init_functions_ext_ati(VALUE);
 void gl_init_functions_ext_ext(VALUE);
+void gl_init_functions_ext_gremedy(VALUE);
+void gl_init_functions_ext_nv(VALUE);
+
 
 static int opengl_version[2]; /* major, minor */
 static char *opengl_extensions = NULL;
@@ -41,7 +46,8 @@ const int *GetOpenglVersion(void)
 {
 	if (opengl_version[0]==0) { /* not cached, query */
 		const char *vstr = (const char *) glGetString(GL_VERSION);
-    if (vstr)
+		CHECK_GLERROR
+		if (vstr)
 			sscanf( vstr, "%d.%d", &opengl_version[0], &opengl_version[1] );
 	}
 	return opengl_version;
@@ -70,7 +76,8 @@ const char *GetOpenglExtensions(void)
 {
 	if (opengl_extensions == NULL) {
 		const char *estr = (const char *) glGetString(GL_EXTENSIONS);
-    if (estr) {
+		CHECK_GLERROR
+		if (estr) {
 			int len = strlen(estr);
 			opengl_extensions = ALLOC_N(GLchar,len+1+1); /* terminating null and added space */
 			strcpy(opengl_extensions,estr);
@@ -111,42 +118,38 @@ GLboolean CheckExtension(const char *name)
 	return res;	
 }
 
+/* wrapper for CheckOpenglVersion and CheckExtension, also used by macros
+ */
+GLboolean CheckVersionExtension(const char *name)
+{
+	if (name && name[0] && name[0]>='0' && name[0]<='9') { /* GL version query */
+		int major,minor;
+
+		if (sscanf( name, "%d.%d", &major, &minor ) != 2)
+				return GL_FALSE;
+	
+		return (CheckOpenglVersion(major,minor));
+	} else {
+		return (CheckExtension(name));
+	}
+}
+
+/* Checks if given OpenGL version or extension is available
+ */
 static VALUE
 IsAvailable(obj,arg1)
 VALUE obj,arg1;
 {
 	char *name = NULL;
 	VALUE s;
+	GLboolean res;
 
 	s = rb_funcall(arg1, rb_intern("to_s"),0);
-	name = RSTRING(s)->ptr;
+	name = RSTRING_PTR(s);
 
-	if (name && name[0] && name[0]>='0' && name[0]<='9') { /* GL version query */
-		int major,minor;
+	res = CheckVersionExtension(name);
 
-		if (sscanf( name, "%d.%d", &major, &minor ) != 2)
-				return Qfalse;
-	
-		if (CheckOpenglVersion(major,minor)==1)
-			return Qtrue;
-		else
-			return Qfalse;
-	} else if (name && name[0] && (name[0]=='G' || name[0]=='W')) { /* GL_, GLX_, WGL_ extension */
-		GLboolean res;
-		
-		res = CheckExtension(name);
-		if (res==GL_TRUE)
-			return Qtrue;
-		else
-			return Qfalse;
-	} else { /* function */
-		GLvoid *ret;
-		ret = load_gl_function(name,0); /* won't raise */
-		if (ret==NULL)
-			return Qfalse;
-		else
-			return Qtrue;
-	}
+	return GLBOOL2RUBY(res);
 }
 
 /* Checks whether non-zero buffer of type $buffer is bound
@@ -173,12 +176,20 @@ GLint CheckBufferBinding(GLint buffer)
 			break;
 	}
 	glGetIntegerv(buffer,&result);
+	CHECK_GLERROR
 	return result;
 }
 
 DLLEXPORT void Init_gl()
 {
+	VALUE VERSION = rb_str_new2("0.60");
+
 	module = rb_define_module("Gl");
+
+	rb_define_const(module, "BINDINGS_VERSION", VERSION);
+	rb_define_const(module, "RUBY_OPENGL_VERSION", VERSION);
+
+	gl_init_error(module);
 	gl_init_enums(module);
 	gl_init_functions_1_0__1_1(module);
 	gl_init_functions_1_2(module);
@@ -187,8 +198,17 @@ DLLEXPORT void Init_gl()
 	gl_init_functions_1_5(module);
 	gl_init_functions_2_0(module);
 	gl_init_functions_2_1(module);
+	gl_init_functions_ext_3dfx(module);
 	gl_init_functions_ext_arb(module);
+	gl_init_functions_ext_ati(module);
 	gl_init_functions_ext_ext(module);
+	gl_init_functions_ext_gremedy(module);
+	gl_init_functions_ext_nv(module);
 
 	rb_define_module_function(module, "is_available?", IsAvailable, 1);
+	rb_define_module_function(module, "is_supported?", IsAvailable, 1);
+	rb_define_module_function(module, "extension_available?", IsAvailable, 1);
+	rb_define_module_function(module, "extension_supported?", IsAvailable, 1);
+	rb_define_module_function(module, "version_available?", IsAvailable, 1);
+	rb_define_module_function(module, "version_supported?", IsAvailable, 1);
 }

data/ext/gl/mkrf_conf.rb

@@ -17,15 +17,18 @@ require 'rubygems'
 require 'mkrf'
 require 'rbconfig'
 
+RUBYVER = " -DRUBY_VERSION=" + RUBY_VERSION.split(".").join
+
 Mkrf::Generator.new( 'gl' ) do |g|
-    case RUBY_PLATFORM
-    when /darwin/
-        g.ldshared << ' -framework OpenGL'
-    when /mswin32/
-        g.cflags << ' -DWIN32'
-        g.include_library( 'opengl32.lib', 'glVertex3d')
-    else
-        g.cflags << ' -Wall'
-        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')
+	else
+		g.cflags << ' -Wall' + RUBYVER
+		g.include_library( 'GL', 'glVertex3d')
+	end
 end

data/ext/glu/glu-enums.c

@@ -5,6 +5,9 @@
 #include "../common/common.h"
 void glu_init_enums(VALUE module)
 {
+	rb_define_const(module, "GLU_FALSE", Qfalse);
+	rb_define_const(module, "GLU_TRUE", Qtrue);
+
 	rb_define_const(module, "GLU_AUTO_LOAD_MATRIX", INT2NUM(GLU_AUTO_LOAD_MATRIX));
 	rb_define_const(module, "GLU_BEGIN", INT2NUM(GLU_BEGIN));
 	rb_define_const(module, "GLU_CCW", INT2NUM(GLU_CCW));
@@ -19,7 +22,6 @@ void glu_init_enums(VALUE module)
 	rb_define_const(module, "GLU_EXTERIOR", INT2NUM(GLU_EXTERIOR));
 	rb_define_const(module, "GLU_EXT_nurbs_tessellator", INT2NUM(GLU_EXT_nurbs_tessellator));
 	rb_define_const(module, "GLU_EXT_object_space_tess", INT2NUM(GLU_EXT_object_space_tess));
-	rb_define_const(module, "GLU_FALSE", INT2NUM(GLU_FALSE));
 	rb_define_const(module, "GLU_FILL", INT2NUM(GLU_FILL));
 	rb_define_const(module, "GLU_FLAT", INT2NUM(GLU_FLAT));
 	rb_define_const(module, "GLU_INSIDE", INT2NUM(GLU_INSIDE));
@@ -151,7 +153,6 @@ void glu_init_enums(VALUE module)
 	rb_define_const(module, "GLU_TESS_WINDING_ODD", INT2NUM(GLU_TESS_WINDING_ODD));
 	rb_define_const(module, "GLU_TESS_WINDING_POSITIVE", INT2NUM(GLU_TESS_WINDING_POSITIVE));
 	rb_define_const(module, "GLU_TESS_WINDING_RULE", INT2NUM(GLU_TESS_WINDING_RULE));
-	rb_define_const(module, "GLU_TRUE", INT2NUM(GLU_TRUE));
 	rb_define_const(module, "GLU_UNKNOWN", INT2NUM(GLU_UNKNOWN));
 	rb_define_const(module, "GLU_U_STEP", INT2NUM(GLU_U_STEP));
 	rb_define_const(module, "GLU_VERSION", INT2NUM(GLU_VERSION));

data/ext/glu/glu.c

@@ -21,6 +21,8 @@
 
 static VALUE module;
 
+VALUE Class_GLUError;
+
 void glu_init_enums(VALUE);
 
 typedef GLUtesselator tesselatorObj;
@@ -124,6 +126,35 @@ get_surface_dim(GLenum type)
 	return 0; /* never gets here */
 }
 
+VALUE GLUError_initialize(VALUE obj,VALUE message, VALUE error_id)
+{
+	rb_call_super(1, &message);
+	rb_iv_set(obj, "@id", error_id);
+
+	return obj;
+}
+
+void check_for_gluerror(GLenum error)
+{
+	char *error_string = "";
+	VALUE exc;
+	
+	/* no error */
+	if (error==0)
+		return;
+	
+	switch(error) {
+		case GLU_INVALID_ENUM: error_string = "invalid enumerant"; break;
+		case GLU_INVALID_VALUE: error_string = "invalid value"; break;
+		case GLU_INVALID_OPERATION: error_string = "invalid operation"; break;
+		case GLU_OUT_OF_MEMORY: error_string = "out of memory"; break;
+		default: error_string = "unknown error"; break;
+	}
+
+	exc = rb_funcall(Class_GLUError, rb_intern("new"), 2, rb_str_new2(error_string), RETCONV_GLenum(error));
+	rb_funcall(rb_cObject, rb_intern("raise"), 1, exc);
+}
+
 /*
  * NURBS API
  */
@@ -177,7 +208,7 @@ VALUE obj, arg1, arg2, arg3;
 		gluNurbsCallback(ndata->nobj, type, NULL);
 	else
 		gluNurbsCallback(ndata->nobj, type, n_error);
-	
+
 	return Qnil;
 }
 
@@ -191,6 +222,7 @@ VALUE obj;
 	ret = Data_Make_Struct(cNurbs, struct nurbsdata, mark_nurbs, free_nurbs, ndata);
 	ndata->nobj = gluNewNurbsRenderer();
 	ndata->n_ref = rb_ary_new2(REF_LAST);
+		
 	return ret;
 }
 static VALUE
@@ -200,6 +232,7 @@ VALUE obj, arg1;
 	struct nurbsdata *ndata;
 	GetNURBS(arg1, ndata);
 	free_nurbs(ndata);
+		
 	return Qnil;
 }
 static VALUE
@@ -213,6 +246,7 @@ VALUE obj, arg1, arg2, arg3;
 	property = (GLenum)NUM2INT(arg2);
 	value = (GLfloat)NUM2DBL(arg3);
 	gluNurbsProperty(ndata->nobj, property, value);
+		
 	return Qnil;
 }
 static VALUE
@@ -225,7 +259,8 @@ VALUE obj, arg1, arg2;
 	GetNURBS(arg1, ndata);
 	property = (GLenum)NUM2INT(arg2);
 	gluGetNurbsProperty(ndata->nobj, property, &value);
-	return rb_float_new(value);
+		
+	return cond_GLBOOL2RUBY_F(property,value);
 }
 static VALUE
 glu_BeginCurve(obj, arg1)
@@ -235,6 +270,7 @@ VALUE obj, arg1;
 	GetNURBS(arg1, ndata);
 	rb_ary_push(n_current, arg1);
 	gluBeginCurve(ndata->nobj);
+		
 	return Qnil;
 }
 static VALUE
@@ -252,6 +288,7 @@ VALUE obj, arg1;
 
 	rb_ary_pop(n_current);
 
+		
 	return Qnil;
 }
 static VALUE
@@ -281,8 +318,7 @@ VALUE obj;
 			uknot = ALLOC_N(GLfloat, uknot_count);
 			ary2cflt(args[1], uknot, uknot_count);
 
-			ary_ctl1 = rb_ary_new();
-			mary2ary(args[2], ary_ctl1); /* flatten */
+			ary_ctl1 = rb_funcall(args[2],rb_intern("flatten"),0);
 			break;
 		case 7:
 			uknot_count = (GLint)NUM2INT(args[1]);
@@ -293,11 +329,10 @@ VALUE obj;
 			uknot = ALLOC_N(GLfloat, uknot_count);
 			ary2cflt(args[2], uknot, uknot_count);
 
-			ary_ctl1 = rb_ary_new();
-			mary2ary(args[4], ary_ctl1); /* flatten */
+			ary_ctl1 = rb_funcall(args[4],rb_intern("flatten"),0);
 			break;
 		default:
-			rb_raise(rb_eArgError, "gluNurbsCurve needs 5 or 7 arguments",argc);
+			rb_raise(rb_eArgError, "gluNurbsCurve needs 5 or 7 arguments");
 	}
 	ctlarray = ALLOC_N(GLfloat, u_stride*(uknot_count-uorder));
 	ary2cflt((VALUE)ary_ctl1, ctlarray, (uknot_count-uorder)*u_stride);
@@ -309,6 +344,7 @@ VALUE obj;
 	gms.ptr = REALLOC_N(gms.ptr, GLfloat*, gms.len+=2);
 	gms.ptr[gms.len - 2] = uknot;
 	gms.ptr[gms.len - 1] = ctlarray;
+		
 	return Qnil;
 }
 static VALUE
@@ -319,6 +355,7 @@ VALUE obj, arg1;
 	GetNURBS(arg1, ndata);
 	rb_ary_push(n_current, arg1);
 	gluBeginSurface(ndata->nobj);
+		
 	return Qnil;
 }
 static VALUE
@@ -336,6 +373,7 @@ VALUE obj, arg1;
 
 	rb_ary_pop(n_current);
 	
+		
 	return Qnil;
 }
 
@@ -379,8 +417,7 @@ VALUE obj;
 			s_stride = t_stride * sorder;
 
 			ctlarray = ALLOC_N(GLfloat, (sknot_count-sorder)*(tknot_count-torder)*t_stride);
-			ary_ctl1 = rb_ary_new();
-			mary2ary(args[3], ary_ctl1); /* flatten */
+			ary_ctl1 = rb_funcall(args[3],rb_intern("flatten"),0);
 			ary2cflt(ary_ctl1, ctlarray, (sknot_count-sorder)*(tknot_count-torder)*t_stride);
 			break;
 		case 11:
@@ -400,13 +437,11 @@ VALUE obj;
 			type_len = get_surface_dim(type);
 			
 			ctlarray = ALLOC_N(GLfloat, (sknot_count-sorder)*(tknot_count-torder)*type_len);
-			
-			ary_ctl1 = rb_ary_new();
-			mary2ary(args[7], ary_ctl1); /* flatten */
+			ary_ctl1 = rb_funcall(args[7],rb_intern("flatten"),0);
 			ary2cflt(ary_ctl1, ctlarray, (sknot_count-sorder)*(tknot_count-torder)*type_len);
 			break;
 		default:
-			rb_raise(rb_eArgError, "gluNurbsSurface needs 7 or 11 arguments",argc);
+			rb_raise(rb_eArgError, "gluNurbsSurface needs 7 or 11 arguments");
 			return Qnil; /* not reached */
 	}
 	GetNURBS(args[0], ndata);
@@ -420,6 +455,7 @@ VALUE obj;
 	gms.ptr[gms.len-2] = tknot;
 	gms.ptr[gms.len-1] = ctlarray;
 	
+		
 	return Qnil;
 }
 static VALUE
@@ -430,6 +466,7 @@ VALUE obj, arg1;
 	GetNURBS(arg1, ndata);
 	rb_ary_push(n_current, arg1);
 	gluBeginTrim(ndata->nobj);
+		
 	return Qnil;
 }
 static VALUE
@@ -440,6 +477,7 @@ VALUE obj, arg1;
 	GetNURBS(arg1, ndata);
 	gluEndTrim(ndata->nobj);
 	rb_ary_pop(n_current);
+		
 	return Qnil;
 }
 static VALUE
@@ -464,8 +502,7 @@ VALUE obj;
 			stride = (type == GLU_MAP1_TRIM_2 ? 2 : 3);
 
 			array = ALLOC_N(GLfloat, count*stride);
-			ary_ctl1 = rb_ary_new();
-			mary2ary(args[1], ary_ctl1); /* flatten */
+			ary_ctl1 = rb_funcall(args[1],rb_intern("flatten"),0);
 			ary2cflt(ary_ctl1, array, count*stride);
 			break;
 		case 5:
@@ -474,18 +511,18 @@ VALUE obj;
 			type = NUM2INT(args[4]);
 
 			array = ALLOC_N(GLfloat, count*stride);
-			ary_ctl1 = rb_ary_new();
-			mary2ary(args[2], ary_ctl1); /* flatten */
+			ary_ctl1 = rb_funcall(args[2],rb_intern("flatten"),0);
 			ary2cflt(ary_ctl1, array, count*stride);
 			break;
 		default:
-			rb_raise(rb_eArgError, "gluPwlCurve needs 3 or 5 arguments",argc);
+			rb_raise(rb_eArgError, "gluPwlCurve needs 3 or 5 arguments");
 			return Qnil; /* not reached */
 	}
 
 	GetNURBS(args[0], ndata);
 	gluPwlCurve(ndata->nobj, count, array, stride, type);
 	free(array);
+		
 	return Qnil;
 }
 
@@ -498,12 +535,13 @@ VALUE obj, arg1,arg2,arg3,arg4;
 	GLint viewport[4];
 
 	GetNURBS(arg1, ndata);
-	ary2cmat4x4flt(arg2,mdl_mtx);
-	ary2cmat4x4flt(arg3,persp_mtx);
+	ary2cmatfloat(arg2,mdl_mtx,4,4);
+	ary2cmatfloat(arg3,persp_mtx,4,4);
 	ary2cint(arg4,viewport,4);
 
 	gluLoadSamplingMatrices(ndata->nobj,mdl_mtx,persp_mtx,viewport);
 
+		
 	return Qnil;
 }
 
@@ -552,6 +590,7 @@ VALUE obj;
 	ret = Data_Make_Struct(cTess, struct tessdata, mark_tess, free_tess, tdata);
 	tdata->tobj = gluNewTess();
 	tdata->t_ref = rb_ary_new2(REF_LAST);
+		
 	return ret;
 }
 static VALUE
@@ -561,6 +600,7 @@ VALUE obj, arg1;
 	struct tessdata *tdata;
 	GetTESS(arg1, tdata);
 	free_tess(tdata);
+		
 	return Qnil;
 }
 
@@ -585,7 +625,7 @@ t_edgeFlag(flag)
 GLboolean flag;
 {
 	TESS_CALLBACK_COMMON
-	rb_funcall(rb_ary_entry(tdata->t_ref, TESS_EDGE_FLAG), callId, 1, INT2NUM(flag));
+	rb_funcall(rb_ary_entry(tdata->t_ref, TESS_EDGE_FLAG), callId, 1, GLBOOL2RUBY(flag));
 }
 static void CALLBACK
 t_vertex(data)
@@ -621,7 +661,7 @@ GLboolean flag;
 void* user_data;
 {
 	TESS_CALLBACK_COMMON
-	rb_funcall(rb_ary_entry(tdata->t_ref, TESS_EDGE_FLAG_DATA), callId, 2, INT2NUM(flag), user_data);
+	rb_funcall(rb_ary_entry(tdata->t_ref, TESS_EDGE_FLAG_DATA), callId, 2, GLBOOL2RUBY(flag), user_data);
 }
 static void CALLBACK
 t_vertex_data(data, user_data)
@@ -711,6 +751,7 @@ VALUE obj, arg1, arg2;
 	property = (GLenum)NUM2INT(arg2);
 	value = (GLdouble)NUM2DBL(arg3);
 	gluTessProperty(tdata->tobj, property, value);
+		
 	return Qnil;
 }
 static VALUE
@@ -723,7 +764,8 @@ VALUE obj, arg1, arg2;
 	GetTESS(arg1, tdata);
 	property = (GLenum)NUM2INT(arg2);
 	gluGetTessProperty(tdata->tobj, property, &value);
-	return rb_float_new(value);
+		
+	return cond_GLBOOL2RUBY_F(property,value);
 }
 static VALUE
 glu_TessNormal(obj, arg1, arg2, arg3, arg4)
@@ -736,6 +778,7 @@ VALUE obj, arg1, arg2, arg3, arg4;
 	y = (GLdouble)NUM2DBL(arg3);
 	z = (GLdouble)NUM2DBL(arg4);
 	gluTessNormal(tdata->tobj, x, y, z);
+		
 	return Qnil;
 }
 static VALUE
@@ -749,6 +792,7 @@ VALUE obj, arg1, arg2;
 	rb_ary_store(tdata->t_ref, TESS_DATA, rb_ary_new());
 	rb_ary_push(t_current, arg1);
 	gluTessBeginPolygon(tdata->tobj, (void*)arg2);
+		
 	return Qnil;
 }
 static VALUE
@@ -762,6 +806,7 @@ VALUE obj, arg1;
 	rb_ary_store(tdata->t_ref, TESS_OUTDATA, Qnil);
 	rb_ary_store(tdata->t_ref, TESS_DATA, Qnil);
 	rb_ary_pop(t_current);
+		
 	return Qnil;
 }
 static VALUE
@@ -771,14 +816,17 @@ VALUE obj, arg1;
 	struct tessdata* tdata;
 	GetTESS(arg1, tdata);
 	gluTessBeginContour(tdata->tobj);
+		
 	return Qnil;
 }
 static VALUE
 glu_TessEndContour(obj, arg1)
+VALUE obj, arg1;
 {
 	struct tessdata* tdata;
 	GetTESS(arg1, tdata);
 	gluTessEndContour(tdata->tobj);
+		
 	return Qnil;
 }
 
@@ -816,6 +864,7 @@ VALUE obj, arg1, arg2, arg3;
 		TESS_CALLBACK_CASE(TESS_COMBINE,t_combine)
 		TESS_CALLBACK_CASE(TESS_COMBINE_DATA,t_combine_data)
 	}
+		
 	return Qnil;
 }
 #undef TESS_CALLBACK_CASE
@@ -829,6 +878,7 @@ VALUE obj, arg1;
 	rb_ary_store(tdata->t_ref, TESS_DATA, rb_ary_new());
 	rb_ary_push(t_current, arg1);
 	gluBeginPolygon(tdata->tobj);
+		
 	return Qnil;
 }
 static VALUE
@@ -842,6 +892,7 @@ VALUE obj, arg1, arg2, arg3;
 	Check_Type(arg2,T_ARRAY);
 	ary2cdbl(arg2, v, 3);
 	gluTessVertex(tdata->tobj, v,(void *)arg3);
+		
 	return Qnil;
 }
 static VALUE
@@ -853,6 +904,7 @@ VALUE obj, arg1, arg2;
 	GetTESS(arg1, tdata);
 	type = (GLenum)NUM2INT(arg2);
 	gluNextContour(tdata->tobj, type);
+		
 	return Qnil;
 }
 static VALUE
@@ -864,6 +916,7 @@ VALUE obj, arg1;
 	gluEndPolygon(tdata->tobj);
 	rb_ary_store(tdata->t_ref, TESS_DATA, Qnil);
 	rb_ary_pop(t_current);
+		
 	return Qnil;
 }
 
@@ -896,6 +949,7 @@ VALUE obj, arg1, arg2, arg3;
 	if (!rb_obj_is_kind_of(arg3,rb_cProc) && !NIL_P(arg3))
 		rb_raise(rb_eTypeError, "gluQuadricCallback needs Proc Object:%s",rb_class2name(CLASS_OF(arg3)));
 
+		
 	if (type!=GLU_ERROR)
 		return Qnil;
 
@@ -905,6 +959,7 @@ VALUE obj, arg1, arg2, arg3;
 	else
 		gluQuadricCallback(qdata->qobj, type, q_error);
 	
+		
 	return Qnil;
 }
 
@@ -932,6 +987,7 @@ VALUE obj;
 	ret = Data_Make_Struct(cQuad, struct quaddata, mark_quad, free_quad, qdata);
 	qdata->qobj = gluNewQuadric();
 	qdata->q_ref = rb_ary_new2(REF_LAST);
+		
 	return ret;
 }
 static VALUE
@@ -941,6 +997,7 @@ VALUE obj, arg1;
 	struct quaddata *qdata;
 	GetQUAD(arg1, qdata);
 	free_quad(qdata);
+		
 	return Qnil;
 }
 static VALUE
@@ -952,6 +1009,7 @@ VALUE obj, arg1, arg2;
 	GetQUAD(arg1, qdata);
 	normals = (GLenum)NUM2INT(arg2);
 	gluQuadricNormals(qdata->qobj, normals);
+		
 	return Qnil;
 }
 static VALUE
@@ -963,6 +1021,7 @@ VALUE obj, arg1, arg2;
 	GetQUAD(arg1, qdata);
 	textureCoords = (GLboolean)NUM2INT(arg2);
 	gluQuadricTexture(qdata->qobj, textureCoords);
+		
 	return Qnil;
 }
 static VALUE
@@ -974,6 +1033,7 @@ VALUE obj, arg1, arg2;
 	GetQUAD(arg1, qdata);
 	orientation = (GLenum)NUM2INT(arg2);
 	gluQuadricOrientation(qdata->qobj, orientation);
+		
 	return Qnil;
 }
 static VALUE
@@ -985,6 +1045,7 @@ VALUE obj, arg1, arg2;
 	GetQUAD(arg1, qdata);
 	drawStyle = (GLenum)NUM2INT(arg2);
 	gluQuadricDrawStyle(qdata->qobj, drawStyle);
+		
 	return Qnil;
 }
 static VALUE
@@ -1008,6 +1069,7 @@ VALUE obj, arg1, arg2, arg3, arg4, arg5, arg6;
 	rb_ary_push(q_current, arg1);
 	gluCylinder(qdata->qobj, baseRadius, topRadius, height, slices, stacks);
 	rb_ary_pop(q_current);
+		
 	return Qnil;
 }
 static VALUE
@@ -1030,6 +1092,7 @@ VALUE obj, arg1, arg2, arg3, arg4, arg5;
 
 	gluDisk(qdata->qobj, innerRadius, outerRadius, slices, loops);
 	rb_ary_pop(q_current);
+		
 	return Qnil;
 }
 static VALUE
@@ -1055,6 +1118,7 @@ VALUE obj, arg1, arg2, arg3, arg4, arg5, arg6, arg7;
 	rb_ary_push(q_current, arg1);
 	gluPartialDisk(qdata->qobj, innerRadius, outerRadius, slices, loops, startAngle, sweepAngle);
 	rb_ary_pop(q_current);
+		
 	return Qnil;
 }
 static VALUE
@@ -1074,6 +1138,7 @@ VALUE obj, arg1, arg2, arg3, arg4;
 	rb_ary_push(q_current, arg1);
 	gluSphere(qdata->qobj, radius, slices, stacks);
 	rb_ary_pop(q_current);
+		
 	return Qnil;
 }
 
@@ -1102,6 +1167,7 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9;
 	upy = (GLdouble)NUM2DBL(arg8);
 	upz = (GLdouble)NUM2DBL(arg9);
 	gluLookAt( eyex, eyey, eyez, centerx, centery, centerz, upx, upy, upz );
+		
 	return Qnil;
 }
 static VALUE
@@ -1117,6 +1183,7 @@ VALUE obj,arg1,arg2,arg3,arg4;
 	bottom = (GLdouble)NUM2DBL(arg3);
 	top = (GLdouble)NUM2DBL(arg4);
 	gluOrtho2D(left,right,bottom,top);
+		
 	return Qnil;
 }
 static VALUE
@@ -1132,6 +1199,7 @@ VALUE obj,arg1,arg2,arg3,arg4;
 	zNear = (GLdouble)NUM2DBL(arg3);
 	zFar = (GLdouble)NUM2DBL(arg4);
 	gluPerspective(fovy,aspect,zNear,zFar);
+		
 	return Qnil;
 }
 static VALUE
@@ -1165,11 +1233,12 @@ VALUE obj;
 			ary2cint(args[4], viewport, 4);
 			break;
 		default:
-			rb_raise(rb_eArgError, "gluPickMatrix needs 2,4 or 5 parameters",argc);
+			rb_raise(rb_eArgError, "gluPickMatrix needs 2,4 or 5 parameters");
 	}
 	x = (GLdouble)NUM2DBL(args[0]);
 	y = (GLdouble)NUM2DBL(args[1]);
 	gluPickMatrix(x, y, width, height, viewport);
+		
 	return Qnil;
 }
 
@@ -1198,8 +1267,8 @@ VALUE obj;
 			glGetIntegerv(GL_VIEWPORT, vport);
 			break;
 		case 6:
-			ary2cmat4x4dbl(args[3], mdl_mtx);
-			ary2cmat4x4dbl(args[4], prj_mtx);
+			ary2cmatdouble(args[3], mdl_mtx, 4, 4);
+			ary2cmatdouble(args[4], prj_mtx, 4, 4);
 			ary2cint(args[5], vport, 4);
 			break;
 		default:
@@ -1209,10 +1278,14 @@ VALUE obj;
 	oy = (GLdouble)NUM2DBL(args[1]);
 	oz = (GLdouble)NUM2DBL(args[2]);
 	
-	if (gluProject(ox, oy, oz, mdl_mtx, prj_mtx, vport, &wx, &wy, &wz) == GL_TRUE)
+	if (gluProject(ox, oy, oz, mdl_mtx, prj_mtx, vport, &wx, &wy, &wz) == GL_TRUE) {
+			
 		return rb_ary_new3(3, rb_float_new(wx), rb_float_new(wy), rb_float_new(wz));
-	else
-		return Qnil;
+	} else {
+			
+		check_for_gluerror(GLU_INVALID_VALUE);
+		return Qnil; /* not reached */
+	}
 }
 static VALUE
 glu_UnProject(argc,argv,obj)
@@ -1239,8 +1312,8 @@ VALUE obj;
 			glGetIntegerv(GL_VIEWPORT, vport);
 			break;
 		case 6:
-			ary2cmat4x4dbl(args[3], mdl_mtx);
-			ary2cmat4x4dbl(args[4], prj_mtx);
+			ary2cmatdouble(args[3], mdl_mtx, 4, 4);
+			ary2cmatdouble(args[4], prj_mtx, 4, 4);
 			ary2cint(args[5], vport, 4);
 			break;
 		default:
@@ -1250,10 +1323,14 @@ VALUE obj;
 	wy = (GLdouble)NUM2DBL(args[1]);
 	wz = (GLdouble)NUM2DBL(args[2]);
 	
-	if (gluUnProject(wx, wy, wz, mdl_mtx, prj_mtx, vport, &ox, &oy, &oz) == GL_TRUE)
+	if (gluUnProject(wx, wy, wz, mdl_mtx, prj_mtx, vport, &ox, &oy, &oz) == GL_TRUE) {
+			
 		return rb_ary_new3(3, rb_float_new(ox), rb_float_new(oy), rb_float_new(oz));
-	else
-		return Qnil;
+	} else {
+			
+		check_for_gluerror(GLU_INVALID_VALUE);
+		return Qnil; /* not reached */
+	}
 }
 
 static VALUE
@@ -1265,6 +1342,7 @@ VALUE obj, arg1, arg2, arg3, arg4, arg5, arg6;
 	GLint width;
 	GLenum format;
 	GLenum type;
+	int ret;
 	
 	target = (GLenum)NUM2INT(arg1);
 	components = (GLint)NUM2INT(arg2);
@@ -1274,7 +1352,10 @@ VALUE obj, arg1, arg2, arg3, arg4, arg5, arg6;
 	Check_Type(arg6,T_STRING);
 	CheckDataSize(type,format,width,arg6);
 
-	return INT2NUM(gluBuild1DMipmaps(target, components, width, format, type, RSTRING(arg6)->ptr));
+	ret = gluBuild1DMipmaps(target, components, width, format, type, RSTRING_PTR(arg6));
+	check_for_gluerror(ret);
+		
+	return INT2NUM(ret);
 }
 
 static VALUE
@@ -1287,6 +1368,7 @@ VALUE obj, arg1, arg2, arg3, arg4, arg5, arg6, arg7;
 	GLint height;
 	GLenum format;
 	GLenum type;
+	int ret;
 	
 	target = (GLenum)NUM2INT(arg1);
 	components = (GLint)NUM2INT(arg2);
@@ -1297,7 +1379,10 @@ VALUE obj, arg1, arg2, arg3, arg4, arg5, arg6, arg7;
 	Check_Type(arg7,T_STRING);
 	CheckDataSize(type,format,width*height,arg7);
 
-	return INT2NUM(gluBuild2DMipmaps(target, components, width, height, format, type, RSTRING(arg7)->ptr));
+	ret = gluBuild2DMipmaps(target, components, width, height, format, type, RSTRING_PTR(arg7));
+	check_for_gluerror(ret);
+		
+	return INT2NUM(ret);
 }
 
 static VALUE
@@ -1313,6 +1398,7 @@ VALUE obj, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8;
 	GLint heightout;
 	GLenum typeout;
 	VALUE ret;
+	GLint retcode;
 	
 	format = (GLenum)NUM2INT(arg1);
 	widthin = (GLint)NUM2INT(arg2);
@@ -1320,13 +1406,16 @@ VALUE obj, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8;
 	typein = (GLenum)NUM2INT(arg4);
 	Check_Type(arg5,T_STRING);
 	CheckDataSize(typein,format,heightin*widthin,arg5);
-	datain = RSTRING(arg5)->ptr;
+	datain = RSTRING_PTR(arg5);
 	widthout = (GLint)NUM2INT(arg6);
 	heightout = (GLint)NUM2INT(arg7);
 	typeout = (GLenum)NUM2INT(arg8);
 	ret = allocate_buffer_with_string(GetDataSize(typeout,format,widthout*heightout));
-	gluScaleImage(format, widthin, heightin, typein, datain,
-		widthout, heightout, typeout, (GLvoid*)RSTRING(ret)->ptr);
+	retcode = gluScaleImage(format, widthin, heightin, typein, datain,
+		widthout, heightout, typeout, (GLvoid*)RSTRING_PTR(ret));
+
+	check_for_gluerror(retcode);
+		
 	return ret;
 }
 
@@ -1338,6 +1427,7 @@ VALUE obj, arg1;
 	GLubyte* error;
 	errorCode = (GLenum)NUM2INT(arg1);
 	error = (GLubyte*)gluErrorString(errorCode);
+		
 	if (error)
 		return rb_str_new2((char *)error);
 	else
@@ -1351,6 +1441,7 @@ VALUE obj, arg1;
 	GLubyte* str;
 	name = (GLenum)NUM2INT(arg1);
 	str = (GLubyte*)gluGetString(name);
+		
 	if (str)
 		return rb_str_new2((char *)str);
 	else
@@ -1364,7 +1455,7 @@ DLLEXPORT void Init_glu()
 	callId = rb_intern("call");
 	refId = rb_intern("[]");
 	module = rb_define_module("Glu");
-	
+
 	glu_init_enums(module);
 	
 	rb_define_module_function(module, "gluNewNurbsRenderer", glu_NewNurbsRenderer, 0);
@@ -1421,7 +1512,11 @@ DLLEXPORT void Init_glu()
 	rb_define_module_function(module, "gluQuadricCallback", glu_QuadricCallback, 3);
 	rb_define_module_function(module, "gluNurbsCallback", glu_NurbsCallback, 3);
 
-	
+	Class_GLUError = rb_define_class_under(module, "Error", rb_eStandardError);
+
+	rb_define_method(Class_GLUError, "initialize", GLUError_initialize, 2);
+	rb_define_attr(Class_GLUError, "id", 1, 0);
+
 	cNurbs = rb_define_class("Nurbs", rb_cObject);
 	cTess = rb_define_class("Tess", rb_cObject);
 	cQuad = rb_define_class("Quadric", rb_cObject);