opengl 0.8.0 → 0.9.0

data/examples/misc/OGLBench.rb

@@ -14,6 +14,8 @@
 module OGLBench
 
 require 'opengl'
+require 'glu'
+require 'glut'
 include Gl,Glu,Glut
 
 require 'getoptlong'
@@ -132,39 +134,39 @@ $KNOWN_RES = {
     'whuxga'    => [ 7680, 4800, 'Wide Hexadecatuple Ultra XGA' ],
 }
 
-def OGLBench.w_h_from_geometry(geom) 
-	geometry = geom.downcase
+def OGLBench.w_h_from_geometry(geom)
+  geometry = geom.downcase
 
-	return $~[1,2] if geometry =~ /^(\d+)x(\d+)$/
+  return $~[1,2] if geometry =~ /^(\d+)x(\d+)$/
 
   dims = $KNOWN_RES[geometry] || [0, 0]
-	dims[0,2]
+  dims[0,2]
 end
 
-def OGLBench.show_known_geometries 
-	puts "Known geometries:"
+def OGLBench.show_known_geometries
+  puts "Known geometries:"
 
-	# convert the hash to array, sort by resolution and iterate
-	$KNOWN_RES.sort {|a,b| a[1][0,2] <=> b[1][0,2] }.each do |row|
-		name, res = row
-		x,y,fullname = res
-		printf "%-10s  %4d x %4d  %s\n", name, x, y, fullname
-	end
+  # convert the hash to array, sort by resolution and iterate
+  $KNOWN_RES.sort {|a,b| a[1][0,2] <=> b[1][0,2] }.each do |row|
+    name, res = row
+    x,y,fullname = res
+    printf "%-10s  %4d x %4d  %s\n", name, x, y, fullname
+  end
 end
 
 def OGLBench.show_usage(conf = $CACHED[:conf])
-	usage = conf[:usage]
+  usage = conf[:usage]
 
-	if (not conf[:extra_usage].empty?)
-		conf[:_USAGE_LABEL_GENERAL] = "\nGENERAL OPTIONS:"
-		usage = "#{conf[:usage]}\nOTHER OPTIONS:\n#{conf[:extra_usage]}"
-	else
-		conf[:_USAGE_LABEL_GENERAL] = ''
-	end
+  if (not conf[:extra_usage].empty?)
+    conf[:_USAGE_LABEL_GENERAL] = "\nGENERAL OPTIONS:"
+    usage = "#{conf[:usage]}\nOTHER OPTIONS:\n#{conf[:extra_usage]}"
+  else
+    conf[:_USAGE_LABEL_GENERAL] = ''
+  end
 
-	usage.gsub!(/\$(\w+)/) do conf[$1.to_sym] end
+  usage.gsub!(/\$(\w+)/) do conf[$1.to_sym] end
 
-	print usage
+  print usage
 end
 
 def OGLBench.show_basic_config(conf,gl_info,version)
@@ -181,11 +183,11 @@ CONFIG
 end
 
 def OGLBench.friendly_booleans(conf)
-	booleans = conf[:booleans].update(conf[:extra_booleans])
+  booleans = conf[:booleans].update(conf[:extra_booleans])
 
-	booleans.each_pair do	|logical,readable|
-		conf[readable] = (conf[logical] ? 'yes' : 'no')
-	end
+  booleans.each_pair do  |logical,readable|
+    conf[readable] = (conf[logical] ? 'yes' : 'no')
+  end
 end
 
 def OGLBench.basic_init(extra_conf = nil,extra_options = nil)
@@ -207,131 +209,130 @@ USAGE
 #  show_usage(conf)
 # FIXME: $0 ?
 
