ruby-opengl 0.50.0 → 0.60.0

data/examples/NeHe/nehe_lesson02.rb

@@ -94,7 +94,7 @@ end
 # Keyboard handler to exit when ESC is typed
 keyboard = lambda do |key, x, y|
     case(key)
-      when 27
+      when ?\e
           glutDestroyWindow(window)
           exit(0)
       end

data/examples/NeHe/nehe_lesson03.rb

@@ -99,7 +99,7 @@ end
 # Keyboard handler to exit when ESC is typed
 keyboard = lambda do |key, x, y|
     case(key)
-      when 27
+      when ?\e
           glutDestroyWindow(window)
           exit(0)
       end

data/examples/NeHe/nehe_lesson04.rb

@@ -110,7 +110,7 @@ end
 # Keyboard handler to exit when ESC is typed
 keyboard = lambda do |key, x, y|
     case(key)
-      when 27
+      when ?\e
           glutDestroyWindow($window)
           exit(0)
       end

data/examples/NeHe/nehe_lesson05.rb

@@ -163,7 +163,7 @@ end
 # Keyboard handler to exit when ESC is typed
 keyboard = lambda do |key, x, y|
     case(key)
-      when 27
+      when ?\e
           glutDestroyWindow($window)
           exit(0)
       end

data/examples/NeHe/nehe_lesson36.rb

@@ -58,7 +58,7 @@ end
 # Keyboard handler to exit when ESC is typed
 keyboard = lambda do |key, x, y|
 	case(key)
-		when 27
+		when ?\e
 			exit(0)
 	end
 	glutPostRedisplay

data/examples/OrangeBook/brick.rb

@@ -156,11 +156,11 @@ key = lambda do |key,x,y|
 	case(key)
 	when ?b
 		nextClearColor()
-	when ?q, 27 # esc
+	when ?q, ?\e # esc
 		exit(0)
 	when ?t
 		$gleModel << $gleModel.shift # rotate the array
-	when 32 # spacebar
+	when ?\s # space
 		$rotate = !$rotate
 
 		if ($rotate==false)
@@ -286,21 +286,12 @@ timer = lambda do |value|
 	glutTimerFunc(TIMER_FREQUENCY_MILLIS , timer, 0)
 end
 
-def printOpenGLError
-	glErr = glGetError()
-	if (glErr != GL_NO_ERROR)
-		puts "glError - #{gluErrorString(glErr)}"
-		raise
-	end
-end
-
 def getUniLoc(program, name)
 	loc = glGetUniformLocation(program, name)
 	
 	if (loc == -1)
 		puts "No such uniform named #{name}"
 	end
-	printOpenGLError()
 	return loc
 end
 
@@ -316,14 +307,12 @@ def installBrickShaders(vs_fname,fs_fname)
 	# Compile the brick vertex shader, and print out
 	#	the compiler log file.
 	glCompileShader(brickVS)
-	printOpenGLError()
   vertCompiled = glGetShaderiv(brickVS, GL_COMPILE_STATUS)
 	puts "Shader InfoLog:\n#{glGetShaderInfoLog(brickVS)}\n"
 	
 	# Compile the brick fragment shader, and print out
 	# the compiler log file.
 	glCompileShader(brickFS)
-	printOpenGLError()
   fragCompiled = glGetShaderiv(brickFS, GL_COMPILE_STATUS)
 	puts "Shader InfoLog:\n#{glGetShaderInfoLog(brickFS)}\n"
 	
@@ -333,8 +322,7 @@ def installBrickShaders(vs_fname,fs_fname)
 	glAttachShader(brickProg,brickVS)
 	glAttachShader(brickProg,brickFS)
 	# Link the program object and print out the info log
-	glLinkProgram(brickProg)	
-	printOpenGLError()
+	glLinkProgram(brickProg)
 	linked = glGetProgramiv(brickProg,GL_LINK_STATUS)
 	puts "Program InfoLog:\n#{glGetProgramInfoLog(brickProg)}\n"
 	return false if linked==0

data/examples/OrangeBook/particle.rb

@@ -74,14 +74,6 @@ $colors = []
 $velocities = []
 $startTimes = []
 
