ruby-opengl 0.33.0 → 0.40.0

data/ext/gl/gl-2.1.c

@@ -0,0 +1,154 @@
+/*
+ * Copyright (C) 2007 Jan Dvorak <jan.dvorak@kraxnet.cz>
+ *
+ * This program is distributed under the terms of the MIT license.
+ * See the included MIT-LICENSE file for the terms of this license.
+ *
+ * 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.
+ */
+
+#ifdef __APPLE__
+#include <OpenGL/gl.h>
+#elif defined WIN32
+#include <windows.h>
+#include <GL/gl.h>
+#else
+#include <GL/gl.h>
+#endif
+#include "../common/common.h"
+
+static void (APIENTRY * fptr_glUniformMatrix2x3fv)(GLint,GLsizei,GLboolean,GLfloat *);
+static VALUE
+gl_UniformMatrix2x3fv(obj,arg1,arg2,arg3,arg4)
+VALUE obj,arg1,arg2,arg3,arg4;
+{
+	GLint location;
+	GLsizei count;
+	GLboolean transpose;
+	GLfloat *value;	
+	LOAD_GL_FUNC(glUniformMatrix2x3fv)
+	location = (GLint)NUM2INT(arg1);
+	count = (GLint)NUM2INT(arg2);
+	transpose = (GLboolean)NUM2INT(arg3);
+	value = ALLOC_N(GLfloat, 2*3*count);
+	ary2cflt(arg4,value,2*3*count);
+	fptr_glUniformMatrix2x3fv(location,count,transpose,value);
+	xfree(value);
+	return Qnil;
+}
+
+static void (APIENTRY * fptr_glUniformMatrix3x2fv)(GLint,GLsizei,GLboolean,GLfloat *);
+static VALUE
+gl_UniformMatrix3x2fv(obj,arg1,arg2,arg3,arg4)
+VALUE obj,arg1,arg2,arg3,arg4;
+{
+	GLint location;
+	GLsizei count;
+	GLboolean transpose;
+	GLfloat *value;	
+	LOAD_GL_FUNC(glUniformMatrix3x2fv)
+	location = (GLint)NUM2INT(arg1);
+	count = (GLint)NUM2INT(arg2);
+	transpose = (GLboolean)NUM2INT(arg3);
+	value = ALLOC_N(GLfloat, 3*2*count);
+	ary2cflt(arg4,value,3*2*count);
+	fptr_glUniformMatrix3x2fv(location,count,transpose,value);
+	xfree(value);
+	return Qnil;
+}
+
+static void (APIENTRY * fptr_glUniformMatrix2x4fv)(GLint,GLsizei,GLboolean,GLfloat *);
+static VALUE
+gl_UniformMatrix2x4fv(obj,arg1,arg2,arg3,arg4)
+VALUE obj,arg1,arg2,arg3,arg4;
+{
+	GLint location;
+	GLsizei count;
+	GLboolean transpose;
+	GLfloat *value;	
+	LOAD_GL_FUNC(glUniformMatrix2x4fv)
+	location = (GLint)NUM2INT(arg1);
+	count = (GLint)NUM2INT(arg2);
+	transpose = (GLboolean)NUM2INT(arg3);
+	value = ALLOC_N(GLfloat, 2*4*count);
+	ary2cflt(arg4,value,2*4*count);
+	fptr_glUniformMatrix2x4fv(location,count,transpose,value);
+	xfree(value);
+	return Qnil;
+}
+
+static void (APIENTRY * fptr_glUniformMatrix4x2fv)(GLint,GLsizei,GLboolean,GLfloat *);
+static VALUE
+gl_UniformMatrix4x2fv(obj,arg1,arg2,arg3,arg4)
+VALUE obj,arg1,arg2,arg3,arg4;
+{
+	GLint location;
+	GLsizei count;
+	GLboolean transpose;
+	GLfloat *value;	
+	LOAD_GL_FUNC(glUniformMatrix4x2fv)
+	location = (GLint)NUM2INT(arg1);
+	count = (GLint)NUM2INT(arg2);
+	transpose = (GLboolean)NUM2INT(arg3);
+	value = ALLOC_N(GLfloat, 4*2*count);
+	ary2cflt(arg4,value,4*2*count);
+	fptr_glUniformMatrix4x2fv(location,count,transpose,value);
+	xfree(value);
+	return Qnil;
+}
+
+static void (APIENTRY * fptr_glUniformMatrix3x4fv)(GLint,GLsizei,GLboolean,GLfloat *);
+static VALUE
+gl_UniformMatrix3x4fv(obj,arg1,arg2,arg3,arg4)
+VALUE obj,arg1,arg2,arg3,arg4;
+{
+	GLint location;
+	GLsizei count;
+	GLboolean transpose;
+	GLfloat *value;	
+	LOAD_GL_FUNC(glUniformMatrix3x4fv)
+	location = (GLint)NUM2INT(arg1);
+	count = (GLint)NUM2INT(arg2);
+	transpose = (GLboolean)NUM2INT(arg3);
+	value = ALLOC_N(GLfloat, 3*4*count);
+	ary2cflt(arg4,value,3*4*count);
+	fptr_glUniformMatrix3x4fv(location,count,transpose,value);
+	xfree(value);
+	return Qnil;
+}
+
+static void (APIENTRY * fptr_glUniformMatrix4x3fv)(GLint,GLsizei,GLboolean,GLfloat *);
+static VALUE
+gl_UniformMatrix4x3fv(obj,arg1,arg2,arg3,arg4)
+VALUE obj,arg1,arg2,arg3,arg4;
+{
+	GLint location;
+	GLsizei count;
+	GLboolean transpose;
+	GLfloat *value;	
+	LOAD_GL_FUNC(glUniformMatrix4x3fv)
+	location = (GLint)NUM2INT(arg1);
+	count = (GLint)NUM2INT(arg2);
+	transpose = (GLboolean)NUM2INT(arg3);
+	value = ALLOC_N(GLfloat, 4*3*count);
+	ary2cflt(arg4,value,4*3*count);
+	fptr_glUniformMatrix4x3fv(location,count,transpose,value);
+	xfree(value);
+	return Qnil;
+}
+
+void gl_init_functions_2_1(VALUE module)
+{
+	rb_define_module_function(module, "glUniformMatrix2x3fv", gl_UniformMatrix2x3fv, 4);
+	rb_define_module_function(module, "glUniformMatrix3x2fv", gl_UniformMatrix3x2fv, 4);
+	rb_define_module_function(module, "glUniformMatrix2x4fv", gl_UniformMatrix2x4fv, 4);
+	rb_define_module_function(module, "glUniformMatrix4x2fv", gl_UniformMatrix4x2fv, 4);
+	rb_define_module_function(module, "glUniformMatrix3x4fv", gl_UniformMatrix3x4fv, 4);
+	rb_define_module_function(module, "glUniformMatrix4x3fv", gl_UniformMatrix4x3fv, 4);
+}

