ruby-opengl 0.40.1 → 0.50.0

data/lib/opengl.rb

@@ -1,4 +1,5 @@
 #
+# 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.
@@ -13,9 +14,95 @@
 # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
 
+# This module provides access to the GL,GLU and GLUT methods and constants
+# in the way that they were available in previous versions of ruby-opengl.
+#
+# Thanks to Ilmari Heikkinen for a previous "reversed" version of this code,
+# and to Bill Kelly for a version before that one.
+
 require 'gl'
 require 'glu'
 require 'glut'
-require 'gl_prev'
-require 'glu_prev'
-require 'glut_prev'
+
+include Gl,Glu,Glut
+
+# (Gl.)glVertex -> GL.Vertex
+# (Gl::)GL_TRUE -> GL::TRUE
+module GL
+	extend self
+	include Gl
+	
+	Gl.constants.each do |cn|
+		n = cn.to_s.sub(/^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
+	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
+	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
+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
+end

data/test/tc_common.rb

@@ -14,9 +14,9 @@
 #
 
 if __FILE__ == $0
-    # If we are being called from the command line, e.g., ruby foo.rb, then
-    # fixup the load path so we can find the OpenGL extension libs
-    $: << File.join(File.dirname(__FILE__), '..', 'lib')
+	# If we are being called from the command line, e.g., ruby foo.rb, then
+	# fixup the load path so we can find the OpenGL extension libs
+	$: << File.join(File.dirname(__FILE__), '..', 'lib')
 end
 
 require 'test/unit'
@@ -28,11 +28,22 @@ include Glut
 $window_size = 512
 
 def glut_init()
-		glutInit
-    glutInitDisplayMode(GLUT_DEPTH | GLUT_DOUBLE | GLUT_RGBA | GLUT_STENCIL | GLUT_ACCUM | GLUT_ALPHA)
-	  glutInitWindowPosition(1, 1)
-	  glutInitWindowSize($window_size, $window_size)
-	  glutCreateWindow("test")
+	display_func = lambda do
+		raise
+	end
+
+	glutInit
+	glutInitDisplayMode(GLUT_DEPTH | GLUT_DOUBLE | GLUT_RGBA | GLUT_STENCIL | GLUT_ACCUM | GLUT_ALPHA)
+	glutInitWindowPosition(1, 1)
+	glutInitWindowSize($window_size, $window_size)
+	glutCreateWindow("test")
+	glutDisplayFunc(display_func)
+	# hack the need to call glutMainLoop on some implementations
+	begin
+		glutMainLoop()
+	rescue
+		# continue
+	end
 end
 
 def approx_equal(a,b,epsilon=0.01)
@@ -64,15 +75,17 @@ end
 def common_teardown
 	glPopAttrib()
 	glPopClientAttrib()
-	assert_equal(glGetError(),0) # all expected GL errors must be handled by the method itself
+	error = glGetError()
+	p gluErrorString(error)	if (error!=0)
+	assert_equal(error,0) # all expected GL errors must be handled by the method itself
 end
 
 def supported?(funcs)
-	funcs.each do |name|
+	Array(funcs).each do |name| # convert to array if it isn't already
 		if !Gl.is_available?(name)
-				puts ""				
-				puts "Function/extension #{name} not supported, test skipped"
-				return false
+			puts ""				
+			puts "#{name} not supported, test skipped"
+			return false
 		end
 	end
 	return true

data/test/tc_ext_arb.rb

@@ -0,0 +1,73 @@
+#
+# 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.
+#
+
+require 'test/unit'
+
+class Test_EXT_ARB < Test::Unit::TestCase
+	def setup
+		common_setup()
+	end
+
+	def teardown
+		common_teardown()
+	end
+
+	def test_gl_arb_transpose_matrix
+		return if not supported?("GL_ARB_transpose_matrix")
+		m_a = [[1.0,2.0,3.0,4.0],
+					 [0.0,2.0,0.0,0.0],
+					 [0.0,0.0,2.0,0.0],
+					 [0.0,0.0,0.0,2.0]]
+
+		m_b = [[1.0,2.0,3.0,4.0],
+					 [0.0,3.0,0.0,0.0],
+					 [0.0,0.0,3.0,0.0],
+					 [0.0,0.0,0.0,3.0]]
+
+		glMatrixMode(GL_MODELVIEW)
+		glLoadTransposeMatrixfARB(m_a)
+		assert_equal(glGetDoublev(GL_TRANSPOSE_MODELVIEW_MATRIX_ARB), m_a)
+
+		glLoadTransposeMatrixdARB(m_b)
+		assert_equal(glGetDoublev(GL_TRANSPOSE_MODELVIEW_MATRIX_ARB), m_b)
+
+		glLoadIdentity()
+		glMultTransposeMatrixfARB(m_a)
+		assert_equal(glGetDoublev(GL_TRANSPOSE_MODELVIEW_MATRIX_ARB), m_a)
+
+		glLoadIdentity()
+		glMultTransposeMatrixdARB(m_b)
+		assert_equal(glGetDoublev(GL_TRANSPOSE_MODELVIEW_MATRIX_ARB), m_b)
+	end
+
+	def test_gl_arb_multisample
+		return if not supported?("GL_ARB_multisample")
+		glSampleCoverageARB(0.5,GL_FALSE)
+		assert_equal(glGetFloatv(GL_SAMPLE_COVERAGE_VALUE_ARB),0.5)
+		assert_equal(glGetBooleanv(GL_SAMPLE_COVERAGE_INVERT_ARB),GL_FALSE)
+		glSampleCoverageARB(1.0,GL_TRUE)
+		assert_equal(glGetFloatv(GL_SAMPLE_COVERAGE_VALUE_ARB),1.0)
+		assert_equal(glGetBooleanv(GL_SAMPLE_COVERAGE_INVERT_ARB),GL_TRUE)
+	end
+
+	def test_gl_arb_color_buffer_float
+		return if not supported?("GL_ARB_color_buffer_float")
+		glClampColorARB(GL_CLAMP_VERTEX_COLOR_ARB,GL_FIXED_ONLY_ARB)
+		assert_equal(glGetIntegerv(GL_CLAMP_VERTEX_COLOR_ARB),GL_FIXED_ONLY_ARB)
+
+		glClampColorARB(GL_CLAMP_VERTEX_COLOR_ARB,GL_TRUE)
+		assert_equal(glGetIntegerv(GL_CLAMP_VERTEX_COLOR_ARB),GL_TRUE)
+	end
+end

data/test/tc_ext_ext.rb

@@ -0,0 +1,74 @@
+#
+# 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.
+#
+
+require 'test/unit'
+
+class Test_EXT_EXT < Test::Unit::TestCase
+	def setup
+		common_setup()
+	end
+
+	def teardown
+		common_teardown()
+	end
+
+	def test_gl_ext_framebuffer_object
+		return if not supported?("GL_EXT_framebuffer_object")
+		t = glGenTextures(3)
+		glBindTexture(GL_TEXTURE_2D, t[0])
+		glTexImage2D(GL_TEXTURE_2D,0,GL_RGBA8,$window_size,$window_size,0,GL_RGBA,GL_UNSIGNED_BYTE,nil)
+
+		glBindTexture(GL_TEXTURE_1D, t[1])
+		glTexImage1D(GL_TEXTURE_1D,0,GL_RGBA8,$window_size,0,GL_RGBA,GL_UNSIGNED_BYTE,nil)
+
+		glBindTexture(GL_TEXTURE_3D, t[2])
+		glTexImage3D(GL_TEXTURE_3D,0,GL_RGBA8,$window_size,$window_size,1,0,GL_RGBA,GL_UNSIGNED_BYTE,nil)
+
+		fb = glGenFramebuffersEXT(1)
+		assert(fb.size==1)
+		glBindFramebufferEXT(GL_FRAMEBUFFER_EXT,fb[0])
+		assert_equal(glIsFramebufferEXT(fb[0]),GL_TRUE)
+
+		rb = glGenRenderbuffersEXT(1)
+		assert(rb.size==1)
+		glBindRenderbufferEXT(GL_RENDERBUFFER_EXT,rb[0])
+		assert_equal(glIsRenderbufferEXT(rb[0]),GL_TRUE)
+
+		glRenderbufferStorageEXT(GL_RENDERBUFFER_EXT, GL_DEPTH_COMPONENT, $window_size, $window_size)
+
+		assert_equal(glGetRenderbufferParameterivEXT(GL_RENDERBUFFER_EXT,GL_RENDERBUFFER_WIDTH_EXT),$window_size)
+		assert_equal(glGetRenderbufferParameterivEXT(GL_RENDERBUFFER_EXT,GL_RENDERBUFFER_HEIGHT_EXT),$window_size)
+		assert_equal(glGetRenderbufferParameterivEXT(GL_RENDERBUFFER_EXT,GL_RENDERBUFFER_INTERNAL_FORMAT_EXT),GL_DEPTH_COMPONENT)
+
+
+		glFramebufferRenderbufferEXT(GL_FRAMEBUFFER_EXT, GL_DEPTH_ATTACHMENT_EXT, GL_RENDERBUFFER_EXT, rb[0]);
+		glFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT, GL_TEXTURE_2D, t[0], 0)
+
+		status = glCheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT)
+		assert(status == GL_FRAMEBUFFER_COMPLETE_EXT || status == GL_FRAMEBUFFER_UNSUPPORTED_EXT)
+
+		assert_equal(glGetFramebufferAttachmentParameterivEXT(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT, GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE_EXT),GL_TEXTURE)
+
+		glGenerateMipmapEXT(GL_TEXTURE_2D)
+
+		glFramebufferTexture1DEXT(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT, GL_TEXTURE_1D, t[1], 0)
+		glFramebufferTexture3DEXT(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT, GL_TEXTURE_3D, t[2], 0, 0)
+	
+		glDeleteRenderbuffersEXT(rb)
+		glDeleteFramebuffersEXT(fb)
+		glDeleteTextures(t)
+	end
+
+end

