opengl 0.7.0.pre1-x86-mingw32 → 0.7.0.pre2-x86-mingw32

data/Rakefile.cross

@@ -9,7 +9,7 @@ require 'uri'
 require 'rbconfig'
 require 'pathname'
 
-ENV['RUBY_CC_VERSION'] ||= '1.8.7:1.9.3'
+ENV['RUBY_CC_VERSION'] ||= '1.9.3'
 
 # Cross-compilation constants
 COMPILE_HOME               = Pathname( "build" ).expand_path
@@ -94,6 +94,7 @@ end
 task LIBFREEGLUT_A => [LIBFREEGLUT_MAKEFILE] do |t|
   Dir.chdir( STATIC_LIBFREEGLUT_BUILDDIR ) do
     sh "make -j#{NUM_CPUS} install"
+    (STATIC_INSTALLDIR + "lib" + "libglut.dll.a").unlink
   end
 end
 
@@ -101,4 +102,6 @@ desc "compile static libraries"
 task :static_libs => [ LIBFREEGLUT_A ]
 
 desc 'cross compile required libs for win32'
-task :cross => [ :static_libs ]
+task :cross => [ :static_libs ] do
+  ENV['CROSS_COMPILING'] = 'yes'
+end

data/examples/NeHe/nehe_lesson02.rb

@@ -2,12 +2,10 @@
 # Name:  nehe_lesson02.rb
 # Purpose: An implementation of NeHe's OpenGL Lesson #02
 #          using ruby-opengl (http://nehe.gamedev.net/)
-# 
+#
 
-require "gl"
-require "glu"
-require "glut"
-require "mathn"
+require 'opengl'
+require 'mathn'
 
 # Add GL and GLUT namespaces in to make porting easier
 include Gl
@@ -15,103 +13,104 @@ include Glu
 include Glut
 
 # Placeholder for the window object
-window = ""
-
-def init_gl_window(width = 640, height = 480)
-    # Background color to black
-    glClearColor(0.0, 0.0, 0.0, 0)
-    # Enables clearing of depth buffer
-    glClearDepth(1.0)
-    # Set type of depth test
-    glDepthFunc(GL_LEQUAL)
-    # Enable depth testing
-    glEnable(GL_DEPTH_TEST)
-    # Enable smooth color shading
-    glShadeModel(GL_SMOOTH)
-
-    glMatrixMode(GL_PROJECTION)
-    glLoadIdentity
-    # Calculate aspect ratio of the window
-    gluPerspective(45.0, width / height, 0.1, 100.0)
-
-    glMatrixMode(GL_MODELVIEW)
-
-    draw_gl_scene
+window = nil
+
+def init_gl_window width = 640, height = 480
+  # Background color to black
+  glClearColor 0.0, 0.0, 0.0, 0
+  # Enables clearing of depth buffer
+  glClearDepth 1.0
+  # Set type of depth test
+  glDepthFunc GL_LEQUAL
+  # Enable depth testing
+  glEnable GL_DEPTH_TEST
+  # Enable smooth color shading
+  glShadeModel GL_SMOOTH
+
+  glMatrixMode GL_PROJECTION
+  glLoadIdentity
+  # Calculate aspect ratio of the window
+  gluPerspective 45.0, width / height, 0.1, 100.0
+
+  glMatrixMode GL_MODELVIEW
+
+  draw_gl_scene
 end
 
 #reshape = Proc.new do |width, height|
-def reshape(width, height)
-    height = 1 if height == 0
+def reshape width, height
+  height = 1 if height == 0
 
-    # Reset current viewpoint and perspective transformation
-    glViewport(0, 0, width, height)
+  # Reset current viewpoint and perspective transformation
+  glViewport 0, 0, width, height
 
-    glMatrixMode(GL_PROJECTION)
-    glLoadIdentity
+  glMatrixMode GL_PROJECTION
+  glLoadIdentity
 
-    gluPerspective(45.0, width / height, 0.1, 100.0)
+  gluPerspective 45.0, width / height, 0.1, 100.0
 end
 
 #draw_gl_scene = Proc.new do
 def draw_gl_scene