-	conf = {
-		:title       => 'Ruby-OpenGL Benchmark',
-		:usage       => usage,
-		:extra_usage => '',
-		"0".to_sym   => $0,
-	
-		:frames      => 100,
-		:seconds     => 10,
-		:geometry    => '300x300',
-		
-		:fullscreen  => false,
-		:known       => false,
-		:help        => false,
-		
-		:booleans    => {
-				:fullscreen => :fs,
-				:known      => :show_known,
-				:help       => :show_help,
-		},
-		:extra_booleans => {},
-	}
-
-	conf.update(extra_conf) if extra_conf
-
-	opts = GetoptLong.new(
-		[ "--frames", "-f", GetoptLong::REQUIRED_ARGUMENT ],
-		[ "--seconds", "-s", GetoptLong::REQUIRED_ARGUMENT ],
-		[ "--geometry", "-g", GetoptLong::REQUIRED_ARGUMENT ],
-		[ "--fullscreen", "--fs", GetoptLong::NO_ARGUMENT ],
-		[ "--known", "-k","--known-geometries", GetoptLong::NO_ARGUMENT ],
-		[ "--help", "-h",  "-?", GetoptLong::NO_ARGUMENT ]
-	)
-
-	opts.each do |opt, arg|
-		name = opt.tr('-','')
-		if arg.empty?
-			conf[name.to_sym] = true
-		else
-			conf[name.to_sym] = arg 
-		end
-	end
-
-	friendly_booleans(conf)
+  conf = {
+    :title       => 'Ruby-OpenGL Benchmark',
+    :usage       => usage,
+    :extra_usage => '',
+    "0".to_sym   => $0,
+
+    :frames      => 100,
+    :seconds     => 10,
+    :geometry    => '300x300',
+
+    :fullscreen  => false,
+    :known       => false,
+    :help        => false,
+
+    :booleans    => {
+        :fullscreen => :fs,
+        :known      => :show_known,
+        :help       => :show_help,
+    },
+    :extra_booleans => {},
+  }
+
+  conf.update(extra_conf) if extra_conf
+
+  opts = GetoptLong.new(
+    [ "--frames", "-f", GetoptLong::REQUIRED_ARGUMENT ],
+    [ "--seconds", "-s", GetoptLong::REQUIRED_ARGUMENT ],
+    [ "--geometry", "-g", GetoptLong::REQUIRED_ARGUMENT ],
+    [ "--fullscreen", "--fs", GetoptLong::NO_ARGUMENT ],
+    [ "--known", "-k","--known-geometries", GetoptLong::NO_ARGUMENT ],
+    [ "--help", "-h",  "-?", GetoptLong::NO_ARGUMENT ]
+  )
+
+  opts.each do |opt, arg|
+    name = opt.tr('-','')
+    if arg.empty?
+      conf[name.to_sym] = true
+    else
+      conf[name.to_sym] = arg
+    end
+  end
+
+  friendly_booleans(conf)
 
 
   geometry  = conf[:geometry]
   w,h = w_h_from_geometry(geometry)
-	conf[:width] = w.to_i
-	conf[:height] = h.to_i
+  conf[:width] = w.to_i
+  conf[:height] = h.to_i
 
-	$stdout.sync = true
+  $stdout.sync = true
 
-	if (conf[:help])
-		show_usage(conf)
-		exit(0)
-	end
+  if (conf[:help])
+    show_usage(conf)
+    exit(0)
+  end
 
-	if (conf[:known])
-		show_known_geometries()
-		exit(0)
-	end
+  if (conf[:known])
+    show_known_geometries()
+    exit(0)
+  end
 
 
-	app = init_opengl(conf)
-	gl_info = get_gl_info(app)
+  app = init_opengl(conf)
+  gl_info = get_gl_info(app)
 
-	[conf, app, gl_info]
+  [conf, app, gl_info]
 end
 
 
 def OGLBench.init_opengl(conf)
-	w,h = conf[:width], conf[:height]
+  w,h = conf[:width], conf[:height]
 
-	raise "Could not determine sane width and height from '#{conf[:geometry]}'.\n" 	unless w > 0 && h > 0;
+  raise "Could not determine sane width and height from '#{conf[:geometry]}'.\n"   unless w > 0 && h > 0;
 
-	glutInit()
-	glutInitDisplayMode(GLUT_RGB | GLUT_DEPTH)
-	glutInitWindowSize(w,h)
-	app = glutCreateWindow(conf[:title])
-	glViewport(0, 0, w, h)
+  glutInit()
+  glutInitDisplayMode(GLUT_RGB | GLUT_DEPTH)
+  glutInitWindowSize(w,h)
+  app = glutCreateWindow(conf[:title])
+  glViewport(0, 0, w, h)
 
