remogatto-ffi-opengl 0.1.0 → 0.2.0

data/History.txt

@@ -1,3 +1,16 @@
+== 0.2.0 / 2009-04-05
+
+* Major improvements:
+  * Add support for MacOSX
+  * Add support for JRuby
+
+* Minor improvements:
+  * Re-generate wrapper code fixing issues with callbacks
+  * Fix return type in functions that return string
+  * Add gears example
+  * Add a trivial benchmark that compares perfomance against
+    ruby-opengl
+
 == 0.1.0 / 2009-03-06
 
 * 1 major enhancement

data/README.rdoc

@@ -5,16 +5,25 @@ ffi-opengl
 == DESCRIPTION:
 
 ffi-opengl is an autogenerated[1] ruby FFI interface towards OpenGL
-libraries (GL, GLU, GLUT).
+libraries (GL, GLU, GLUT). The FFI layer ensures compatibility among
+all Ruby implementation that support it. At the moment, this means
+that you can run the same ffi-opengl script with MRI Ruby and JRuby.
 
-ffi-opengl API aims to be a 1:1 translation of the OpenGL C API: don't
-expect idiomatic ruby inside!
+ffi-opengl API aims to be a 1:1 tranposition of the OpenGL C API:
+don't expect idiomatic ruby inside!
 
 == FEATURES/PROBLEMS:
 
 * Full [auto-generated] wrap of the OpenGL libraries.
-* No compilation needed.
-* Not yet tested on windows/macosx platforms
+
+* JRuby 1.3.0 compatible.
+
+* No need of opengl development libraries.
+
+* No compilation needed (if you use JRuby or you have ruby-ffi
+  installed on your system).
+
+* Not yet tested on windows platform.
 
 == SYNOPSIS:
 
@@ -23,19 +32,19 @@ please refer to OpenGL reference pages.
 
 == REQUIREMENTS:
 
-* ffi >= 0.3.0 (development version)
+* ffi >= 0.3.0
 * OpenGL libraries >= 1.2
 
 == DOWNLOAD/INSTALL:
 
 To download and install the gem from github:
 
-  [sudo] gem sources -a http://gems.github.com
+  [sudo] gem sources -a http://gems.github.com # needed only the first time
   [sudo] gem install remogatto-ffi-opengl
 
 To download the develpment trunk:
 
-  git clone http://github.com/remogatto/ffi-opengl/tree/master
+  git clone http://github.com/remogatto/ffi-opengl.git
 
 == LINKS:
 

data/bench/bench_spinning_cube.rb

@@ -0,0 +1,10 @@
+require File.expand_path(File.join(File.dirname(__FILE__), %w[.. lib ffi-opengl]))
+
+require 'benchmark'
+
+MAX_FRAMES = 30000
+
+Benchmark.bm do |x|
+  x.report('ffi-opengl') { `ruby bench/ffi-opengl_spinning_cube.rb #{MAX_FRAMES}` }
+  x.report('ruby-opengl') { `ruby bench/ruby-opengl_spinning_cube.rb #{MAX_FRAMES}` }
+end

data/bench/ffi-opengl_spinning_cube.rb

@@ -0,0 +1,8 @@
+require File.expand_path(File.join(File.dirname(__FILE__), %w[.. examples spinning_cube]))
+require File.expand_path(File.join(File.dirname(__FILE__), %w[.. lib ffi-opengl]))
+
+include FFI, GL, GLU, GLUT
+app = SpinningCube.new(ARGV[0].to_i)
+app.light_diffuse = MemoryPointer.new(:float, 4).put_array_of_float(0, [1.0, 0.0, 0.0, 1.0])
+app.light_position =  MemoryPointer.new(:float, 4).put_array_of_float(0, [1.0, 1.0, 1.0, 0.0])
+app.start

data/bench/ruby-opengl_spinning_cube.rb

@@ -0,0 +1,15 @@
+require 'rubygems'
+require 'opengl'
+
+require File.expand_path(File.join(File.dirname(__FILE__), %w[.. examples spinning_cube]))
+
+class SpinningCube
+  def glut_init
+    glutInit
+  end
+end
+
+app = SpinningCube.new(ARGV[0].to_i)
+app.light_diffuse = [1.0, 0.0, 0.0, 1.0]
+app.light_position = [1.0, 1.0, 1.0, 0.0]
+app.start

data/examples/gears.rb