-    # Clear the screen and depth buffer
-    glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT)
-
-    # Reset the view
-    glMatrixMode(GL_MODELVIEW)
-    glLoadIdentity
-
-    # Move left 1.5 units and into the screen 6.0 units
-    glTranslatef(-1.5, 0.0, -6.0)
-
-    # Draw a triangle
-    glBegin(GL_POLYGON)
-        glVertex3f( 0.0,  1.0, 0.0)
-        glVertex3f( 1.0, -1.0, 0.0)
-        glVertex3f(-1.0, -1.0, 0.0)
-    glEnd
-
-    # Move right 3 units
-    glTranslatef(3.0, 0.0, 0.0)
-
-    # Draw a rectangle
-    glBegin(GL_QUADS)
-        glVertex3f(-1.0,  1.0, 0.0)
-        glVertex3f( 1.0,  1.0, 0.0)
-        glVertex3f( 1.0, -1.0, 0.0)
-        glVertex3f(-1.0, -1.0, 0.0)
-    glEnd
-
-    # Swap buffers for display 
-    glutSwapBuffers
+  # Clear the screen and depth buffer
+  glClear GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT
+
+  # Reset the view
+  glMatrixMode GL_MODELVIEW
+  glLoadIdentity
+
+  # Move left 1.5 units and into the screen 6.0 units
+  glTranslatef -1.5, 0.0, -6.0
+
+  # Draw a triangle
+  glBegin GL_POLYGON do
+    glVertex3f  0.0,  1.0, 0.0
+    glVertex3f  1.0, -1.0, 0.0
+    glVertex3f -1.0, -1.0, 0.0
+  end
+
+  # Move right 3 units
+  glTranslatef 3.0, 0.0, 0.0
+
+  # Draw a rectangle
+  glBegin GL_QUADS do
+    glVertex3f -1.0,  1.0, 0.0
+    glVertex3f  1.0,  1.0, 0.0
+    glVertex3f  1.0, -1.0, 0.0
+    glVertex3f -1.0, -1.0, 0.0
+  end
+
+  # Swap buffers for display
+  glutSwapBuffers
 end
 
-# The idle function to handle 
+# The idle function to handle
 def idle
-    glutPostRedisplay
+  glutPostRedisplay
 end
 
 # Keyboard handler to exit when ESC is typed
 keyboard = lambda do |key, x, y|
-    case(key)
-      when ?\e
-          glutDestroyWindow(window)
-          exit(0)
-      end
-      glutPostRedisplay
+  case key
+  when ?\e
+    glutDestroyWindow window
+    exit(0)
+  end
+  glutPostRedisplay
 end
 
 
 # Initliaze our GLUT code
-glutInit;
+glutInit
 # Setup a double buffer, RGBA color, alpha components and depth buffer
-glutInitDisplayMode(GLUT_RGB | GLUT_DOUBLE | GLUT_ALPHA | GLUT_DEPTH);
-glutInitWindowSize(640, 480);
-glutInitWindowPosition(0, 0);
-window = glutCreateWindow("NeHe Lesson 02 - ruby-opengl version");
-glutDisplayFunc(method(:draw_gl_scene).to_proc);
-glutReshapeFunc(method(:reshape).to_proc);
-glutIdleFunc(method(:idle).to_proc);
-glutKeyboardFunc(keyboard);
-init_gl_window(640, 480)
-glutMainLoop();
+glutInitDisplayMode GLUT_RGB | GLUT_DOUBLE | GLUT_ALPHA | GLUT_DEPTH
+glutInitWindowSize 640, 480
+glutInitWindowPosition 0, 0
+window = glutCreateWindow "NeHe Lesson 02 - ruby-opengl version"
+glutIdleFunc :idle
+glutDisplayFunc :draw_gl_scene
+glutReshapeFunc :reshape
+glutKeyboardFunc keyboard
+init_gl_window 640, 480
+glutMainLoop
+

data/examples/NeHe/nehe_lesson03.rb

@@ -2,12 +2,10 @@
 # Name:  nehe_lesson03.rb
 # Purpose: An implementation of NeHe's OpenGL Lesson #03
 #          using ruby-opengl (http://nehe.gamedev.net/)
-# 
+#
 
-require "gl"
-require "glu"
-require "glut"
-require "mathn"
+require 'opengl'
+require 'mathn'
 
 # Add GL and GLUT namespaces in to make porting easier
 include Gl
@@ -15,108 +13,110 @@ include Glu
 include Glut
 
 # Placeholder for the window object
-window = ""
-
-def init_gl_window(width = 640, height = 480)
-    # Background color to black
-    glClearColor(0.0, 0.0, 0.0, 0)
-    # Enables clearing of depth buffer
-    glClearDepth(1.0)
-    # Set type of depth test
-    glDepthFunc(GL_LEQUAL)
-    # Enable depth testing
-    glEnable(GL_DEPTH_TEST)
-    # Enable smooth color shading
-    glShadeModel(GL_SMOOTH)
-
-    glMatrixMode(GL_PROJECTION)
-    glLoadIdentity
-    # Calculate aspect ratio of the window
-    gluPerspective(45.0, width / height, 0.1, 100.0)
-
-    glMatrixMode(GL_MODELVIEW)
-
-    draw_gl_scene
+window = nil
+
+def init_gl_window width = 640, height = 480
+  # Background color to black
+  glClearColor 0.0, 0.0, 0.0, 0
+  # Enables clearing of depth buffer
+  glClearDepth 1.0
+  # Set type of depth test
+  glDepthFunc GL_LEQUAL
+  # Enable depth testing
+  glEnable GL_DEPTH_TEST
+  # Enable smooth color shading
+  glShadeModel GL_SMOOTH
+
+  glMatrixMode GL_PROJECTION
+  glLoadIdentity
+  # Calculate aspect ratio of the window
+  gluPerspective 45.0, width / height, 0.1, 100.0
+
+  glMatrixMode GL_MODELVIEW
+
+  draw_gl_scene
 end
 
 #reshape = Proc.new do |width, height|
-def reshape(width, height)
-    height = 1 if height == 0
+def reshape width, height
+  height = 1 if height == 0
 
