remogatto-ffi-opengl 0.2.0 → 0.2.1

data/History.txt

@@ -1,3 +1,8 @@
+== 0.2.1 / 2009-06-17
+
+* Minor improvements:
+  * Rework requires and cleanup.
+
 == 0.2.0 / 2009-04-05
 
 * Major improvements:

data/README.rdoc

@@ -20,8 +20,8 @@ don't expect idiomatic ruby inside!
 
 * No need of opengl development libraries.
 
-* No compilation needed (if you use JRuby or you have ruby-ffi
-  installed on your system).
+* No compilation needed (once you have ruby-ffi installed or you are
+  using JRuby).
 
 * Not yet tested on windows platform.
 

data/Rakefile

@@ -22,7 +22,7 @@ PROJ.name = 'ffi-opengl'
 PROJ.authors = 'Andrea Fazzi'
 PROJ.email = 'andrea.fazzi@alcacoop.it'
 PROJ.url = 'http://github.com/remogatto/ffi-opengl'
-PROJ.version = FFIOpenGL::VERSION
+PROJ.version = '0.2.1'
 PROJ.rubyforge.name = 'ffi-opengl'
 
 PROJ.readme_file = 'README.rdoc'

data/bench/bench_spinning_cube.rb

@@ -1,4 +1,5 @@
-require File.expand_path(File.join(File.dirname(__FILE__), %w[.. lib ffi-opengl]))
+$:.unshift(File.expand_path(File.join(File.dirname(__FILE__), "..", "lib")))
+require 'ffi-opengl'
 
 require 'benchmark'
 

data/bench/ffi-opengl_spinning_cube.rb

@@ -1,5 +1,7 @@
+$:.unshift(File.expand_path(File.join(File.dirname(__FILE__), "..", "lib")))
+require 'ffi-opengl'
 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)

data/examples/gears.rb

@@ -10,10 +10,11 @@
 # 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]))
+$:.unshift(File.expand_path(File.join(File.dirname(__FILE__), "..", "lib")))
+require 'ffi-opengl'
 
 class Gears
-  include FFI, GL, GLU, GLUT
+  include FFI, GL, GLU, GLUT, Math
 
   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]) 

data/examples/spinning_cube.rb

@@ -67,7 +67,8 @@ class SpinningCube
 end
 
 if __FILE__ == $0
-  require File.expand_path(File.join(File.dirname(__FILE__), %w[.. lib ffi-opengl]))
+  $:.unshift(File.expand_path(File.join(File.dirname(__FILE__), "..", "lib")))
+  require '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])

data/lib/ffi-opengl.rb

@@ -1,55 +1,12 @@
-module FFIOpenGL
-
-  # :stopdoc:
-  VERSION = '0.2.0'
-  LIBPATH = ::File.expand_path(::File.dirname(__FILE__)) + ::File::SEPARATOR
-  PATH = ::File.dirname(LIBPATH) + ::File::SEPARATOR
-  # :startdoc:
-
-  # Returns the version string for the library.
-  #
-  def self.version
-    VERSION
-  end
-
-  # Returns the library path for the module. If any arguments are given,
-  # they will be joined to the end of the libray path using
-  # <tt>File.join</tt>.
-  #
-  def self.libpath( *args )
-    args.empty? ? LIBPATH : ::File.join(LIBPATH, args.flatten)
-  end
-
-  # Returns the lpath for the module. If any arguments are given,
-  # they will be joined to the end of the path using
-  # <tt>File.join</tt>.
-  #
-  def self.path( *args )
-    args.empty? ? PATH : ::File.join(PATH, args.flatten)
-  end
-
-  # Utility method used to require all files ending in .rb that lie in the
-  # directory below this file that has the same name as the filename passed
-  # in. Optionally, a specific _directory_ name can be passed in such that
-  # the _filename_ does not have to be equivalent to the directory.
-  #
-  def self.require_all_libs_relative_to( fname, dir = nil )
-    dir ||= ::File.basename(fname, '.*')
-    search_me = ::File.expand_path(
-        ::File.join(::File.dirname(fname), dir, '**', '*.rb'))
-
-    Dir.glob(search_me).sort.each {|rb| require rb}
-  end
-
-end
-
 begin
   require 'rubygems'
 rescue
   nil # try without it
 end