data/ext/gl/gl-enums.c

@@ -22,8 +22,7 @@
 #else
 #include <GL/gl.h>
 #endif
-#include "../common/rbogl.h"
-#include "../common/gl-enums.h"
+#include "../common/common.h"
 
 void gl_init_enums(VALUE module)
 {

data/ext/gl/gl.c

@@ -14,18 +14,74 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include <ruby.h>
+#ifdef __APPLE__
+#include <OpenGL/gl.h>
+#elif defined WIN32
+#include <windows.h>
+#include <GL/gl.h>
+#else
+#include <GL/gl.h>
+#endif
+#include "../common/common.h"
+
+#ifdef WIN32
+#define DLLEXPORT __declspec(dllexport)
+#else
+#define DLLEXPORT
+#endif
 
 static VALUE module;
 
 void gl_init_enums(VALUE);
 void gl_init_functions_1_0__1_1(VALUE);
 void gl_init_functions_1_2(VALUE);
+void gl_init_functions_1_3(VALUE);
+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 Init_gl()
+VALUE IsFunctionAvailable(char *name)
+{
+	GLvoid *ret;
+	ret = load_gl_function(name,0); /* won't raise */
+	if (ret==NULL)
+		return Qfalse;
+	else
+		return Qtrue;
+}
+
+static VALUE
+IsAvailable(obj,arg1)
+VALUE obj,arg1;
+{
+	char *name = RSTRING(arg1)->ptr;
+	Check_Type(arg1, T_STRING);
+	if (name && name[0] && (name[0]=='G' || name[0]=='W')) { /* GL_, GLX_, WGL_ extension */
+		char buf[512+128];
+		if (strlen(name)>(512))
+			return Qfalse;
+		if (glGetString(GL_EXTENSIONS)==0)
+			return Qfalse;
+
+		sprintf(buf,"Gl.glGetString(Gl::GL_EXTENSIONS).split(' ').include?('%s')", name);
+		return rb_eval_string(buf);
+	} else { /* function */
+		return IsFunctionAvailable(name);
+	}
+}
+
+DLLEXPORT void Init_gl()
 {
     module = rb_define_module("Gl");
 	gl_init_enums(module);
 	gl_init_functions_1_0__1_1(module);
 	gl_init_functions_1_2(module);
+	gl_init_functions_1_3(module);
+	gl_init_functions_1_4(module);
+	gl_init_functions_1_5(module);
+	gl_init_functions_2_0(module);
+	gl_init_functions_2_1(module);
+
+	rb_define_module_function(module, "is_available?", IsAvailable, 1);
 }

data/ext/gl/mkrf_conf.rb

@@ -15,12 +15,15 @@
 
 require 'rubygems'
 require 'mkrf'
+require 'rbconfig'
 
 Mkrf::Generator.new( 'gl' ) do |g|
-    g.objects << '../common/rbogl.o'
     case RUBY_PLATFORM
     when /darwin/
         g.ldshared << ' -framework OpenGL'
+    when /mswin32/
+        g.cflags << ' -DWIN32'
+        g.include_library( 'opengl32.lib', 'glVertex3d')
     else
         g.include_library( 'GL', 'glVertex3d')
     end

data/ext/glu/glu.c

@@ -30,11 +30,13 @@
 #endif
 
 #include <ruby.h>
-#include "../common/rbogl.h"
+#include "../common/common.h"
 
 #ifdef WIN32
+#define DLLEXPORT __declspec(dllexport)
 typedef void (CALLBACK*(VOIDFUNC))();
 #else
+#define DLLEXPORT
 typedef void (*VOIDFUNC)();
 #endif
 
@@ -1448,12 +1450,11 @@ static VALUE module;
 #define GLU_ERROR                          100103
 #endif
 
-
-void Init_glu()
+DLLEXPORT void Init_glu()
 {
     callId = rb_intern("call");
     refId = rb_intern("[]");
-    module = rb_define_module("GLU");
+    module = rb_define_module("Glu");
     rb_define_module_function(module, "gluNewNurbsRenderer", glu_NewNurbsRenderer, 0);
     rb_define_module_function(module, "gluDeleteNurbsRenderer", glu_DeleteNurbsRenderer, 1);
     rb_define_module_function(module, "gluNurbsProperty", glu_NurbsProperty, 3);

data/ext/glu/mkrf_conf.rb

@@ -17,10 +17,13 @@ require 'rubygems'
 require 'mkrf'
 
 Mkrf::Generator.new( 'glu' ) do |g|
-    g.objects << '../common/rbogl.o'
     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.include_library( 'GLU', 'gluLookAt' )
         g.include_library( 'GL', 'glVertex3d')

data/ext/glut/glut.c

@@ -35,6 +35,12 @@
 
 #include <ruby.h>
 
+#ifdef WIN32
+#define DLLEXPORT __declspec(dllexport)
+#else
+#define DLLEXPORT
+#endif
+
 static int callId; /* 'call' method id */
 
 /* callback define macro */
@@ -1484,7 +1490,7 @@ VALUE obj;
 
 static VALUE module;
 
-void Init_glut()
+DLLEXPORT void Init_glut()
 {
     module = rb_define_module("Glut");
 

data/ext/glut/mkrf_conf.rb

@@ -20,6 +20,11 @@ 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' )

data/lib/gl_prev.rb

@@ -18,14 +18,15 @@
 # Thanks to Ilmari Heikkinen for a previous "reversed" version of this code,
 # and to Bill Kelly for a version before that one.
 
-require '../ext/gl/gl'
+require 'gl'
 
 module GL
     extend self
     include Gl
 
     Gl.constants.each do |cn|
-        n = cn.sub(/^GL_/,'')
+        n = cn.to_s.sub(/^GL_/,'')
+	next if n =~ /^[0-9]/
         begin
             const_set( n, Gl.const_get( cn ) )
         rescue
@@ -34,7 +35,7 @@ module GL
     end
 
     Gl.methods( false ).each do |mn|
-        n = mn.sub(/^gl/,'')
+        n = mn.to_s.sub(/^gl/,'')
         begin
             alias_method( n, mn )
             public( n )

data/lib/glu_prev.rb

@@ -18,14 +18,15 @@
 # Thanks to Ilmari Heikkinen for a previous "reversed" version of this code,
 # and to Bill Kelly for a version before that one.
 
-require '../ext/glu/glu'
+require 'gl'
+require 'glu'
 
 module GLU
     extend self
     include Glu
 
     Glu.constants.each do |cn|
-        n = cn.sub(/^GLU_/,'')
+        n = cn.to_s.sub(/^GLU_/,'')
         begin
             const_set( n, Glu.const_get( cn ) )
         rescue
@@ -34,7 +35,7 @@ module GLU
     end
 
     Glu.methods( false ).each do |mn|
-        n = mn.sub(/^glu/,'')
+        n = mn.to_s.sub(/^glu/,'')
         begin
             alias_method( n, mn )
             public( n )

data/lib/glut_prev.rb

@@ -18,14 +18,14 @@
 # Thanks to Ilmari Heikkinen for a previous "reversed" version of this code,
 # and to Bill Kelly for a version before that one.
 
-require '../ext/glut/glut'
+require 'glut'
 
 module GLUT
     extend self
     include Glut
 
     Glut.constants.each do |cn|
-        n = cn.sub(/^GLUT_/,'')
+        n = cn.to_s.sub(/^GLUT_/,'')
         begin
             const_set( n, Glut.const_get( cn ) )
         rescue
@@ -34,7 +34,7 @@ module GLUT
     end
 
     Glut.methods( false ).each do |mn|
-        n = mn.sub(/^glut/,'')
+        n = mn.to_s.sub(/^glut/,'')
         begin
             alias_method( n, mn )
             public( n )

data/{examples/all_tests.rb → lib/opengl.rb}

@@ -1,6 +1,5 @@
-#!/usr/bin/ruby -w
-#--
-# Copyright (C) 2006 Peter McLain <peter.mclain@gmail.com>
+#
+# Copyright (C) 2007 Jan Dvorak <jan.dvorak@kraxnet.cz>
 #
 # This program is distributed under the terms of the MIT license.
 # See the included MIT-LICENSE file for the terms of this license.
@@ -12,13 +11,11 @@
 # 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.
-#++
+#
 
-# Run all of *.rb files in the current directory
-this_file_name = File.basename( __FILE__ )
-Dir['*.rb'].each do |f|
-    f.strip!
-    next if f == this_file_name
-    puts "\n=== running #{f}"
-    system "ruby #{f}"
-end
+require 'gl'
+require 'glu'
+require 'glut'
+require 'gl_prev'
+require 'glu_prev'
+require 'glut_prev'