@@ -0,0 +1,329 @@
+#!/usr/bin/env ruby
+
+# 3-D gear wheels. This program is in the public domain.
+#
+# Command line options:
+#    -info      print GL implementation information
+#    -exit      automatically exit after 30 seconds
+#
+# 2005-05-01 Ruby version by Arto Bendiken based on gears.c rev 1.8.
+# 2005-01-09 Original C version (gears.c) by Brian Paul et al.
+# http://cvs.freedesktop.org/mesa/Mesa/progs/demos/gears.c?rev=1.8
+
+require File.expand_path(File.join(File.dirname(__FILE__), %w[.. lib ffi-opengl]))
+
+class Gears
+  include FFI, GL, GLU, GLUT
+
+  POS = MemoryPointer.new(:float, 4).put_array_of_float(0, [5.0, 5.0, 10.0, 0.0])
+  RED = MemoryPointer.new(:float, 4).put_array_of_float(0, [0.8, 0.1, 0.0, 1.0]) 
+  GREEN = MemoryPointer.new(:float, 4).put_array_of_float(0, [0.0, 0.8, 0.2, 1.0])
+  BLUE = MemoryPointer.new(:float, 4).put_array_of_float(0, [0.2, 0.2, 1.0, 1.0]) 
+
+  include Math
+
+  # Draw a gear wheel. You'll probably want to call this function when
+  # building a display list since we do a lot of trig here.
+  #
+  # Input:  inner_radius - radius of hole at center
+  #         outer_radius - radius at center of teeth
+  #         width - width of gear
+  #         teeth - number of teeth
+  #         tooth_depth - depth of tooth
+  def gear(inner_radius, outer_radius, width, teeth, tooth_depth)
+    r0 = inner_radius
+    r1 = outer_radius - tooth_depth / 2.0
+    r2 = outer_radius + tooth_depth / 2.0
+
+    da = 2.0 * PI / teeth / 4.0
+
+    glShadeModel(GL_FLAT)
+
+    glNormal3f(0.0, 0.0, 1.0)
+
+    # Draw front face
+    glBegin(GL_QUAD_STRIP)
+    for i in 0..teeth
+      angle = i * 2.0 * PI / teeth
+      glVertex3f(r0 * cos(angle), r0 * sin(angle), width * 0.5)
+      glVertex3f(r1 * cos(angle), r1 * sin(angle), width * 0.5)
+      if i < teeth
+        glVertex3f(r0 * cos(angle), r0 * sin(angle), width * 0.5)
+        glVertex3f(r1 * cos(angle + 3 * da),
+          r1 * sin(angle + 3 * da), width * 0.5)
+      end
+    end
+    glEnd()
+  
+    # Draw front sides of teeth
+    glBegin(GL_QUADS)
+    for i in 0...teeth
+      angle = i * 2.0 * PI / teeth
+      glVertex3f(r1 * cos(angle), r1 * sin(angle), width * 0.5)
+      glVertex3f(r2 * cos(angle + da), r2 * sin(angle + da), width * 0.5)
+      glVertex3f(r2 * cos(angle + 2 * da),
+        r2 * sin(angle + 2 * da), width * 0.5)
+      glVertex3f(r1 * cos(angle + 3 * da),
+        r1 * sin(angle + 3 * da), width * 0.5)
+    end
+    glEnd()
+  
+    glNormal3f(0.0, 0.0, -1.0)
+  
+    # Draw back face
+    glBegin(GL_QUAD_STRIP)
+    for i in 0..teeth
+      angle = i * 2.0 * PI / teeth
+      glVertex3f(r1 * cos(angle), r1 * sin(angle), -width * 0.5)
+      glVertex3f(r0 * cos(angle), r0 * sin(angle), -width * 0.5)
+      if i < teeth
+        glVertex3f(r1 * cos(angle + 3 * da),
+          r1 * sin(angle + 3 * da), -width * 0.5)
+        glVertex3f(r0 * cos(angle), r0 * sin(angle), -width * 0.5)
+      end
+    end
+    glEnd()
+  
+    # Draw back sides of teeth
+    glBegin(GL_QUADS)
+    for i in 0...teeth
+      angle = i * 2.0 * PI / teeth
+      glVertex3f(r1 * cos(angle + 3 * da),
+        r1 * sin(angle + 3 * da), -width * 0.5)
+      glVertex3f(r2 * cos(angle + 2 * da),
+        r2 * sin(angle + 2 * da), -width * 0.5)
+      glVertex3f(r2 * cos(angle + da), r2 * sin(angle + da), -width * 0.5)
+      glVertex3f(r1 * cos(angle), r1 * sin(angle), -width * 0.5)
+    end
+    glEnd()
+  
+    # Draw outward faces of teeth
+    glBegin(GL_QUAD_STRIP)
+    for i in 0...teeth
+      angle = i * 2.0 * PI / teeth
+      glVertex3f(r1 * cos(angle), r1 * sin(angle), width * 0.5)
+      glVertex3f(r1 * cos(angle), r1 * sin(angle), -width * 0.5)
+      u = r2 * cos(angle + da) - r1 * cos(angle)
+      v = r2 * sin(angle + da) - r1 * sin(angle)
+      len = sqrt(u * u + v * v)
+      u /= len
+      v /= len
+      glNormal3f(v, -u, 0.0)
+      glVertex3f(r2 * cos(angle + da), r2 * sin(angle + da), width * 0.5)
+      glVertex3f(r2 * cos(angle + da), r2 * sin(angle + da), -width * 0.5)
+      glNormal3f(cos(angle), sin(angle), 0.0)
+      glVertex3f(r2 * cos(angle + 2 * da),
+        r2 * sin(angle + 2 * da), width * 0.5)
+      glVertex3f(r2 * cos(angle + 2 * da),
+        r2 * sin(angle + 2 * da), -width * 0.5)
+      u = r1 * cos(angle + 3 * da) - r2 * cos(angle + 2 * da)
+      v = r1 * sin(angle + 3 * da) - r2 * sin(angle + 2 * da)
+      glNormal3f(v, -u, 0.0)
+      glVertex3f(r1 * cos(angle + 3 * da),
+        r1 * sin(angle + 3 * da), width * 0.5)
+      glVertex3f(r1 * cos(angle + 3 * da),
+        r1 * sin(angle + 3 * da), -width * 0.5)
+      glNormal3f(cos(angle), sin(angle), 0.0)
+    end
+    glVertex3f(r1 * cos(0), r1 * sin(0), width * 0.5)
+    glVertex3f(r1 * cos(0), r1 * sin(0), -width * 0.5)
+    glEnd()
+  
+    glShadeModel(GL_SMOOTH)
+  
+    # Draw inside radius cylinder
+    glBegin(GL_QUAD_STRIP)
+    for i in 0..teeth
+      angle = i * 2.0 * PI / teeth
+      glNormal3f(-cos(angle), -sin(angle), 0.0)
+      glVertex3f(r0 * cos(angle), r0 * sin(angle), -width * 0.5)
+      glVertex3f(r0 * cos(angle), r0 * sin(angle), width * 0.5)
+    end
+    glEnd()
+  end
+
+  def draw
+    glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+
+    glPushMatrix()
+    glRotatef(@view_rotx, 1.0, 0.0, 0.0)
+    glRotatef(@view_roty, 0.0, 1.0, 0.0)
+    glRotatef(@view_rotz, 0.0, 0.0, 1.0)
+
+    glPushMatrix()
+    glTranslatef(-3.0, -2.0, 0.0)
+    glRotatef(@angle, 0.0, 0.0, 1.0)
+    glCallList(@gear1)
+    glPopMatrix()
+
+    glPushMatrix()
+    glTranslatef(3.1, -2.0, 0.0)
+    glRotatef(-2.0 * @angle - 9.0, 0.0, 0.0, 1.0)
+    glCallList(@gear2)
+    glPopMatrix()
+
+    glPushMatrix()
+    glTranslatef(-3.1, 4.2, 0.0)
+    glRotatef(-2.0 * @angle - 25.0, 0.0, 0.0, 1.0)
+    glCallList(@gear3)
+    glPopMatrix()
+
+    glPopMatrix()
+
+    glutSwapBuffers()
+
+    @frames = 0 if not defined? @frames
+    @t0 = 0 if not defined? @t0
+
+    @frames += 1
+    t = glutGet(GLUT_ELAPSED_TIME)
+    if t - @t0 >= 5000
+      seconds = (t - @t0) / 1000.0
+      fps = @frames / seconds
+      printf("%d frames in %6.3f seconds = %6.3f FPS\n",
+        @frames, seconds, fps)
+      @t0, @frames = t, 0
+      exit if defined? @autoexit and t >= 999.0 * @autoexit
+    end
+  end
+
+  def idle
+    t = glutGet(GLUT_ELAPSED_TIME) / 1000.0
+    @t0_idle = t if !defined? @t0_idle
+    # 90 degrees per second
+    @angle += 70.0 * (t - @t0_idle)
+    @t0_idle = t
+    glutPostRedisplay()
+  end
+
+  # Change view angle, exit upon ESC
+  def key(k, x, y)
+    case k
+      when ?z
+        @view_rotz += 5.0
+      when ?Z
+        @view_rotz -= 5.0
+      when 27 # Escape
+        exit
+    end
+    glutPostRedisplay()
+  end
+
+  # Change view angle
+  def special(k, x, y)
+    case k
+      when GLUT_KEY_UP
+        @view_rotx += 5.0
+      when GLUT_KEY_DOWN
+        @view_rotx -= 5.0
+      when GLUT_KEY_LEFT
+        @view_roty += 5.0
+      when GLUT_KEY_RIGHT
+        @view_roty -= 5.0
+    end
+    glutPostRedisplay()
+  end
+
+  # New window size or exposure
+  def reshape(width, height)
+    h = height.to_f / width.to_f
+    glViewport(0, 0, width, height)
+    glMatrixMode(GL_PROJECTION)
+    glLoadIdentity()
+    glFrustum(-1.0, 1.0, -h, h, 5.0, 60.0)
+    glMatrixMode(GL_MODELVIEW)
+    glLoadIdentity()
+    glTranslatef(0.0, 0.0, -40.0)
+  end
+
+  def init
+    @angle = 0.0
+    @view_rotx, @view_roty, @view_rotz = 20.0, 30.0, 0.0
+
+    glLightfv(GL_LIGHT0, GL_POSITION, POS)
+    glEnable(GL_CULL_FACE)
+    glEnable(GL_LIGHTING)
+    glEnable(GL_LIGHT0)
+    glEnable(GL_DEPTH_TEST)
+
+    # Make the gears
+    @gear1 = glGenLists(1)
+    glNewList(@gear1, GL_COMPILE)
+    glMaterialfv(GL_FRONT, GL_AMBIENT_AND_DIFFUSE, RED)
+    gear(1.0, 4.0, 1.0, 20, 0.7)
+    glEndList()
+
+    @gear2 = glGenLists(1)
+    glNewList(@gear2, GL_COMPILE)
+    glMaterialfv(GL_FRONT, GL_AMBIENT_AND_DIFFUSE, GREEN)
+    gear(0.5, 2.0, 2.0, 10, 0.7)
+    glEndList()
+
+    @gear3 = glGenLists(1)
+    glNewList(@gear3, GL_COMPILE)
+    glMaterialfv(GL_FRONT, GL_AMBIENT_AND_DIFFUSE, BLUE)
+    gear(1.3, 2.0, 0.5, 10, 0.7)
+    glEndList()
+
+    glEnable(GL_NORMALIZE)
+
+    ARGV.each do |arg|
+      case arg
+        when '-info'
+          printf("GL_RENDERER   = %s\n", glGetString(GL_RENDERER))
+          printf("GL_VERSION    = %s\n", glGetString(GL_VERSION))
+          printf("GL_VENDOR     = %s\n", glGetString(GL_VENDOR))
+          printf("GL_EXTENSIONS = %s\n", glGetString(GL_EXTENSIONS))
+        when '-exit'
+          @autoexit = 30
+          printf("Auto Exit after %i seconds.\n", @autoexit);
+      end
+    end
+  end
+
+  def visible(vis)
+    glutIdleFunc((vis == GLUT_VISIBLE ? method(:idle).to_proc : nil))
+  end
+
+  def mouse(button, state, x, y)
+    @mouse = state
+    @x0, @y0 = x, y
+  end
+  
+  def motion(x, y)
+    if @mouse == GLUT_DOWN then
+      @view_roty += @x0 - x
+      @view_rotx += @y0 - y
+    end
+    @x0, @y0 = x, y
+  end
+
+  def initialize
+    # argc, argv parameters
+    glutInit(MemoryPointer.new(:int, 1).put_int(0, 0), 
+             MemoryPointer.new(:pointer, 1).put_pointer(0, nil))
+    glutInitDisplayMode(GLUT_RGB | GLUT_DEPTH | GLUT_DOUBLE)
+
+    glutInitWindowPosition(0, 0)
+    glutInitWindowSize(300, 300)
+    glutCreateWindow('Gears')
+    init()
+
+    glutDisplayFunc(method(:draw).to_proc)
+    glutReshapeFunc(method(:reshape).to_proc)
+    glutKeyboardFunc(method(:key).to_proc)
+    glutSpecialFunc(method(:special).to_proc)
+    glutVisibilityFunc(method(:visible).to_proc)
+    glutMouseFunc(method(:mouse).to_proc)
+    glutMotionFunc(method(:motion).to_proc)
+  end
+
+  def start
+    glutMainLoop()
+  end
+
+end
+
+Gears.new.start
+
+