+
 require 'ffi'
-require "#{FFIOpenGL.libpath('ffi-opengl/platform')}"
-FFIOpenGL.require_all_libs_relative_to(__FILE__)
+require 'ffi-opengl/platform'
+require 'ffi-opengl/gl'
+require 'ffi-opengl/glu'
+require 'ffi-opengl/glut'
 
-# EOF

data/lib/ffi-opengl/glut.rb

@@ -201,7 +201,7 @@ module GLUT
   attach_function :glutPostWindowOverlayRedisplay, [ :int ], :void
   attach_function :glutShowOverlay, [  ], :void
   attach_function :glutHideOverlay, [  ], :void
-  attach_function :glutCreateMenu, [ callback(:callback, [ :int ], :void) ], :int
+  attach_function :glutCreateMenu, [ callback([ :int ], :void) ], :int
   attach_function :glutDestroyMenu, [ :int ], :void
   attach_function :glutGetMenu, [  ], :int
   attach_function :glutSetMenu, [ :int ], :void
@@ -212,31 +212,31 @@ module GLUT
   attach_function :glutRemoveMenuItem, [ :int ], :void
   attach_function :glutAttachMenu, [ :int ], :void
   attach_function :glutDetachMenu, [ :int ], :void
-  attach_function :glutTimerFunc, [ :uint, callback(:callback, [ :int ], :void), :int ], :void
-  attach_function :glutIdleFunc, [ callback(:callback, [  ], :void) ], :void
-  attach_function :glutKeyboardFunc, [ callback(:callback, [ :uchar, :int, :int ], :void) ], :void
-  attach_function :glutSpecialFunc, [ callback(:callback, [ :int, :int, :int ], :void) ], :void
-  attach_function :glutReshapeFunc, [ callback(:callback, [ :int, :int ], :void) ], :void
-  attach_function :glutVisibilityFunc, [ callback(:callback, [ :int ], :void) ], :void
-  attach_function :glutDisplayFunc, [ callback(:callback, [  ], :void) ], :void
-  attach_function :glutMouseFunc, [ callback(:callback, [ :int, :int, :int, :int ], :void) ], :void
-  attach_function :glutMotionFunc, [ callback(:callback, [ :int, :int ], :void) ], :void
-  attach_function :glutPassiveMotionFunc, [ callback(:callback, [ :int, :int ], :void) ], :void
-  attach_function :glutEntryFunc, [ callback(:callback, [ :int ], :void) ], :void
-  attach_function :glutKeyboardUpFunc, [ callback(:callback, [ :uchar, :int, :int ], :void) ], :void
-  attach_function :glutSpecialUpFunc, [ callback(:callback, [ :int, :int, :int ], :void) ], :void
-  attach_function :glutJoystickFunc, [ callback(:callback, [ :uint, :int, :int, :int ], :void), :int ], :void
-  attach_function :glutMenuStateFunc, [ callback(:callback, [ :int ], :void) ], :void
-  attach_function :glutMenuStatusFunc, [ callback(:callback, [ :int, :int, :int ], :void) ], :void
-  attach_function :glutOverlayDisplayFunc, [ callback(:callback, [  ], :void) ], :void
-  attach_function :glutWindowStatusFunc, [ callback(:callback, [ :int ], :void) ], :void
-  attach_function :glutSpaceballMotionFunc, [ callback(:callback, [ :int, :int, :int ], :void) ], :void
-  attach_function :glutSpaceballRotateFunc, [ callback(:callback, [ :int, :int, :int ], :void) ], :void
-  attach_function :glutSpaceballButtonFunc, [ callback(:callback, [ :int, :int ], :void) ], :void
-  attach_function :glutButtonBoxFunc, [ callback(:callback, [ :int, :int ], :void) ], :void
-  attach_function :glutDialsFunc, [ callback(:callback, [ :int, :int ], :void) ], :void
-  attach_function :glutTabletMotionFunc, [ callback(:callback, [ :int, :int ], :void) ], :void
-  attach_function :glutTabletButtonFunc, [ callback(:callback, [ :int, :int, :int, :int ], :void) ], :void
+  attach_function :glutTimerFunc, [ :uint, callback([ :int ], :void), :int ], :void
+  attach_function :glutIdleFunc, [ callback([  ], :void) ], :void
+  attach_function :glutKeyboardFunc, [ callback([ :uchar, :int, :int ], :void) ], :void
+  attach_function :glutSpecialFunc, [ callback([ :int, :int, :int ], :void) ], :void
+  attach_function :glutReshapeFunc, [ callback([ :int, :int ], :void) ], :void
+  attach_function :glutVisibilityFunc, [ callback([ :int ], :void) ], :void
+  attach_function :glutDisplayFunc, [ callback([  ], :void) ], :void
+  attach_function :glutMouseFunc, [ callback([ :int, :int, :int, :int ], :void) ], :void
+  attach_function :glutMotionFunc, [ callback([ :int, :int ], :void) ], :void
+  attach_function :glutPassiveMotionFunc, [ callback([ :int, :int ], :void) ], :void
+  attach_function :glutEntryFunc, [ callback([ :int ], :void) ], :void
+  attach_function :glutKeyboardUpFunc, [ callback([ :uchar, :int, :int ], :void) ], :void
+  attach_function :glutSpecialUpFunc, [ callback([ :int, :int, :int ], :void) ], :void
+  attach_function :glutJoystickFunc, [ callback([ :uint, :int, :int, :int ], :void), :int ], :void
+  attach_function :glutMenuStateFunc, [ callback([ :int ], :void) ], :void
+  attach_function :glutMenuStatusFunc, [ callback([ :int, :int, :int ], :void) ], :void
+  attach_function :glutOverlayDisplayFunc, [ callback([  ], :void) ], :void
+  attach_function :glutWindowStatusFunc, [ callback([ :int ], :void) ], :void
+  attach_function :glutSpaceballMotionFunc, [ callback([ :int, :int, :int ], :void) ], :void
+  attach_function :glutSpaceballRotateFunc, [ callback([ :int, :int, :int ], :void) ], :void
+  attach_function :glutSpaceballButtonFunc, [ callback([ :int, :int ], :void) ], :void
+  attach_function :glutButtonBoxFunc, [ callback([ :int, :int ], :void) ], :void
+  attach_function :glutDialsFunc, [ callback([ :int, :int ], :void) ], :void
+  attach_function :glutTabletMotionFunc, [ callback([ :int, :int ], :void) ], :void
+  attach_function :glutTabletButtonFunc, [ callback([ :int, :int, :int, :int ], :void) ], :void
   attach_function :glutGet, [ :uint ], :int
   attach_function :glutDeviceGet, [ :uint ], :int
   attach_function :glutGetModifiers, [  ], :int