-	glMatrixMode(GL_PROJECTION)
-	glLoadIdentity
+  glMatrixMode(GL_PROJECTION)
+  glLoadIdentity
 
-	glMatrixMode(GL_MODELVIEW)
-	glLoadIdentity
+  glMatrixMode(GL_MODELVIEW)
+  glLoadIdentity
 
-	$CACHED[:conf] = conf
-	$CACHED[:app] = app
+  $CACHED[:conf] = conf
+  $CACHED[:app] = app
 
-	app
+  app
 end
 
 def OGLBench.get_gl_info(app = $CACHED[:app])
-	gl_info = {}
+  gl_info = {}
 
-	# These values are faked
-	conf = $CACHED[:conf]
-	gl_info[:r] = 8
-	gl_info[:g] = 8
-	gl_info[:b] = 8
-	gl_info[:a] = 0
-	gl_info[:d] = 24
+  # These values are faked
+  conf = $CACHED[:conf]
+  gl_info[:r] = 8
+  gl_info[:g] = 8
+  gl_info[:b] = 8
+  gl_info[:a] = 0
+  gl_info[:d] = 24
 
-	$CACHED[:gl_info] = gl_info
+  $CACHED[:gl_info] = gl_info
 
-	gl_info
+  gl_info
 end
 
 def OGLBench.fade_to_white(frac)
-	glColor4f(frac, frac, frac, 1)
-	glClearColor(frac, frac, frac, 1)
-	glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT)
-	glFinish
+  glColor4f(frac, frac, frac, 1)
+  glClearColor(frac, frac, frac, 1)
+  glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT)
+  glFinish
 end
 
 def OGLBench.draw_string(font_style,str,x,y)
   glRasterPos2i(x,y)
-	str.each_byte do |char|
+  str.each_byte do |char|
     glutBitmapCharacter(font_style, char)
-	end
+  end
 end
 
 # def init_bitmap_font
 # def texture_from_texels
 
 end # end module
-	

data/examples/misc/anisotropic.rb

@@ -18,165 +18,167 @@
 #
 
 require 'opengl'
+require 'glu'
+require 'glut'
 include Gl,Glu,Glut
 
 # extend Array class with new function
 class Array
-	def rotate!
-		self << self.shift
-	end
+  def rotate!
+    self << self.shift
+  end
 end
 
 class App