data/examples/spinning_cube.rb

@@ -3,57 +3,74 @@
 # http://www.codecolony.de/ 
 # 
 
-require File.expand_path(File.join(File.dirname(__FILE__), %w[.. lib ffi-opengl]))
+class SpinningCube
+  attr_accessor :light_diffuse, :light_position
+  attr_reader :max_frames
 
-include GL, GLU, GLUT
+  def initialize(max_frames = 0)
+    @x_rotated, @y_rotated, @z_rotated = 0.0, 0.0, 0.0
+    @frames, @max_frames = 0, max_frames
+    glut_init
+  end
+  
+  def glut_init
+    glutInit(MemoryPointer.new(:int, 1).put_int(0, 0), 
+             MemoryPointer.new(:pointer, 1).put_pointer(0, nil))
+  end
 
-@light_diffuse = MemoryPointer.new(:float, 4).put_array_of_float(0, [1.0, 0.0, 0.0, 1.0])
-@light_position = MemoryPointer.new(:float, 4).put_array_of_float(0, [1.0, 1.0, 1.0, 0.0])
-@x_rotated, @y_rotated, @z_rotated = 0.0, 0.0, 0.0
+  def display
+    glClear(GL_COLOR_BUFFER_BIT)
+    glLoadIdentity()
+    glTranslatef(0.0, 0.0, -5.0)
+    glRotatef(@x_rotated, 1.0, 0.0, 0.0)
+    glRotatef(@y_rotated, 0.0, 1.0, 0.0)
+    glRotatef(@z_rotated, 0.0, 0.0, 1.0)
+    glScalef(2.0, 1.0, 1.0)
+    glutSolidCube(1.0)
+    glFlush		
+    glutSwapBuffers
+    exit if (@max_frames > 0 and (@frames += 1) > @max_frames)
+  end
 