data/test/tc_func_12.rb

@@ -25,7 +25,7 @@ class Test_12 < Test::Unit::TestCase
 	end
 	
 	def test_glblend
-		return if not supported?(["glBlendColor","glBlendEquation"])
+		return if not supported?(1.2)
 		glBlendColor(0.0,1.0,0.0,1.0)
 		assert_equal(glGetDoublev(GL_BLEND_COLOR),[0,1,0,1])
 
@@ -36,7 +36,7 @@ class Test_12 < Test::Unit::TestCase
 	end
 	
 	def test_gldrawrangeelements
-		return if not supported?(["glDrawRangeElements"])
+		return if not supported?(1.2)
 		va = [0,0, 0,1, 1,1].pack("f*")
 		glVertexPointer(2,GL_FLOAT,0,va)
 
@@ -53,7 +53,7 @@ class Test_12 < Test::Unit::TestCase
 	end
 	
 	def test_colortable
-		return if not supported?(["glColorTable","glGetColorTable","glColorSubTable","glCopyColorTable","glCopyColorSubTable","glColorTableParameterfv","glColorTableParameteriv","glGetColorTableParameterfv","glGetColorTableParameteriv"])
+		return if not supported?(1.2)
 
 		ct = ([0]*3+[1]*3+[0]*3+[1]*3).pack("f*")
 		ct2 = ([1]*3+[0]*3+[1]*3+[0]*3).pack("f*")