data/tasks/generator.rake

@@ -1,6 +1,9 @@
 begin
   require 'ffi-swig-generator'
-  FFI::Generator::Task.new :input_fn => 'interfaces/*.i', :output_dir => 'generated/'
+  FFI::Generator::Task.new do |task|
+    task.input_fn = 'interfaces/*.i'
+    task.output_dir = 'generated/'
+  end
 rescue LoadError
   nil
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: remogatto-ffi-opengl
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - Andrea Fazzi
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-05 00:00:00 -07:00
+date: 2009-06-17 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,6 +22,16 @@ 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.5.1
+    version: 
 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: []
@@ -41,13 +51,6 @@ files:
 - 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
@@ -74,7 +77,7 @@ files:
 - tasks/spec.rake
 - tasks/svn.rake
 - tasks/test.rake
-has_rdoc: true
+has_rdoc: false
 homepage: http://github.com/remogatto/ffi-opengl
 post_install_message: 
 rdoc_options: 
@@ -99,7 +102,7 @@ requirements: []
 rubyforge_project: ffi-opengl
 rubygems_version: 1.2.0
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: ffi-opengl is an autogenerated[1] ruby FFI interface towards OpenGL libraries (GL, GLU, GLUT)
 test_files: []
 

data/ffi-opengl.gemspec

@@ -1,34 +0,0 @@
-# -*- 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