-Display = Proc.new {
-  glClear(GL_COLOR_BUFFER_BIT)
-  glLoadIdentity()
-  glTranslatef(0.0, 0.0, -5.0)
-  glRotatef(@x_rotated, 1.0, 0.0, 0.0)
-  glRotatef(@y_rotated, 0.0, 1.0, 0.0)
-  glRotatef(@z_rotated, 0.0, 0.0, 1.0)
-  glScalef(2.0, 1.0, 1.0)
-  glutSolidCube(1.0)
-  glFlush		
-  glutSwapBuffers
-}
+  def reshape(x, y)
+    exit if (y == 0 || x == 0) 
+    glMatrixMode(GL_PROJECTION)  
+    glLoadIdentity
+    gluPerspective(30.0, x / y, 0.5, 20.0)
+    glMatrixMode(GL_MODELVIEW)
+    glViewport(0, 0, x, y)
+  end
 
-Reshape = Proc.new { |x, y|
-  exit if (y == 0 || x == 0) 
-  glMatrixMode(GL_PROJECTION)  
-  glLoadIdentity
-  gluPerspective(30.0, x / y, 0.5, 20.0)
-  glMatrixMode(GL_MODELVIEW)
-  glViewport(0, 0, x, y)
-}
+  def idle
+    @x_rotated += 0.3
+    @y_rotated += 0.1
+    @z_rotated += -0.4
+    display
+  end
 
-Idle = Proc.new {
-  @x_rotated += 0.3
-  @y_rotated += 0.1
-  @z_rotated += -0.4
-  Display.call
-}
+  def start
+    glutInitDisplayMode(GLUT_DOUBLE | GLUT_RGB)
+    glutInitWindowSize(300, 300)
+    glutCreateWindow("Cube example")
+    glLightfv(GL_LIGHT0, GL_DIFFUSE, @light_diffuse)
+    glLightfv(GL_LIGHT0, GL_POSITION, @light_position)
+    glEnable(GL_LIGHT0)
+    glEnable(GL_LIGHTING)
+    glEnable(GL_CULL_FACE)
+    glShadeModel(GL_SMOOTH)
+    glClearColor(0.0, 0.0, 0.0, 0.0)
+    glutDisplayFunc(method(:display).to_proc)
+    glutIdleFunc(method(:idle).to_proc)
+    glutReshapeFunc(method(:reshape).to_proc)
+    glutMainLoop
+  end
+end
 
-# argc, argv parameters
-glutInit(MemoryPointer.new(:int, 1).put_int(0, 0), 
-         MemoryPointer.new(:pointer, 1).put_pointer(0, nil))
-glutInitDisplayMode(GLUT_DOUBLE | GLUT_RGB)
-glutInitWindowSize(300, 300)
-glutCreateWindow("Cube example")
-glLightfv(GL_LIGHT0, GL_DIFFUSE, @light_diffuse)
-glLightfv(GL_LIGHT0, GL_POSITION, @light_position)
-glEnable(GL_LIGHT0)
-glEnable(GL_LIGHTING)
-glEnable(GL_CULL_FACE)
-glShadeModel(GL_SMOOTH)
-glClearColor(0.0, 0.0, 0.0, 0.0)
-glutDisplayFunc(Display)
-glutReshapeFunc(Reshape)
-glutIdleFunc(Idle)
-glutMainLoop
+if __FILE__ == $0
+  require File.expand_path(File.join(File.dirname(__FILE__), %w[.. lib ffi-opengl]))
+  include FFI, GL, GLU, GLUT
+  app = SpinningCube.new
+  app.light_diffuse = MemoryPointer.new(:float, 4).put_array_of_float(0, [1.0, 0.0, 0.0, 1.0])
+  app.light_position = MemoryPointer.new(:float, 4).put_array_of_float(0, [1.0, 1.0, 1.0, 0.0])
+  app.start
+end

data/ffi-opengl.gemspec