@@ -79,7 +79,7 @@ class Test_12 < Test::Unit::TestCase
 	end
 
 	def test_convolutionfilter
-		return if not supported?(["glConvolutionFilter1D","glConvolutionFilter2D","glGetConvolutionFilter","glCopyConvolutionFilter1D","glCopyConvolutionFilter2D","glConvolutionParameterf","glConvolutionParameterfv","glConvolutionParameteri","glConvolutionParameteriv","glGetConvolutionParameterfv","glGetConvolutionParameteriv"])
+		return if not supported?(1.2)
 
 		cf = ([0]*3+[1]*3+[0]*3+[1]*3).pack("f*")
 		cf2 = ([1]*3+[0]*3+[1]*3+[0]*3).pack("f*")
@@ -114,7 +114,7 @@ class Test_12 < Test::Unit::TestCase
 	end
 
 	def test_separablefilter
-		return if not supported?(["glSeparableFilter2D","glGetSeparableFilter"])
+		return if not supported?(1.2)
 		sf_a = ([0]*3+[1]*3).pack("f*")
 		sf_b = ([1]*3+[0]*3).pack("f*")
 		
@@ -123,7 +123,7 @@ class Test_12 < Test::Unit::TestCase
 	end
 
 	def test_histogram
-		return if not supported?(["glHistogram","glGetHistogram","glResetHistogram","glGetHistogramParameterfv","glGetHistogramParameteriv"])
+		return if not supported?(1.2)
 
 		glEnable(GL_HISTOGRAM)
 
@@ -143,7 +143,7 @@ class Test_12 < Test::Unit::TestCase
 	end
 
 	def test_minmax
-		return if not supported?(["glMinmax","glGetMinmax","glResetMinmax","glGetMinmaxParameterfv","glGetMinmaxParameteriv"])
+		return if not supported?(1.2)
 
 		glEnable(GL_MINMAX)		
 
@@ -163,7 +163,7 @@ class Test_12 < Test::Unit::TestCase
 	end
 
 	def test_texture_3D
-		return if not supported?(["glTexImage3D","glTexSubImage3D","glCopyTexSubImage3D"])
+		return if not supported?(1.2)
 		image = ([0,0,0,1,1,1] * 2 * 2).pack("f*")
 		image2 = ([1,1,1,0,0,0] * 2 * 2).pack("f*")
 