-def printOpenGLError
-	glErr = glGetError()
-	if (glErr != GL_NO_ERROR)
-		puts "glError - #{gluErrorString(glErr)}"
-		raise
-	end
-end
-
 def nextClearColor
 	glClearColor($clearColor[0][0],
 							 $clearColor[0][1],
@@ -96,7 +88,6 @@ def getUniLoc(program, name)
 	if (loc == -1)
 		puts "No such uniform named #{name}"
 	end
-	printOpenGLError()
 	return loc
 end
 
@@ -109,8 +100,6 @@ def updateAnim
 	end
 
 	glUniform1f(location,$particleTime)
-
-	printOpenGLError()
 end
 
 def drawPoints
@@ -175,9 +164,7 @@ end
 play = lambda do
 	thisTime = glutGet(GLUT_ELAPSED_TIME)
 	updateAnim()
-	printOpenGLError()
 	glutPostRedisplay()
-	printOpenGLError()
 end
 
 display = lambda do
@@ -204,9 +191,9 @@ key = lambda do |key,x,y|
 	case(key)
 	when ?b
 		nextClearColor()
-	when ?q, 27 # esc
+	when ?q, ?\e # esc
 		exit(0)
-	when 32 # spacebar
+	when ?\s # space
 		$rotate = !$rotate
 
 		if ($rotate==false)
@@ -344,14 +331,12 @@ def installParticleShaders(vs_name,fs_name)
 	# Compile the particle vertex shader, and print out
 	# the compiler log file.
 	glCompileShader($vertexShaderObject)
-	printOpenGLError()
   vertCompiled = glGetShaderiv($vertexShaderObject, GL_COMPILE_STATUS)
 	puts "Shader InfoLog:\n#{glGetShaderInfoLog($vertexShaderObject)}\n"
 
 	# Compile the particle fragment shader, and print out
 	# the compiler log file.
 	glCompileShader($fragmentShaderObject)
-	printOpenGLError()
   fragCompiled = glGetShaderiv($fragmentShaderObject, GL_COMPILE_STATUS)
 	puts "Shader InfoLog:\n#{glGetShaderInfoLog($fragmentShaderObject)}\n"
 
@@ -368,7 +353,6 @@ def installParticleShaders(vs_name,fs_name)
 
 	# Link the program object and print out the info log
 	glLinkProgram($programObject)
-	printOpenGLError()
 	linked = glGetProgramiv($programObject, GL_LINK_STATUS)
 	puts "Program InfoLog:\n#{glGetProgramInfoLog($programObject)}\n"
 
@@ -379,9 +363,7 @@ def installParticleShaders(vs_name,fs_name)
 
 	# Set up initial uniform values
 	glUniform4f(getUniLoc($programObject, "Background"), 0.0, 0.0, 0.0, 1.0)
-	printOpenGLError();
 	glUniform1f(getUniLoc($programObject, "Time"), -5.0)
-	printOpenGLError();
 
 	return true
 end

data/examples/RedBook/aapoly.rb

@@ -123,7 +123,7 @@ keyboard = proc do |key, x, y|
 		when ?t ,?T
 			$polySmooth = !$polySmooth
 			glutPostRedisplay()
-		when 27
+		when ?\e
 			exit(0)  # Escape key
 	end
 end

data/examples/RedBook/aargb.rb

@@ -95,11 +95,11 @@ end
 
 keyboard = Proc.new do |key, x, y|
 	case (key)
-		when 'r'[0],'R'[0]
+		when ?r,?R
 			$rotAngle = $rotAngle + 20.0
 			$rotAngle = 0.0 if ($rotAngle >= 360.0) 
 			glutPostRedisplay()
-		when 27  # Escape Key
+		when ?\e  # Escape Key
 			exit(0)
 	end
 end

data/examples/RedBook/accanti.rb

@@ -141,7 +141,7 @@ end
 
 keyboard = Proc.new do |key, x, y|
 	case (key)
-		when 27
+		when ?\e
 		exit(0);
 	end
 end

data/examples/RedBook/accpersp.rb

@@ -195,7 +195,7 @@ end
 
 keyboard = proc do |key, x, y|
    case (key)
-   when 27
+   when ?\e
      exit(0)
    end
 end

data/examples/RedBook/alpha.rb

@@ -100,10 +100,10 @@ end
 
 keyboard = Proc.new do|key, x, y|
 	case (key)
-		when 't'[0],'T'[0]
+		when ?t,?T
 			$leftFirst = !$leftFirst
 			glutPostRedisplay()	
-		when 27  # Escape key
+		when ?\e  # Escape key
 			exit(0)
 	end
 end

data/examples/RedBook/alpha3D.rb

@@ -141,7 +141,7 @@ keyboard = proc do |key, x, y|
 			$solidZ = MAXZ
 			$transparentZ = MINZ
 			glutPostRedisplay()
-		when 27
+		when ?\e
 			exit(0)
 	end
 end

data/examples/RedBook/bezcurve.rb

@@ -88,7 +88,7 @@ end
 
 keyboard = proc do |key, x, y|
 	case (key)
-	when 27
+	when ?\e
 		exit(0)
 	end
 end

data/examples/RedBook/bezmesh.rb

@@ -120,7 +120,7 @@ end
 
 keyboard = Proc.new do |key, x, y|
 	case (key)
-		when 27
+		when ?\e
 			exit(0);
 	end
 end

data/examples/RedBook/checker.rb

@@ -107,7 +107,7 @@ end
 
 keyboard = Proc.new do |key, x, y|
 	case (key)
-		when 27
+		when ?\e
 		exit(0)
 	end
 end

data/examples/RedBook/clip.rb

@@ -78,7 +78,7 @@ end
 
 keyboard = Proc.new do |key, x, y|
 	case (key)
-		when 27
+		when ?\e
 			exit(0)
 	end
 end

data/examples/RedBook/colormat.rb

@@ -117,7 +117,7 @@ end
 
 keyboard = Proc.new do |key, x, y|
 	case (key)
-		when 27
+		when ?\e
 			exit(0)
 	end
 end

data/examples/RedBook/cube.rb

@@ -53,7 +53,7 @@ end
 
 keyboard = Proc.new do |key, x, y|
 	case (key)
-		when 27
+		when ?\e
 		exit(0);
 	end
 end

data/examples/RedBook/depthcue.rb

@@ -81,7 +81,7 @@ end
 
 keyboard = Proc.new do |key, x, y|
 	case (key)
-		when 27
+		when ?\e
 		exit(0)
 	end
 end

data/examples/RedBook/dof.rb

@@ -184,7 +184,7 @@ end
 
 keyboard = proc do |key, x, y|
 	case (key)
-		when 27
+		when ?\e
 		exit(0)
 	end
 end

data/examples/RedBook/double.rb

@@ -85,7 +85,7 @@ end
 
 keyboard = Proc.new do |key, x, y|
 	case (key)
-		when 27
+		when ?\e
 		exit(0)
 	end
 end

data/examples/RedBook/drawf.rb

@@ -71,7 +71,7 @@ end
 
 keyboard = Proc.new do |key, x, y|
 	case (key)
-		when 27
+		when ?\e
 			exit(0)
 	end
 end

data/examples/RedBook/feedback.rb

@@ -129,7 +129,7 @@ end
 
 keyboard = proc do |key, x, y|
 	case (key)
-		when 27
+		when ?\e
 		exit(0)
 	end
 end

data/examples/RedBook/fog.rb

@@ -140,7 +140,7 @@ end
 
 keyboard = Proc.new do |key, x, y|
 	case (key)
-		when 27
+		when ?\e
 		exit(0)
 	end
 end

data/examples/RedBook/font.rb

@@ -100,7 +100,7 @@ end
 def printString(s)
 	glPushAttrib(GL_LIST_BIT)
 	glListBase($fontOffset)
-	glCallLists(s)
+	glCallLists(GL_BYTE,s)
 	glPopAttrib()
 end
 
@@ -131,7 +131,7 @@ end
 
 keyboard = proc do |key, x, y|
 	case (key)
-		when 27
+		when ?\e
 			exit(0)
 	end
 end

data/examples/RedBook/hello.rb

@@ -63,7 +63,7 @@ end
 
 keyboard = Proc.new do |key, x, y|
 	case (key)
-		when 27
+		when ?\e
 		exit(0);
 	end
 end

data/examples/RedBook/image.rb

@@ -103,23 +103,23 @@ end
 
 keyboard = Proc.new do |key, x, y|
 	case (key)
-		when 'r'[0],'R'[0]
+		when ?r,?R
 			$zoomFactor = 1.0
 			glutPostRedisplay()
 			printf("zoomFactor reset to 1.0\n")
-		when 'z'[0]
+		when ?z
 			$zoomFactor = $zoomFactor + 0.5
 			if ($zoomFactor >= 3.0) 
 				$zoomFactor = 3.0
 			end
 			printf("zoomFactor is now %4.1f\n", $zoomFactor)
-		when 'Z'[0]
+		when ?Z
 			$zoomFactor = $zoomFactor - 0.5
 			if ($zoomFactor <= 0.5) 
 				$zoomFactor = 0.5
 			end
 			printf("zoomFactor is now %4.1f\n", $zoomFactor)
-		when 27
+		when ?\e
 			exit(0)
 	end
 end

data/examples/RedBook/lines.rb

@@ -111,7 +111,7 @@ end
 
 keyboard = Proc.new do |key, x, y|
 	case (key)
-		when 27
+		when ?\e
 			exit(0)
 	end
 end