@@ -0,0 +1,34 @@
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{ffi-opengl}
+  s.version = "0.2.0"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Andrea Fazzi"]
+  s.date = %q{2009-04-05}
+  s.description = %q{ffi-opengl is an autogenerated[1] ruby FFI interface towards OpenGL libraries (GL, GLU, GLUT). The FFI layer ensures compatibility among all Ruby implementation that support it. At the moment, this means that you can run the same ffi-opengl script with MRI Ruby and JRuby.  ffi-opengl API aims to be a 1:1 tranposition of the OpenGL C API: don't expect idiomatic ruby inside!}
+  s.email = %q{andrea.fazzi@alcacoop.it}
+  s.extra_rdoc_files = ["History.txt", "README.rdoc"]
+  s.files = [".gitignore", "History.txt", "README.rdoc", "Rakefile", "bench/bench_spinning_cube.rb", "bench/ffi-opengl_spinning_cube.rb", "bench/ruby-opengl_spinning_cube.rb", "examples/gears.rb", "examples/spinning_cube.rb", "ffi-opengl.gemspec", "generated/gl_wrap.rb", "generated/gl_wrap.xml", "generated/glu_wrap.rb", "generated/glu_wrap.xml", "generated/glut_wrap.rb", "generated/glut_wrap.xml", "interfaces/freeglut_std.h", "interfaces/gl.h", "interfaces/gl.i", "interfaces/glu.h", "interfaces/glu.i", "interfaces/glut.i", "lib/ffi-opengl.rb", "lib/ffi-opengl/gl.rb", "lib/ffi-opengl/glu.rb", "lib/ffi-opengl/glut.rb", "lib/ffi-opengl/platform.rb", "spec/ffi-opengl_spec.rb", "spec/spec_helper.rb", "tasks/ann.rake", "tasks/bones.rake", "tasks/gem.rake", "tasks/generator.rake", "tasks/git.rake", "tasks/notes.rake", "tasks/post_load.rake", "tasks/rdoc.rake", "tasks/rubyforge.rake", "tasks/setup.rb", "tasks/spec.rake", "tasks/svn.rake", "tasks/test.rake"]
+  s.has_rdoc = true
+  s.homepage = %q{http://github.com/remogatto/ffi-opengl}
+  s.rdoc_options = ["--main", "README.rdoc"]
+  s.require_paths = ["lib"]
+  s.rubyforge_project = %q{ffi-opengl}
+  s.rubygems_version = %q{1.3.1}
+  s.summary = %q{ffi-opengl is an autogenerated[1] ruby FFI interface towards OpenGL libraries (GL, GLU, GLUT)}
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 2
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<ffi>, [">= 0.3.0"])
+    else
+      s.add_dependency(%q<ffi>, [">= 0.3.0"])
+    end
+  else
+    s.add_dependency(%q<ffi>, [">= 0.3.0"])
+  end
+end

data/interfaces/gl.i

@@ -1,10 +1,8 @@
 %module opengl
 
 %{
-require 'ffi'
 module GL
   extend FFI::Library
-  ffi_lib 'GL'
 %}
 
 #define GL_MESA_program_debug

data/interfaces/glu.i

@@ -1,10 +1,8 @@
 %module glu
 
 %{
-require 'ffi'
 module GLU
   extend FFI::Library
-  ffi_lib 'GLU'
 %}
 
 /*

data/interfaces/glut.i

@@ -1,10 +1,8 @@
 %module opengl
 
 %{
-require 'ffi'
 module GLUT
   extend FFI::Library
-  ffi_lib 'glut'
 %}
 
 /*

data/lib/ffi-opengl.rb

@@ -1,7 +1,7 @@
 module FFIOpenGL
 
   # :stopdoc:
-  VERSION = '0.1.0'
+  VERSION = '0.2.0'
   LIBPATH = ::File.expand_path(::File.dirname(__FILE__)) + ::File::SEPARATOR
   PATH = ::File.dirname(LIBPATH) + ::File::SEPARATOR
   # :startdoc:

data/lib/ffi-opengl/gl.rb

@@ -1,3 +1,4 @@
+
 module GL
   extend FFI::Library
   GL_VERSION_1_1 = 1
@@ -572,7 +573,7 @@ module GL
   attach_function :glPopClientAttrib, [  ], :void
   attach_function :glRenderMode, [ :uint ], :int
   attach_function :glGetError, [  ], :uint
-  attach_function :glGetString, [ :uint ], :uchar
+  attach_function :glGetString, [ :uint ], :pointer
   attach_function :glFinish, [  ], :void
   attach_function :glFlush, [  ], :void
   attach_function :glHint, [ :uint, :uint ], :void
@@ -1030,8 +1031,8 @@ module GL
   callback(:PFNGLBLENDCOLORPROC, [ :float, :float, :float, :float ], :void)
   callback(:PFNGLBLENDEQUATIONPROC, [ :uint ], :void)
   callback(:PFNGLCOLORTABLEPROC, [ :uint, :uint, :int, :uint, :uint, :pointer ], :void)
-  callback(:PFNGLCOLORTABLEPARAMETERFVPROC, [ :uint, :uint, :pointer ], :float)
-  callback(:PFNGLCOLORTABLEPARAMETERIVPROC, [ :uint, :uint, :pointer ], :int)
+  callback(:PFNGLCOLORTABLEPARAMETERFVPROC, [ :uint, :uint, :pointer ], :void)
+  callback(:PFNGLCOLORTABLEPARAMETERIVPROC, [ :uint, :uint, :pointer ], :void)
   callback(:PFNGLCOPYCOLORTABLEPROC, [ :uint, :uint, :int, :int, :int ], :void)
   callback(:PFNGLGETCOLORTABLEPROC, [ :uint, :uint, :uint, :pointer ], :void)
   callback(:PFNGLGETCOLORTABLEPARAMETERFVPROC, [ :uint, :uint, :pointer ], :void)
@@ -1041,9 +1042,9 @@ module GL
   callback(:PFNGLCONVOLUTIONFILTER1DPROC, [ :uint, :uint, :int, :uint, :uint, :pointer ], :void)
   callback(:PFNGLCONVOLUTIONFILTER2DPROC, [ :uint, :uint, :int, :int, :uint, :uint, :pointer ], :void)
   callback(:PFNGLCONVOLUTIONPARAMETERFPROC, [ :uint, :uint, :float ], :void)
-  callback(:PFNGLCONVOLUTIONPARAMETERFVPROC, [ :uint, :uint, :pointer ], :float)
+  callback(:PFNGLCONVOLUTIONPARAMETERFVPROC, [ :uint, :uint, :pointer ], :void)
   callback(:PFNGLCONVOLUTIONPARAMETERIPROC, [ :uint, :uint, :int ], :void)
-  callback(:PFNGLCONVOLUTIONPARAMETERIVPROC, [ :uint, :uint, :pointer ], :int)
+  callback(:PFNGLCONVOLUTIONPARAMETERIVPROC, [ :uint, :uint, :pointer ], :void)
   callback(:PFNGLCOPYCONVOLUTIONFILTER1DPROC, [ :uint, :uint, :int, :int, :int ], :void)
   callback(:PFNGLCOPYCONVOLUTIONFILTER2DPROC, [ :uint, :uint, :int, :int, :int, :int ], :void)
   callback(:PFNGLGETCONVOLUTIONFILTERPROC, [ :uint, :uint, :uint, :pointer ], :void)
@@ -1202,41 +1203,41 @@ module GL
   callback(:PFNGLACTIVETEXTUREPROC, [ :uint ], :void)
   callback(:PFNGLCLIENTACTIVETEXTUREPROC, [ :uint ], :void)
   callback(:PFNGLMULTITEXCOORD1DPROC, [ :uint, :double ], :void)
-  callback(:PFNGLMULTITEXCOORD1DVPROC, [ :uint, :pointer ], :double)
+  callback(:PFNGLMULTITEXCOORD1DVPROC, [ :uint, :pointer ], :void)
   callback(:PFNGLMULTITEXCOORD1FPROC, [ :uint, :float ], :void)
-  callback(:PFNGLMULTITEXCOORD1FVPROC, [ :uint, :pointer ], :float)
+  callback(:PFNGLMULTITEXCOORD1FVPROC, [ :uint, :pointer ], :void)
   callback(:PFNGLMULTITEXCOORD1IPROC, [ :uint, :int ], :void)
-  callback(:PFNGLMULTITEXCOORD1IVPROC, [ :uint, :pointer ], :int)
+  callback(:PFNGLMULTITEXCOORD1IVPROC, [ :uint, :pointer ], :void)
   callback(:PFNGLMULTITEXCOORD1SPROC, [ :uint, :short ], :void)
-  callback(:PFNGLMULTITEXCOORD1SVPROC, [ :uint, :pointer ], :short)
+  callback(:PFNGLMULTITEXCOORD1SVPROC, [ :uint, :pointer ], :void)
   callback(:PFNGLMULTITEXCOORD2DPROC, [ :uint, :double, :double ], :void)
-  callback(:PFNGLMULTITEXCOORD2DVPROC, [ :uint, :pointer ], :double)
+  callback(:PFNGLMULTITEXCOORD2DVPROC, [ :uint, :pointer ], :void)
   callback(:PFNGLMULTITEXCOORD2FPROC, [ :uint, :float, :float ], :void)
-  callback(:PFNGLMULTITEXCOORD2FVPROC, [ :uint, :pointer ], :float)
+  callback(:PFNGLMULTITEXCOORD2FVPROC, [ :uint, :pointer ], :void)
   callback(:PFNGLMULTITEXCOORD2IPROC, [ :uint, :int, :int ], :void)
-  callback(:PFNGLMULTITEXCOORD2IVPROC, [ :uint, :pointer ], :int)
+  callback(:PFNGLMULTITEXCOORD2IVPROC, [ :uint, :pointer ], :void)
   callback(:PFNGLMULTITEXCOORD2SPROC, [ :uint, :short, :short ], :void)
-  callback(:PFNGLMULTITEXCOORD2SVPROC, [ :uint, :pointer ], :short)
+  callback(:PFNGLMULTITEXCOORD2SVPROC, [ :uint, :pointer ], :void)
   callback(:PFNGLMULTITEXCOORD3DPROC, [ :uint, :double, :double, :double ], :void)
-  callback(:PFNGLMULTITEXCOORD3DVPROC, [ :uint, :pointer ], :double)
+  callback(:PFNGLMULTITEXCOORD3DVPROC, [ :uint, :pointer ], :void)
   callback(:PFNGLMULTITEXCOORD3FPROC, [ :uint, :float, :float, :float ], :void)
-  callback(:PFNGLMULTITEXCOORD3FVPROC, [ :uint, :pointer ], :float)
+  callback(:PFNGLMULTITEXCOORD3FVPROC, [ :uint, :pointer ], :void)
   callback(:PFNGLMULTITEXCOORD3IPROC, [ :uint, :int, :int, :int ], :void)
-  callback(:PFNGLMULTITEXCOORD3IVPROC, [ :uint, :pointer ], :int)
+  callback(:PFNGLMULTITEXCOORD3IVPROC, [ :uint, :pointer ], :void)
   callback(:PFNGLMULTITEXCOORD3SPROC, [ :uint, :short, :short, :short ], :void)
-  callback(:PFNGLMULTITEXCOORD3SVPROC, [ :uint, :pointer ], :short)
+  callback(:PFNGLMULTITEXCOORD3SVPROC, [ :uint, :pointer ], :void)
   callback(:PFNGLMULTITEXCOORD4DPROC, [ :uint, :double, :double, :double, :double ], :void)
-  callback(:PFNGLMULTITEXCOORD4DVPROC, [ :uint, :pointer ], :double)
+  callback(:PFNGLMULTITEXCOORD4DVPROC, [ :uint, :pointer ], :void)
   callback(:PFNGLMULTITEXCOORD4FPROC, [ :uint, :float, :float, :float, :float ], :void)
-  callback(:PFNGLMULTITEXCOORD4FVPROC, [ :uint, :pointer ], :float)
+  callback(:PFNGLMULTITEXCOORD4FVPROC, [ :uint, :pointer ], :void)
   callback(:PFNGLMULTITEXCOORD4IPROC, [ :uint, :int, :int, :int, :int ], :void)
-  callback(:PFNGLMULTITEXCOORD4IVPROC, [ :uint, :pointer ], :int)
+  callback(:PFNGLMULTITEXCOORD4IVPROC, [ :uint, :pointer ], :void)
   callback(:PFNGLMULTITEXCOORD4SPROC, [ :uint, :short, :short, :short, :short ], :void)
-  callback(:PFNGLMULTITEXCOORD4SVPROC, [ :uint, :pointer ], :short)
-  callback(:PFNGLLOADTRANSPOSEMATRIXFPROC, [ :pointer ], :float)
-  callback(:PFNGLLOADTRANSPOSEMATRIXDPROC, [ :pointer ], :double)
-  callback(:PFNGLMULTTRANSPOSEMATRIXFPROC, [ :pointer ], :float)
-  callback(:PFNGLMULTTRANSPOSEMATRIXDPROC, [ :pointer ], :double)
+  callback(:PFNGLMULTITEXCOORD4SVPROC, [ :uint, :pointer ], :void)
+  callback(:PFNGLLOADTRANSPOSEMATRIXFPROC, [ :pointer ], :void)
+  callback(:PFNGLLOADTRANSPOSEMATRIXDPROC, [ :pointer ], :void)
+  callback(:PFNGLMULTTRANSPOSEMATRIXFPROC, [ :pointer ], :void)
+  callback(:PFNGLMULTTRANSPOSEMATRIXDPROC, [ :pointer ], :void)
   callback(:PFNGLSAMPLECOVERAGEPROC, [ :float, :uchar ], :void)
   callback(:PFNGLCOMPRESSEDTEXIMAGE3DPROC, [ :uint, :int, :uint, :int, :int, :int, :int, :int, :pointer ], :void)
   callback(:PFNGLCOMPRESSEDTEXIMAGE2DPROC, [ :uint, :int, :uint, :int, :int, :int, :int, :pointer ], :void)
@@ -1318,37 +1319,37 @@ module GL
   callback(:PFNGLACTIVETEXTUREARBPROC, [ :uint ], :void)
   callback(:PFNGLCLIENTACTIVETEXTUREARBPROC, [ :uint ], :void)
   callback(:PFNGLMULTITEXCOORD1DARBPROC, [ :uint, :double ], :void)
-  callback(:PFNGLMULTITEXCOORD1DVARBPROC, [ :uint, :pointer ], :double)
+  callback(:PFNGLMULTITEXCOORD1DVARBPROC, [ :uint, :pointer ], :void)
   callback(:PFNGLMULTITEXCOORD1FARBPROC, [ :uint, :float ], :void)
-  callback(:PFNGLMULTITEXCOORD1FVARBPROC, [ :uint, :pointer ], :float)
+  callback(:PFNGLMULTITEXCOORD1FVARBPROC, [ :uint, :pointer ], :void)
   callback(:PFNGLMULTITEXCOORD1IARBPROC, [ :uint, :int ], :void)
-  callback(:PFNGLMULTITEXCOORD1IVARBPROC, [ :uint, :pointer ], :int)
+  callback(:PFNGLMULTITEXCOORD1IVARBPROC, [ :uint, :pointer ], :void)
   callback(:PFNGLMULTITEXCOORD1SARBPROC, [ :uint, :short ], :void)
-  callback(:PFNGLMULTITEXCOORD1SVARBPROC, [ :uint, :pointer ], :short)
+  callback(:PFNGLMULTITEXCOORD1SVARBPROC, [ :uint, :pointer ], :void)
   callback(:PFNGLMULTITEXCOORD2DARBPROC, [ :uint, :double, :double ], :void)
-  callback(:PFNGLMULTITEXCOORD2DVARBPROC, [ :uint, :pointer ], :double)
+  callback(:PFNGLMULTITEXCOORD2DVARBPROC, [ :uint, :pointer ], :void)
   callback(:PFNGLMULTITEXCOORD2FARBPROC, [ :uint, :float, :float ], :void)
-  callback(:PFNGLMULTITEXCOORD2FVARBPROC, [ :uint, :pointer ], :float)
+  callback(:PFNGLMULTITEXCOORD2FVARBPROC, [ :uint, :pointer ], :void)
   callback(:PFNGLMULTITEXCOORD2IARBPROC, [ :uint, :int, :int ], :void)
-  callback(:PFNGLMULTITEXCOORD2IVARBPROC, [ :uint, :pointer ], :int)
+  callback(:PFNGLMULTITEXCOORD2IVARBPROC, [ :uint, :pointer ], :void)
   callback(:PFNGLMULTITEXCOORD2SARBPROC, [ :uint, :short, :short ], :void)
-  callback(:PFNGLMULTITEXCOORD2SVARBPROC, [ :uint, :pointer ], :short)
+  callback(:PFNGLMULTITEXCOORD2SVARBPROC, [ :uint, :pointer ], :void)
   callback(:PFNGLMULTITEXCOORD3DARBPROC, [ :uint, :double, :double, :double ], :void)
-  callback(:PFNGLMULTITEXCOORD3DVARBPROC, [ :uint, :pointer ], :double)
+  callback(:PFNGLMULTITEXCOORD3DVARBPROC, [ :uint, :pointer ], :void)
   callback(:PFNGLMULTITEXCOORD3FARBPROC, [ :uint, :float, :float, :float ], :void)
-  callback(:PFNGLMULTITEXCOORD3FVARBPROC, [ :uint, :pointer ], :float)
+  callback(:PFNGLMULTITEXCOORD3FVARBPROC, [ :uint, :pointer ], :void)
   callback(:PFNGLMULTITEXCOORD3IARBPROC, [ :uint, :int, :int, :int ], :void)
-  callback(:PFNGLMULTITEXCOORD3IVARBPROC, [ :uint, :pointer ], :int)
+  callback(:PFNGLMULTITEXCOORD3IVARBPROC, [ :uint, :pointer ], :void)
   callback(:PFNGLMULTITEXCOORD3SARBPROC, [ :uint, :short, :short, :short ], :void)
-  callback(:PFNGLMULTITEXCOORD3SVARBPROC, [ :uint, :pointer ], :short)
+  callback(:PFNGLMULTITEXCOORD3SVARBPROC, [ :uint, :pointer ], :void)
   callback(:PFNGLMULTITEXCOORD4DARBPROC, [ :uint, :double, :double, :double, :double ], :void)
-  callback(:PFNGLMULTITEXCOORD4DVARBPROC, [ :uint, :pointer ], :double)
+  callback(:PFNGLMULTITEXCOORD4DVARBPROC, [ :uint, :pointer ], :void)
   callback(:PFNGLMULTITEXCOORD4FARBPROC, [ :uint, :float, :float, :float, :float ], :void)
-  callback(:PFNGLMULTITEXCOORD4FVARBPROC, [ :uint, :pointer ], :float)
+  callback(:PFNGLMULTITEXCOORD4FVARBPROC, [ :uint, :pointer ], :void)
   callback(:PFNGLMULTITEXCOORD4IARBPROC, [ :uint, :int, :int, :int, :int ], :void)
-  callback(:PFNGLMULTITEXCOORD4IVARBPROC, [ :uint, :pointer ], :int)
+  callback(:PFNGLMULTITEXCOORD4IVARBPROC, [ :uint, :pointer ], :void)
   callback(:PFNGLMULTITEXCOORD4SARBPROC, [ :uint, :short, :short, :short, :short ], :void)
-  callback(:PFNGLMULTITEXCOORD4SVARBPROC, [ :uint, :pointer ], :short)
+  callback(:PFNGLMULTITEXCOORD4SVARBPROC, [ :uint, :pointer ], :void)
   GL_MESA_packed_depth_stencil = 1
   GL_DEPTH_STENCIL_MESA = 0x8750
   GL_UNSIGNED_INT_24_8_MESA = 0x8751

data/lib/ffi-opengl/glu.rb

@@ -1,3 +1,4 @@
+
 module GLU
   extend FFI::Library
   GLU_EXT_object_space_tess = 1
@@ -176,9 +177,9 @@ module GLU
   attach_function :gluEndPolygon, [ :pointer ], :void
   attach_function :gluEndSurface, [ :pointer ], :void
   attach_function :gluEndTrim, [ :pointer ], :void
-  attach_function :gluErrorString, [ :uint ], :uchar
+  attach_function :gluErrorString, [ :uint ], :pointer
   attach_function :gluGetNurbsProperty, [ :pointer, :uint, :pointer ], :void
-  attach_function :gluGetString, [ :uint ], :uchar
+  attach_function :gluGetString, [ :uint ], :pointer
   attach_function :gluGetTessProperty, [ :pointer, :uint, :pointer ], :void
   attach_function :gluLoadSamplingMatrices, [ :pointer, :pointer, :pointer, :pointer ], :void
   attach_function :gluLookAt, [ :double, :double, :double, :double, :double, :double, :double, :double, :double ], :void

data/lib/ffi-opengl/glut.rb

@@ -1,3 +1,4 @@
+
 module GLUT
   extend FFI::Library
   FREEGLUT = 1
@@ -244,8 +245,8 @@ module GLUT
   attach_function :glutBitmapWidth, [ :pointer, :int ], :int
   attach_function :glutStrokeCharacter, [ :pointer, :int ], :void
   attach_function :glutStrokeWidth, [ :pointer, :int ], :int
-  attach_function :glutBitmapLength, [ :pointer, :string ], :int
-  attach_function :glutStrokeLength, [ :pointer, :string ], :int
+  attach_function :glutBitmapLength, [ :pointer, :pointer ], :int
+  attach_function :glutStrokeLength, [ :pointer, :pointer ], :int
   attach_function :glutWireCube, [ :double ], :void
   attach_function :glutSolidCube, [ :double ], :void
   attach_function :glutWireSphere, [ :double, :int, :int ], :void

data/lib/ffi-opengl/platform.rb

@@ -1,27 +1,28 @@
+require 'rbconfig'
 module GL
   extend FFI::Library
-  case RUBY_PLATFORM
+  case Config::CONFIG['target_os']
   when /linux/
-    ffi_lib 'GL'
+    ffi_lib 'libGL.so.1'
   when /darwin/
     ffi_lib '/System/Library/Frameworks/OpenGL.framework/Libraries/libGL.dylib'
   end
 end
 module GLU
   extend FFI::Library
-  case RUBY_PLATFORM
+  case Config::CONFIG['target_os']
   when /linux/
-    ffi_lib 'GLU'
+    ffi_lib 'libGLU.so.1'
   when /darwin/
     ffi_lib '/System/Library/Frameworks/OpenGL.framework/Libraries/libGLU.dylib'
   end
 end
 module GLUT
   extend FFI::Library
-  case RUBY_PLATFORM
+  case Config::CONFIG['target_os']
   when /linux/
-    ffi_lib 'glut'
+    ffi_lib 'libglut.so.3'
   when /darwin/
-    ffi_lib '/System/Library/Frameworks/GLUT.framework/GLUT.dylib'
+    ffi_lib '/System/Library/Frameworks/GLUT.framework/GLUT'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: remogatto-ffi-opengl
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Andrea Fazzi
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-08 00:00:00 -08:00
+date: 2009-04-05 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,17 +22,7 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.3.0
     version: 
-- !ruby/object:Gem::Dependency 
-  name: bones
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 2.4.0
-    version: 
-description: "ffi-opengl is an autogenerated[1] ruby FFI interface towards OpenGL libraries (GL, GLU, GLUT).  ffi-opengl API aims to be a 1:1 translation of the OpenGL C API: don't expect idiomatic ruby inside!"
+description: "ffi-opengl is an autogenerated[1] ruby FFI interface towards OpenGL libraries (GL, GLU, GLUT). The FFI layer ensures compatibility among all Ruby implementation that support it. At the moment, this means that you can run the same ffi-opengl script with MRI Ruby and JRuby.  ffi-opengl API aims to be a 1:1 tranposition of the OpenGL C API: don't expect idiomatic ruby inside!"
 email: andrea.fazzi@alcacoop.it
 executables: []
 
@@ -46,7 +36,18 @@ files:
 - History.txt
 - README.rdoc
 - Rakefile
+- bench/bench_spinning_cube.rb
+- bench/ffi-opengl_spinning_cube.rb
+- bench/ruby-opengl_spinning_cube.rb
+- examples/gears.rb
 - examples/spinning_cube.rb
+- ffi-opengl.gemspec
+- generated/gl_wrap.rb
+- generated/gl_wrap.xml
+- generated/glu_wrap.rb
+- generated/glu_wrap.xml
+- generated/glut_wrap.rb
+- generated/glut_wrap.xml
 - interfaces/freeglut_std.h
 - interfaces/gl.h
 - interfaces/gl.i