data/test/tc_func_13.rb

@@ -25,7 +25,7 @@ class Test_13 < Test::Unit::TestCase
 	end
 
 	def test_glsamplecoverage
-		return if not supported?("glSampleCoverage")
+		return if not supported?(1.3)
 		glSampleCoverage(0.0,GL_TRUE)
 		assert_equal(glGetDoublev(GL_SAMPLE_COVERAGE_VALUE),0.0)
 		assert_equal(glGetDoublev(GL_SAMPLE_COVERAGE_INVERT),GL_TRUE)
@@ -35,7 +35,7 @@ class Test_13 < Test::Unit::TestCase
 	end
 
 	def test_multitexture
-		return if not supported?(["glActiveTexture","glClientActiveTexture"])
+		return if not supported?(1.3)
 		glActiveTexture(GL_TEXTURE1)
 		glClientActiveTexture(GL_TEXTURE2)
 		assert_equal(glGetIntegerv(GL_ACTIVE_TEXTURE),GL_TEXTURE1)
@@ -43,35 +43,36 @@ class Test_13 < Test::Unit::TestCase
 	end
 
 	def test_transposematrix
-		return if not supported?(["glLoadTransposeMatrixf","glLoadTransposeMatrixd","glMultTransposeMatrixf","glMultTransposeMatrixd"])
-		m_a = [[2.0,0.0,0.0,0.0],
+		return if not supported?(1.3)
+		m_a = [[1.0,2.0,3.0,4.0],
 					 [0.0,2.0,0.0,0.0],
 					 [0.0,0.0,2.0,0.0],
 					 [0.0,0.0,0.0,2.0]]
 
-		m_b = [[3.0,0.0,0.0,0.0],
+		m_b = [[1.0,2.0,3.0,4.0],
 					 [0.0,3.0,0.0,0.0],
 					 [0.0,0.0,3.0,0.0],
 					 [0.0,0.0,0.0,3.0]]
 
 		glMatrixMode(GL_MODELVIEW)
 		glLoadTransposeMatrixf(m_a)
-		assert_equal(glGetDoublev(GL_MODELVIEW_MATRIX), m_a)
+		assert_equal(glGetDoublev(GL_TRANSPOSE_MODELVIEW_MATRIX), m_a)
 
 		glLoadTransposeMatrixd(m_b)
-		assert_equal(glGetDoublev(GL_MODELVIEW_MATRIX), m_b)
+		assert_equal(glGetDoublev(GL_TRANSPOSE_MODELVIEW_MATRIX), m_b)
 
 		glLoadIdentity()
 		glMultTransposeMatrixf(m_a)
-		assert_equal(glGetDoublev(GL_MODELVIEW_MATRIX), m_a)
+		assert_equal(glGetDoublev(GL_TRANSPOSE_MODELVIEW_MATRIX), m_a)
 
 		glLoadIdentity()
 		glMultTransposeMatrixd(m_b)
-		assert_equal(glGetDoublev(GL_MODELVIEW_MATRIX), m_b)
+		assert_equal(glGetDoublev(GL_TRANSPOSE_MODELVIEW_MATRIX), m_b)
 	end
 	
 	def test_texturecompression
-		return if not supported?(["GL_EXT_texture_compression_s3tc","glCompressedTexImage1D","glCompressedTexImage2D","glCompressedTexImage3D","glCompressedTexSubImage1D","glCompressedTexSubImage2D","glCompressedTexSubImage3D"])
+		return if not supported?(1.3)
+		return if not supported?("GL_EXT_texture_compression_s3tc")
 
 		# S3TC/DXT5 compressed 2x2 pixels stipple patterns [w,b,b,w] and [b,w,w,b]
 		image_1 = [0xFF,0xFF,0x00,0x00,0x00,0x00,0x00,0x00,0xFF,0xFF,0x00,0x00,0x01,0x54,0x5C,0x5C].pack("C*")
@@ -122,10 +123,15 @@ class Test_13 < Test::Unit::TestCase
 		end
 		
 		glDeleteTextures(textures)
+
+		n = glGetIntegerv(GL_NUM_COMPRESSED_TEXTURE_FORMATS)
+		if (n>0)
+			assert_equal(glGetIntegerv(GL_COMPRESSED_TEXTURE_FORMATS).size,n)
+		end
 	end
 	
 	def test_glmultitexcoord
-		return if not supported?(["glMultiTexCoord1d"])
+		return if not supported?(1.3)
 	
 		glActiveTexture(GL_TEXTURE1)