-    # Reset current viewpoint and perspective transformation
-    glViewport(0, 0, width, height)
+  # Reset current viewpoint and perspective transformation
+  glViewport 0, 0, width, height
 
-    glMatrixMode(GL_PROJECTION)
-    glLoadIdentity
+  glMatrixMode GL_PROJECTION
+  glLoadIdentity
 
-    gluPerspective(45.0, width / height, 0.1, 100.0)
+  gluPerspective 45.0, width / height, 0.1, 100.0
 end
 
 #draw_gl_scene = Proc.new do
 def draw_gl_scene
-    # Clear the screen and depth buffer
-    glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT)
-
-    # Reset the view
-    glMatrixMode(GL_MODELVIEW)
-    glLoadIdentity
-
-    # Move left 1.5 units and into the screen 6.0 units
-    glTranslatef(-1.5, 0.0, -6.0)
-
-    # Draw a triangle
-    glBegin(GL_POLYGON)
-        glColor3f(1.0, 0.0, 0.0)
-        glVertex3f( 0.0,  1.0, 0.0)
-        glColor3f(0.0, 1.0, 0.0)
-        glVertex3f( 1.0, -1.0, 0.0)
-        glColor3f(0.0, 0.0, 1.0)
-        glVertex3f(-1.0, -1.0, 0.0)
-    glEnd
-
-    # Move right 3 units
-    glTranslatef(3.0, 0.0, 0.0)
-
-    # Draw a rectangle
-    # Set it to a blue color one time only
-    glColor3f(0.5, 0.5, 1.0)
-    glBegin(GL_QUADS)
-        glVertex3f(-1.0,  1.0, 0.0)
-        glVertex3f( 1.0,  1.0, 0.0)
-        glVertex3f( 1.0, -1.0, 0.0)
-        glVertex3f(-1.0, -1.0, 0.0)
-    glEnd
-
-    # Swap buffers for display 
-    glutSwapBuffers
+  # Clear the screen and depth buffer
+  glClear GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT
+
+  # Reset the view
+  glMatrixMode GL_MODELVIEW
+  glLoadIdentity
+
+  # Move left 1.5 units and into the screen 6.0 units
+  glTranslatef -1.5, 0.0, -6.0
+
+  # Draw a triangle setting the color to red, green, blue for each respective
+  # vertex
+  glBegin GL_POLYGON do
+    glColor3f 1.0, 0.0, 0.0
+    glVertex3f  0.0,  1.0, 0.0
+    glColor3f 0.0, 1.0, 0.0
+    glVertex3f  1.0, -1.0, 0.0
+    glColor3f 0.0, 0.0, 1.0
+    glVertex3f -1.0, -1.0, 0.0
+  end
+
+  # Move right 3 units
+  glTranslatef 3.0, 0.0, 0.0
+
+  # Set the color to medium blue for all vertexes
+  glColor3f 0.5, 0.5, 1.0
+  # Draw a rectangle
+  glBegin GL_QUADS do
+    glVertex3f -1.0,  1.0, 0.0
+    glVertex3f  1.0,  1.0, 0.0
+    glVertex3f  1.0, -1.0, 0.0
+    glVertex3f -1.0, -1.0, 0.0
+  end
+
+  # Swap buffers for display
+  glutSwapBuffers
 end
 
-# The idle function to handle 
+# The idle function to handle
 def idle
-    glutPostRedisplay
+  glutPostRedisplay
 end
 
 # Keyboard handler to exit when ESC is typed
 keyboard = lambda do |key, x, y|
-    case(key)
-      when ?\e
-          glutDestroyWindow(window)
-          exit(0)
-      end
-      glutPostRedisplay
+  case key
+  when ?\e
+    glutDestroyWindow window
+    exit(0)
+  end
+  glutPostRedisplay
 end
 
 
 # Initliaze our GLUT code
-glutInit;
+glutInit
 # Setup a double buffer, RGBA color, alpha components and depth buffer
-glutInitDisplayMode(GLUT_RGB | GLUT_DOUBLE | GLUT_ALPHA | GLUT_DEPTH);
-glutInitWindowSize(640, 480);
-glutInitWindowPosition(0, 0);
-window = glutCreateWindow("NeHe Lesson 03 - ruby-opengl version");
-glutDisplayFunc(method(:draw_gl_scene).to_proc);
-glutReshapeFunc(method(:reshape).to_proc);
-glutIdleFunc(method(:idle).to_proc);
-glutKeyboardFunc(keyboard);
-init_gl_window(640, 480)
-glutMainLoop();
+glutInitDisplayMode GLUT_RGB | GLUT_DOUBLE | GLUT_ALPHA | GLUT_DEPTH
+glutInitWindowSize 640, 480
+glutInitWindowPosition 0, 0
+window = glutCreateWindow "NeHe Lesson 03 - ruby-opengl version"
+glutIdleFunc :idle
+glutDisplayFunc :draw_gl_scene
+glutReshapeFunc :reshape
+glutKeyboardFunc keyboard
+init_gl_window 640, 480
+glutMainLoop
+