-	@@filters = [[GL_NEAREST,"None"],[GL_LINEAR_MIPMAP_NEAREST,"Bilinear"],[GL_LINEAR_MIPMAP_LINEAR,"Trilinear"]]
-	@@anisotropy = [1,2,4,8,16,32]
-	@@color_tint = ["Off","On"]
-
-	def checker_texture(size,divide,color_a,color_b)
-		strip_a = color_a * (size/divide)
-		strip_b = color_b * (size/divide)
-		line_strip_a = (strip_a + strip_b) * (size/2)
-		line_strip_b = (strip_b + strip_a) * (size/2)
-		(line_strip_a + line_strip_b) * (divide/2)
-	end
-
-	def printGlutBitmapFont(string, font, x,y, r,g,b)
-		glDisable(GL_TEXTURE_2D)
-		glColor3f(r, g, b)
-		glRasterPos2i(x, y)
-		string.each_byte do |x|
-			glutBitmapCharacter(font, x)
-		end
-	end
-
-	def ortho(w,h)
-		glMatrixMode(GL_PROJECTION)
-		glLoadIdentity()
-		gluOrtho2D(0,w,0,h)
-		glScalef(1,-1,1)
-		glTranslatef(0,-h,0)
-	
-		glMatrixMode(GL_MODELVIEW)
-		glLoadIdentity()
-	end
-
-	def persp(w,h)
-		glMatrixMode(GL_PROJECTION)
-		glLoadIdentity
-		gluPerspective(90,w.to_f/h.to_f,1,100)
-
-		glMatrixMode(GL_MODELVIEW)
-		glLoadIdentity
-	end
-
-	def reshape(w,h)
-		@@w,@@h = w,h
-		glViewport(0, 0, w, h)
-		persp(w,h)
-	end
-
-	def initialize
-		if (not Gl.is_available?("GL_EXT_texture_filter_anisotropic"))
-			puts "This program needs GL_EXT_texture_filter_anisotropic extension"
-			exit
-		end
-		@@w,@@h = glutGet(GLUT_WINDOW_WIDTH),glutGet(GLUT_WINDOW_HEIGHT)
-
-		@t = glGenTextures(2)
-
-		# default checkerboard texture
-		glBindTexture(GL_TEXTURE_2D,@t[0])
-		data = checker_texture(64,4,[1,1,1],[0,0,0])
-		gluBuild2DMipmaps(GL_TEXTURE_2D,GL_RGBA,64,64,GL_RGB,GL_FLOAT,data.pack("f*"))
-
-		# second texture with color tinted mipmaps
-		glBindTexture(GL_TEXTURE_2D,@t[1])
-		data = checker_texture(64,4,[1,1,1],[0,0,0])
-		glTexImage2D(GL_TEXTURE_2D,0,GL_RGBA,64,64,0,GL_RGB,GL_FLOAT,data.pack("f*"))
-		data = checker_texture(32,4,[1,0,0],[0,0,0])
-		glTexImage2D(GL_TEXTURE_2D,1,GL_RGBA,32,32,0,GL_RGB,GL_FLOAT,data.pack("f*"))
-		data = checker_texture(16,4,[0,1,0],[0,0,0])
-		glTexImage2D(GL_TEXTURE_2D,2,GL_RGBA,16,16,0,GL_RGB,GL_FLOAT,data.pack("f*"))
-		data = checker_texture(8,4,[0,0,1],[0,0,0])
-		glTexImage2D(GL_TEXTURE_2D,3,GL_RGBA,8,8,0,GL_RGB,GL_FLOAT,data.pack("f*"))
-		data = checker_texture(4,4,[1,1,0],[0,0,0])
-		glTexImage2D(GL_TEXTURE_2D,4,GL_RGBA,4,4,0,GL_RGB,GL_FLOAT,data.pack("f*"))
-		data = checker_texture(2,2,[1,0,1],[0,0,0])
-		glTexImage2D(GL_TEXTURE_2D,5,GL_RGBA,2,2,0,GL_RGB,GL_FLOAT,data.pack("f*"))
-		data = [0.5,0.5,0.5] # single pixel texture, just average it
-		glTexImage2D(GL_TEXTURE_2D,6,GL_RGBA,1,1,0,GL_RGB,GL_FLOAT,data.pack("f*"))
-	end
-
-	def display_text
-		ortho(@@w,@@h)
-		printGlutBitmapFont("Texture Filtering ('f'): #{@@filters[0][1]}", GLUT_BITMAP_9_BY_15, 20, 20, 1.0, 1.0, 1.0)
-		printGlutBitmapFont("Anisotropy factor ('a'): #{@@anisotropy[0]}x", GLUT_BITMAP_9_BY_15, 20, 40, 1.0, 1.0, 1.0)
-		printGlutBitmapFont("Colored Mipmaps ('c'): #{@@color_tint[0]}", GLUT_BITMAP_9_BY_15, 20, 60, 1.0, 1.0, 1.0)
-		persp(@@w,@@h)
-	end
-
-	def display_plane()
-		glEnable(GL_TEXTURE_2D)
-		t_repeat = 16
-		# x,y,z,u,v
-		quad = [[-4,-1,1,  0,t_repeat],[4,-1,1,  t_repeat,t_repeat],[4,1,-8,  t_repeat,0],[-4,1,-8,  0,0]]
-		glBegin(GL_QUADS)
-		quad.each do |v|
-			glTexCoord2f(v[3],v[4])
-			glVertex3f(v[0],v[1],v[2])
-		end
-		glEnd()
-		glDisable(GL_TEXTURE_2D)
-	end
-
-	def display
-		glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT)
-
-		persp(@@w,@@h)
-
-		# move back from scene
-		glTranslatef(0,0,-2)
-
-		# set anisotropy
-		glTexParameterf(GL_TEXTURE_2D,GL_TEXTURE_MAX_ANISOTROPY_EXT,@@anisotropy[0])
-
-		# set color tint
-		if (@@color_tint[0] == "On")
-			glBindTexture(GL_TEXTURE_2D,@t[1])
-		else			
-			glBindTexture(GL_TEXTURE_2D,@t[0])
-		end
-
-		# set filters
-		f = @@filters[0][0]
-		glTexParameterf(GL_TEXTURE_2D,GL_TEXTURE_MIN_FILTER,f)
-
-		# draw scene	
-		display_plane()
-		display_text()
-
-		sleep(0.001) # microsleep to avoid consuming all CPU time
-		glutSwapBuffers()
-	end
-
-	def idle
-		glutPostRedisplay()
-	end
-
-	def keyboard(key,x,y)
-		case (key)
-		when ?f
-			@@filters.rotate!
-		when ?a
-			max_anisotropy = glGetIntegerv(GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT)
-			begin	@@anisotropy.rotate! end until @@anisotropy[0]<=max_anisotropy
-		when ?c
-			@@color_tint.rotate!
-		when ?\e # Escape
-			exit(0)
-		end
-		glutPostRedisplay()
-	end
+  @@filters = [[GL_NEAREST,"None"],[GL_LINEAR_MIPMAP_NEAREST,"Bilinear"],[GL_LINEAR_MIPMAP_LINEAR,"Trilinear"]]
+  @@anisotropy = [1,2,4,8,16,32]
+  @@color_tint = ["Off","On"]
+
+  def checker_texture(size,divide,color_a,color_b)
+    strip_a = color_a * (size/divide)
+    strip_b = color_b * (size/divide)
+    line_strip_a = (strip_a + strip_b) * (size/2)
+    line_strip_b = (strip_b + strip_a) * (size/2)
+    (line_strip_a + line_strip_b) * (divide/2)
+  end
+
+  def printGlutBitmapFont(string, font, x,y, r,g,b)
+    glDisable(GL_TEXTURE_2D)
+    glColor3f(r, g, b)
+    glRasterPos2i(x, y)
+    string.each_byte do |x|
+      glutBitmapCharacter(font, x)
+    end
+  end
+
+  def ortho(w,h)
+    glMatrixMode(GL_PROJECTION)
+    glLoadIdentity()
+    gluOrtho2D(0,w,0,h)
+    glScalef(1,-1,1)
+    glTranslatef(0,-h,0)
+
+    glMatrixMode(GL_MODELVIEW)
+    glLoadIdentity()
+  end
+
+  def persp(w,h)
+    glMatrixMode(GL_PROJECTION)
+    glLoadIdentity
+    gluPerspective(90,w.to_f/h.to_f,1,100)
+
+    glMatrixMode(GL_MODELVIEW)
+    glLoadIdentity
+  end
+
+  def reshape(w,h)
+    @@w,@@h = w,h
+    glViewport(0, 0, w, h)
+    persp(w,h)
+  end
+
+  def initialize
+    if (not Gl.is_available?("GL_EXT_texture_filter_anisotropic"))
+      puts "This program needs GL_EXT_texture_filter_anisotropic extension"
+      exit
+    end
+    @@w,@@h = glutGet(GLUT_WINDOW_WIDTH),glutGet(GLUT_WINDOW_HEIGHT)
+
+    @t = glGenTextures(2)
+
+    # default checkerboard texture
+    glBindTexture(GL_TEXTURE_2D,@t[0])
+    data = checker_texture(64,4,[1,1,1],[0,0,0])
+    gluBuild2DMipmaps(GL_TEXTURE_2D,GL_RGBA,64,64,GL_RGB,GL_FLOAT,data.pack("f*"))
+
+    # second texture with color tinted mipmaps
+    glBindTexture(GL_TEXTURE_2D,@t[1])
+    data = checker_texture(64,4,[1,1,1],[0,0,0])
+    glTexImage2D(GL_TEXTURE_2D,0,GL_RGBA,64,64,0,GL_RGB,GL_FLOAT,data.pack("f*"))
+    data = checker_texture(32,4,[1,0,0],[0,0,0])
+    glTexImage2D(GL_TEXTURE_2D,1,GL_RGBA,32,32,0,GL_RGB,GL_FLOAT,data.pack("f*"))
+    data = checker_texture(16,4,[0,1,0],[0,0,0])
+    glTexImage2D(GL_TEXTURE_2D,2,GL_RGBA,16,16,0,GL_RGB,GL_FLOAT,data.pack("f*"))
+    data = checker_texture(8,4,[0,0,1],[0,0,0])
+    glTexImage2D(GL_TEXTURE_2D,3,GL_RGBA,8,8,0,GL_RGB,GL_FLOAT,data.pack("f*"))
+    data = checker_texture(4,4,[1,1,0],[0,0,0])
+    glTexImage2D(GL_TEXTURE_2D,4,GL_RGBA,4,4,0,GL_RGB,GL_FLOAT,data.pack("f*"))
+    data = checker_texture(2,2,[1,0,1],[0,0,0])
+    glTexImage2D(GL_TEXTURE_2D,5,GL_RGBA,2,2,0,GL_RGB,GL_FLOAT,data.pack("f*"))
+    data = [0.5,0.5,0.5] # single pixel texture, just average it
+    glTexImage2D(GL_TEXTURE_2D,6,GL_RGBA,1,1,0,GL_RGB,GL_FLOAT,data.pack("f*"))
+  end
+
+  def display_text
+    ortho(@@w,@@h)
+    printGlutBitmapFont("Texture Filtering ('f'): #{@@filters[0][1]}", GLUT_BITMAP_9_BY_15, 20, 20, 1.0, 1.0, 1.0)
+    printGlutBitmapFont("Anisotropy factor ('a'): #{@@anisotropy[0]}x", GLUT_BITMAP_9_BY_15, 20, 40, 1.0, 1.0, 1.0)
+    printGlutBitmapFont("Colored Mipmaps ('c'): #{@@color_tint[0]}", GLUT_BITMAP_9_BY_15, 20, 60, 1.0, 1.0, 1.0)
+    persp(@@w,@@h)
+  end
+
+  def display_plane()
+    glEnable(GL_TEXTURE_2D)
+    t_repeat = 16
+    # x,y,z,u,v
+    quad = [[-4,-1,1,  0,t_repeat],[4,-1,1,  t_repeat,t_repeat],[4,1,-8,  t_repeat,0],[-4,1,-8,  0,0]]
+    glBegin(GL_QUADS)
+    quad.each do |v|
+      glTexCoord2f(v[3],v[4])
+      glVertex3f(v[0],v[1],v[2])
+    end
+    glEnd()
+    glDisable(GL_TEXTURE_2D)
+  end
+
+  def display
+    glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT)
+
+    persp(@@w,@@h)
+
+    # move back from scene
+    glTranslatef(0,0,-2)
+
+    # set anisotropy
+    glTexParameterf(GL_TEXTURE_2D,GL_TEXTURE_MAX_ANISOTROPY_EXT,@@anisotropy[0])
+
+    # set color tint
+    if (@@color_tint[0] == "On")
+      glBindTexture(GL_TEXTURE_2D,@t[1])
+    else
+      glBindTexture(GL_TEXTURE_2D,@t[0])
+    end
+
+    # set filters
+    f = @@filters[0][0]
+    glTexParameterf(GL_TEXTURE_2D,GL_TEXTURE_MIN_FILTER,f)
+
+    # draw scene
+    display_plane()
+    display_text()
+
+    sleep(0.001) # microsleep to avoid consuming all CPU time
+    glutSwapBuffers()
+  end
+
+  def idle
+    glutPostRedisplay()
+  end
+
+  def keyboard(key,x,y)
+    case (key)
+    when ?f
+      @@filters.rotate!
+    when ?a
+      max_anisotropy = glGetIntegerv(GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT)
+      begin  @@anisotropy.rotate! end until @@anisotropy[0]<=max_anisotropy
+    when ?c
+      @@color_tint.rotate!
+    when ?\e # Escape
+      exit(0)
+    end
+    glutPostRedisplay()
+  end
 end
 
 # main