fxruby 1.6.46 → 1.6.47

data/docs/top-level-namespace.html

@@ -204,9 +204,9 @@
 </div>
 
       <div id="footer">
-  Generated on Mon Jan  2 11:47:21 2023 by
+  Generated on Sun May 14 21:55:15 2023 by
   <a href="https://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
-  0.9.28 (ruby-3.1.2).
+  0.9.34 (ruby-3.2.0).
 </div>
 
     </div>

data/examples/gltest.rb

@@ -6,8 +6,8 @@ begin
 rescue LoadError
   require 'fox16/missingdep'
   MSG = <<EOM
-  Sorry, this example depends on the opengl-bindings gems. Please execute:
-    gem install opengl-bindings
+  Sorry, this example depends on the opengl-bindings2 gems. Please execute:
+    gem install opengl-bindings2
 EOM
   missingDependency(MSG)
 end
@@ -16,67 +16,66 @@ end
 
 class GLTestWindow < Fox::FXMainWindow
   include Fox
-  include OpenGL
 
   # How often our timer will fire (in milliseconds)
   TIMER_INTERVAL = 100
 
   # Draws a simple box using the given corners
   def drawBox(xmin, ymin, zmin, xmax, ymax, zmax)
-    glBegin(GL_TRIANGLE_STRIP)
-      glNormal3d(0.0, 0.0, -1.0)
-      glVertex3d(xmin, ymin, zmin)
-      glVertex3d(xmin, ymax, zmin)
-      glVertex3d(xmax, ymin, zmin)
-      glVertex3d(xmax, ymax, zmin)
-    glEnd()
-
-    glBegin(GL_TRIANGLE_STRIP)
-      glNormal3d(1.0, 0.0, 0.0)
-      glVertex3d(xmax, ymin, zmin)
-      glVertex3d(xmax, ymax, zmin)
-      glVertex3d(xmax, ymin, zmax)
-      glVertex3d(xmax, ymax, zmax)
-    glEnd()
-
-    glBegin(GL_TRIANGLE_STRIP)
-      glNormal3d(0.0, 0.0, 1.0)
-      glVertex3d(xmax, ymin, zmax)
-      glVertex3d(xmax, ymax, zmax)
-      glVertex3d(xmin, ymin, zmax)
-      glVertex3d(xmin, ymax, zmax)
-    glEnd()
-
-    glBegin(GL_TRIANGLE_STRIP)
-      glNormal3d(-1.0, 0.0, 0.0)
-      glVertex3d(xmin, ymin, zmax)
-      glVertex3d(xmin, ymax, zmax)
-      glVertex3d(xmin, ymin, zmin)
-      glVertex3d(xmin, ymax, zmin)
-    glEnd()
-
-    glBegin(GL_TRIANGLE_STRIP)
-      glNormal3d(0.0, 1.0, 0.0)
-      glVertex3d(xmin, ymax, zmin)
-      glVertex3d(xmin, ymax, zmax)
-      glVertex3d(xmax, ymax, zmin)
-      glVertex3d(xmax, ymax, zmax)
-    glEnd()
-
-    glBegin(GL_TRIANGLE_STRIP)
-      glNormal3d(0.0, -1.0, 0.0)
-      glVertex3d(xmax, ymin, zmax)
-      glVertex3d(xmax, ymin, zmin)
-      glVertex3d(xmin, ymin, zmax)
-      glVertex3d(xmin, ymin, zmin)
-    glEnd()
+    GL.Begin(GL::TRIANGLE_STRIP)
+      GL.Normal3d(0.0, 0.0, -1.0)
+      GL.Vertex3d(xmin, ymin, zmin)
+      GL.Vertex3d(xmin, ymax, zmin)
+      GL.Vertex3d(xmax, ymin, zmin)
+      GL.Vertex3d(xmax, ymax, zmin)
+    GL.End()
+
+    GL.Begin(GL::TRIANGLE_STRIP)
+      GL.Normal3d(1.0, 0.0, 0.0)
+      GL.Vertex3d(xmax, ymin, zmin)
+      GL.Vertex3d(xmax, ymax, zmin)
+      GL.Vertex3d(xmax, ymin, zmax)
+      GL.Vertex3d(xmax, ymax, zmax)
+    GL.End()
+
+    GL.Begin(GL::TRIANGLE_STRIP)
+      GL.Normal3d(0.0, 0.0, 1.0)
+      GL.Vertex3d(xmax, ymin, zmax)
+      GL.Vertex3d(xmax, ymax, zmax)
+      GL.Vertex3d(xmin, ymin, zmax)
+      GL.Vertex3d(xmin, ymax, zmax)
+    GL.End()
+
+    GL.Begin(GL::TRIANGLE_STRIP)
+      GL.Normal3d(-1.0, 0.0, 0.0)
+      GL.Vertex3d(xmin, ymin, zmax)
+      GL.Vertex3d(xmin, ymax, zmax)
+      GL.Vertex3d(xmin, ymin, zmin)
+      GL.Vertex3d(xmin, ymax, zmin)
+    GL.End()
+
+    GL.Begin(GL::TRIANGLE_STRIP)
+      GL.Normal3d(0.0, 1.0, 0.0)
+      GL.Vertex3d(xmin, ymax, zmin)
+      GL.Vertex3d(xmin, ymax, zmax)
+      GL.Vertex3d(xmax, ymax, zmin)
+      GL.Vertex3d(xmax, ymax, zmax)
+    GL.End()
+
+    GL.Begin(GL::TRIANGLE_STRIP)
+      GL.Normal3d(0.0, -1.0, 0.0)
+      GL.Vertex3d(xmax, ymin, zmax)
+      GL.Vertex3d(xmax, ymin, zmin)
+      GL.Vertex3d(xmin, ymin, zmax)
+      GL.Vertex3d(xmin, ymin, zmin)
+    GL.End()
   end
 
   def gluPerspective(fovY, aspect, zNear, zFar )
     fH = Math.tan( fovY / 360 * Math::PI ) * zNear;
     fW = fH * aspect;
 
-    glFrustum( -fW, fW, -fH, fH, zNear, zFar );
+    GL.Frustum( -fW, fW, -fH, fH, zNear, zFar );
   end
 
   # Define our own version of gluLookAt() to avoid dependency to deprecated GLU library
@@ -122,8 +121,8 @@ class GLTestWindow < Fox::FXMainWindow
       x2,y2,z2,0,
       0,  0, 0,1,
     ].pack("d*")
-    glMultMatrixd m4x4
-    glTranslated -ex,-ey,-ez
+    GL.MultMatrixd m4x4
+    GL.Translated -ex,-ey,-ez
   end
 
   # Draw the GL scene
@@ -141,80 +140,80 @@ class GLTestWindow < Fox::FXMainWindow
     # Make context current
     @glcanvas.makeCurrent()
 
-    glViewport(0, 0, @glcanvas.width, @glcanvas.height)
+    GL.Viewport(0, 0, @glcanvas.width, @glcanvas.height)
 
-    glClearColor(1.0, 1.0, 1.0, 1.0)
-    glClear(GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT)
-    glEnable(GL_DEPTH_TEST)
+    GL.ClearColor(1.0, 1.0, 1.0, 1.0)
+    GL.Clear(GL::COLOR_BUFFER_BIT|GL::DEPTH_BUFFER_BIT)
+    GL.Enable(GL::DEPTH_TEST)
 
-    glDisable(GL_DITHER)
+    GL.Disable(GL::DITHER)
 
-    glMatrixMode(GL_PROJECTION)
-    glLoadIdentity()
+    GL.MatrixMode(GL::PROJECTION)
+    GL.LoadIdentity()
     gluPerspective(30.0, aspect, 1.0, 100.0)
 
-    glMatrixMode(GL_MODELVIEW)
-    glLoadIdentity()
+    GL.MatrixMode(GL::MODELVIEW)
+    GL.LoadIdentity()
     gluLookAt(5.0, 10.0, 15.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0)
 
-    glShadeModel(GL_SMOOTH)
-    glLightfv(GL_LIGHT0, GL_POSITION, lightPosition.pack("f*"))
-    glLightfv(GL_LIGHT0, GL_AMBIENT, lightAmbient.pack("f*"))
-    glLightfv(GL_LIGHT0, GL_DIFFUSE, lightDiffuse.pack("f*"))
-    glEnable(GL_LIGHT0)
-    glEnable(GL_LIGHTING)
+    GL.ShadeModel(GL::SMOOTH)
+    GL.Lightfv(GL::LIGHT0, GL::POSITION, lightPosition.pack("f*"))
+    GL.Lightfv(GL::LIGHT0, GL::AMBIENT, lightAmbient.pack("f*"))
+    GL.Lightfv(GL::LIGHT0, GL::DIFFUSE, lightDiffuse.pack("f*"))
+    GL.Enable(GL::LIGHT0)
+    GL.Enable(GL::LIGHTING)
 
-    glMaterialfv(GL_FRONT, GL_AMBIENT, blueMaterial.pack("f*"))
-    glMaterialfv(GL_FRONT, GL_DIFFUSE, blueMaterial.pack("f*"))
+    GL.Materialfv(GL::FRONT, GL::AMBIENT, blueMaterial.pack("f*"))
+    GL.Materialfv(GL::FRONT, GL::DIFFUSE, blueMaterial.pack("f*"))
 
-    glPushMatrix()
-    glRotated(@angle, 0.0, 1.0, 0.0)
+    GL.PushMatrix()
+    GL.Rotated(@angle, 0.0, 1.0, 0.0)
     drawBox(-1, -1, -1, 1, 1, 1)
 
-    glMaterialfv(GL_FRONT, GL_AMBIENT, redMaterial.pack("f*"))
-    glMaterialfv(GL_FRONT, GL_DIFFUSE, redMaterial.pack("f*"))
+    GL.Materialfv(GL::FRONT, GL::AMBIENT, redMaterial.pack("f*"))
+    GL.Materialfv(GL::FRONT, GL::DIFFUSE, redMaterial.pack("f*"))
 
-    glPushMatrix()
-    glTranslated(0.0, 1.75, 0.0)
-    glRotated(@angle, 0.0, 1.0, 0.0)
+    GL.PushMatrix()
+    GL.Translated(0.0, 1.75, 0.0)
+    GL.Rotated(@angle, 0.0, 1.0, 0.0)
     drawBox(-0.5, -0.5, -0.5, 0.5, 0.5, 0.5)
-    glPopMatrix()
+    GL.PopMatrix()
 
-    glPushMatrix()
-    glTranslated(0.0, -1.75, 0.0)
-    glRotated(@angle, 0.0, 1.0, 0.0)
+    GL.PushMatrix()
+    GL.Translated(0.0, -1.75, 0.0)
+    GL.Rotated(@angle, 0.0, 1.0, 0.0)
     drawBox(-0.5, -0.5, -0.5, 0.5, 0.5, 0.5)
-    glPopMatrix()
+    GL.PopMatrix()
 
-    glPushMatrix()
-    glRotated(90.0, 1.0, 0.0, 0.0)
-    glTranslated(0.0, 1.75, 0.0)
-    glRotated(@angle, 0.0, 1.0, 0.0)
+    GL.PushMatrix()
+    GL.Rotated(90.0, 1.0, 0.0, 0.0)
+    GL.Translated(0.0, 1.75, 0.0)
+    GL.Rotated(@angle, 0.0, 1.0, 0.0)
     drawBox(-0.5,-0.5,-0.5,0.5,0.5,0.5)
-    glPopMatrix()
+    GL.PopMatrix()
 
-    glPushMatrix()
-    glRotated(90.0, -1.0, 0.0, 0.0)
-    glTranslated(0.0,1.75,0.0)
-    glRotated(@angle, 0.0, 1.0, 0.0)
+    GL.PushMatrix()
+    GL.Rotated(90.0, -1.0, 0.0, 0.0)
+    GL.Translated(0.0,1.75,0.0)
+    GL.Rotated(@angle, 0.0, 1.0, 0.0)
     drawBox(-0.5,-0.5,-0.5,0.5,0.5,0.5)
-    glPopMatrix()
+    GL.PopMatrix()
 
-    glPushMatrix()
-    glRotated(90.0, 0.0, 0.0, 1.0)
-    glTranslated(0.0,1.75,0.0)
-    glRotated(@angle, 0.0, 1.0, 0.0)
+    GL.PushMatrix()
+    GL.Rotated(90.0, 0.0, 0.0, 1.0)
+    GL.Translated(0.0,1.75,0.0)
+    GL.Rotated(@angle, 0.0, 1.0, 0.0)
     drawBox(-0.5,-0.5,-0.5,0.5,0.5,0.5)
-    glPopMatrix()
+    GL.PopMatrix()
 
-    glPushMatrix()
-    glRotated(90.0, 0.0, 0.0, -1.0)
-    glTranslated(0.0,1.75,0.0)
-    glRotated(@angle, 0.0, 1.0, 0.0)
+    GL.PushMatrix()
+    GL.Rotated(90.0, 0.0, 0.0, -1.0)
+    GL.Translated(0.0,1.75,0.0)
+    GL.Rotated(@angle, 0.0, 1.0, 0.0)
     drawBox(-0.5,-0.5,-0.5,0.5,0.5,0.5)
-    glPopMatrix()
+    GL.PopMatrix()
 
-    glPopMatrix()
+    GL.PopMatrix()
 
     # Swap if it is double-buffered
     if @glvisual.isDoubleBuffer
@@ -229,7 +228,7 @@ class GLTestWindow < Fox::FXMainWindow
     # Invoke the base class initializer
     super(app, "OpenGL Test Application", :opts => DECOR_ALL, :width => 800, :height => 600)
 
-    OpenGL.load_lib
+    GL.load_lib
 
     # Construct the main window elements
     frame = FXHorizontalFrame.new(self, LAYOUT_SIDE_TOP|LAYOUT_FILL_X|LAYOUT_FILL_Y)
@@ -263,7 +262,7 @@ class GLTestWindow < Fox::FXMainWindow
     @glcanvas.connect(SEL_PAINT) { drawScene }
     @glcanvas.connect(SEL_CONFIGURE) do
       if @glcanvas.makeCurrent
-        glViewport(0, 0, @glcanvas.width, @glcanvas.height)
+        GL.Viewport(0, 0, @glcanvas.width, @glcanvas.height)
         @glcanvas.makeNonCurrent
       end
     end

data/examples/glviewer.rb

@@ -7,8 +7,8 @@ begin
 rescue LoadError
   require 'fox16/missingdep'
   MSG = <<EOM
-  Sorry, this example depends on the opengl-bindings gems. Please execute:
-    gem install opengl-bindings
+  Sorry, this example depends on the opengl-bindings2 gems. Please execute:
+    gem install opengl-bindings2
 EOM
   missingDependency(MSG)
 end
@@ -161,7 +161,7 @@ class GLViewWindow < Fox::FXMainWindow
     # Initialize base class first
     super(app, "OpenGL Example Application", :opts => DECOR_ALL, :width => 800, :height => 600)
 
-    OpenGL.load_lib
+    GL.load_lib
     GLU.load_lib
 
     # Define message identifiers for this class

data/ext/fox16_c/extconf.rb

@@ -20,20 +20,20 @@ def fxscintilla_support_suppressed?
   !with_config("fxscintilla", true)
 end
 
-LIBZ_VERSION = ENV['LIBZ_VERSION'] || '1.2.13'
+LIBZ_VERSION = ENV['LIBZ_VERSION'] || '1.3.1'
 LIBZ_SOURCE_URI = "http://zlib.net/fossils/zlib-#{LIBZ_VERSION}.tar.gz"
 
-LIBPNG_VERSION = ENV['LIBPNG_VERSION'] || '1.6.39'
+LIBPNG_VERSION = ENV['LIBPNG_VERSION'] || '1.6.42'
 # LIBPNG_SOURCE_URI = "http://prdownloads.sourceforge.net/libpng/libpng-#{LIBPNG_VERSION}.tar.gz"
 LIBPNG_SOURCE_URI = "https://netcologne.dl.sourceforge.net/project/libpng/libpng16/#{LIBPNG_VERSION}/libpng-#{LIBPNG_VERSION}.tar.xz"
 
 # LIBJPEG_VERSION = ENV['LIBJPEG_VERSION'] || '9b'
 # LIBJPEG_SOURCE_URI = "http://www.ijg.org/files/jpegsrc.v#{LIBJPEG_VERSION}.tar.gz"
 
-LIBJPEG_VERSION = ENV['LIBJPEG_VERSION'] || '2.1.5.1'
-LIBJPEG_SOURCE_URI = "https://downloads.sourceforge.net/libjpeg-turbo/libjpeg-turbo-#{LIBJPEG_VERSION}.tar.gz"
+LIBJPEG_VERSION = ENV['LIBJPEG_VERSION'] || '3.0.2'
+LIBJPEG_SOURCE_URI = "https://github.com/libjpeg-turbo/libjpeg-turbo/releases/download/#{LIBJPEG_VERSION}/libjpeg-turbo-#{LIBJPEG_VERSION}.tar.gz"
 
-LIBTIFF_VERSION = ENV['LIBTIFF_VERSION'] || '4.5.0'
+LIBTIFF_VERSION = ENV['LIBTIFF_VERSION'] || '4.6.0'
 LIBTIFF_SOURCE_URI = "http://download.osgeo.org/libtiff/tiff-#{LIBTIFF_VERSION}.tar.gz"
 
 LIBFOX_VERSION            = ENV['LIBFOX_VERSION'] || '1.6.57'

data/fxruby.gemspec

@@ -50,12 +50,12 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.extensions = ["ext/fox16_c/extconf.rb"]
   spec.metadata['msys2_mingw_dependencies'] = 'fox'
-  spec.required_ruby_version = [">= 2.5", "< 4"]
+  spec.required_ruby_version = [">= 2.6", "< 4"]
 
   spec.add_runtime_dependency 'mini_portile2', '~> 2.1'
 
   yardopts = File.read(".yardopts")
-  spec.rdoc_options  = ["--main", "README.rdoc",
+  spec.rdoc_options  = ["--main", "README.md",
                         "--title", "FXRuby API Documentation"]
   docfiles = yardopts.lines.map(&:strip).select{|r| r=~/^[^-]/ }
   spec.extra_rdoc_files = `git ls-files -z #{docfiles.join(" ")}`.split("\x0")

data/lib/fox16/glgroup.rb

@@ -9,7 +9,6 @@ module Fox
   # A group of OpenGL objects
   #
   class FXGLGroup < FXGLObject
-    include OpenGL if defined?(OpenGL)
     include Enumerable
 
     FLT_MAX =  1.0e+20
@@ -80,12 +79,12 @@ module Fox
     #
     def hit(viewer)
 #     GL.PushName(0xffffffff)
-      glPushName(1000000)
+      GL.PushName(1000000)
       @list.each_with_index do |obj, i|
-        glLoadName(i)
+        GL.LoadName(i)
         obj.hit(viewer)
       end
-      glPopName
+      GL.PopName
     end
 
     #

data/lib/fox16/glshapes.rb

@@ -9,8 +9,6 @@ module Fox
   # OpenGL point object
   #
   class FXGLPoint < FXGLObject
-    include OpenGL
-
     # Point position, in model coordinates (a 3-element array)
     attr_accessor :pos
 
@@ -48,20 +46,20 @@ module Fox
     # Draw this point into _viewer_ (an FXGLViewer instance).
     #
     def draw(viewer)
-      glColor3d(0.0, 0.0, 1.0)
-      glPointSize(HANDLE_SIZE)
-      glBegin(GL_POINTS)
-      glVertex3d(*@pos)
-      glEnd()
+      GL.Color3d(0.0, 0.0, 1.0)
+      GL.PointSize(HANDLE_SIZE)
+      GL.Begin(GL::POINTS)
+      GL.Vertex3d(*@pos)
+      GL.End()
     end
 
     #
     # Perform hit test for this point in _viewer_ (an FXGLViewer instance).
     #
     def hit(viewer)
-      glBegin(GL_POINTS)
-      glVertex3d(*@pos)
-      glEnd()
+      GL.Begin(GL::POINTS)
+      GL.Vertex3d(*@pos)
+      GL.End()
     end
   end
 
@@ -69,8 +67,6 @@ module Fox
   # OpenGL line object
   #
   class FXGLLine < FXGLObject
-    include OpenGL
-
     # Starting point for line [FXGLPoint]
     attr_accessor :fm
 
@@ -122,22 +118,22 @@ module Fox
     # Draw this line into _viewer_ (an FXGLViewer instance).
     #
     def draw(viewer)
-      glColor3d(1.0, 0.0, 0.0)
-      glPointSize(HANDLE_SIZE)
-      glBegin(GL_LINES)
-      glVertex3d(*@fm.pos)
-      glVertex3d(*@to.pos)
-      glEnd()
+      GL.Color3d(1.0, 0.0, 0.0)
+      GL.PointSize(HANDLE_SIZE)
+      GL.Begin(GL::LINES)
+      GL.Vertex3d(*@fm.pos)
+      GL.Vertex3d(*@to.pos)
+      GL.End()
     end
 
     #
     # Perform hit-test for this line in _viewer_ (an FXGLViewer instance).
     #
     def hit(viewer)
-      glBegin(GL_LINES)
-      glVertex3d(*@fm.pos)
-      glVertex3d(*@to.pos)
-      glEnd()
+      GL.Begin(GL::LINES)
+      GL.Vertex3d(*@fm.pos)
+      GL.Vertex3d(*@to.pos)
+      GL.End()
     end
   end
 
@@ -145,8 +141,6 @@ module Fox
   # OpenGL cube object
   #
   class FXGLCube < FXGLShape
-    include OpenGL
-
     # Cube width [Float]
     attr_accessor :width
 
@@ -198,58 +192,58 @@ module Fox
       zmin, zmax = -0.5*@depth, 0.5*@depth
 
       # Draw low face
-      glBegin(GL_TRIANGLE_STRIP)
-        glNormal3d(0.0, 0.0, -1.0)
-        glVertex3d(xmin, ymin, zmin)
-        glVertex3d(xmin, ymax, zmin)
-        glVertex3d(xmax, ymin, zmin)
-        glVertex3d(xmax, ymax, zmin)
-      glEnd()
+      GL.Begin(GL::TRIANGLE_STRIP)
+        GL.Normal3d(0.0, 0.0, -1.0)
+        GL.Vertex3d(xmin, ymin, zmin)
+        GL.Vertex3d(xmin, ymax, zmin)
+        GL.Vertex3d(xmax, ymin, zmin)
+        GL.Vertex3d(xmax, ymax, zmin)
+      GL.End()
 
       # Draw east face
-      glBegin(GL_TRIANGLE_STRIP)
-        glNormal3d(1.0, 0.0, 0.0)
-        glVertex3d(xmax, ymin, zmin)
-        glVertex3d(xmax, ymax, zmin)
-        glVertex3d(xmax, ymin, zmax)
-        glVertex3d(xmax, ymax, zmax)
-      glEnd()
+      GL.Begin(GL::TRIANGLE_STRIP)
+        GL.Normal3d(1.0, 0.0, 0.0)
+        GL.Vertex3d(xmax, ymin, zmin)
+        GL.Vertex3d(xmax, ymax, zmin)
+        GL.Vertex3d(xmax, ymin, zmax)
+        GL.Vertex3d(xmax, ymax, zmax)
+      GL.End()
 
       # Draw high face
-      glBegin(GL_TRIANGLE_STRIP)
-        glNormal3d(0.0, 0.0, 1.0)
-        glVertex3d(xmax, ymin, zmax)
-        glVertex3d(xmax, ymax, zmax)
-        glVertex3d(xmin, ymin, zmax)
-        glVertex3d(xmin, ymax, zmax)
-      glEnd()
+      GL.Begin(GL::TRIANGLE_STRIP)
+        GL.Normal3d(0.0, 0.0, 1.0)
+        GL.Vertex3d(xmax, ymin, zmax)
+        GL.Vertex3d(xmax, ymax, zmax)
+        GL.Vertex3d(xmin, ymin, zmax)
+        GL.Vertex3d(xmin, ymax, zmax)
+      GL.End()
 
       # Draw west face
-      glBegin(GL_TRIANGLE_STRIP)
-        glNormal3d(-1.0, 0.0, 0.0)
-        glVertex3d(xmin, ymin, zmax)
-        glVertex3d(xmin, ymax, zmax)
-        glVertex3d(xmin, ymin, zmin)
-        glVertex3d(xmin, ymax, zmin)
-      glEnd()
+      GL.Begin(GL::TRIANGLE_STRIP)
+        GL.Normal3d(-1.0, 0.0, 0.0)
+        GL.Vertex3d(xmin, ymin, zmax)
+        GL.Vertex3d(xmin, ymax, zmax)
+        GL.Vertex3d(xmin, ymin, zmin)
+        GL.Vertex3d(xmin, ymax, zmin)
+      GL.End()
 
       # Draw north face
-      glBegin(GL_TRIANGLE_STRIP)
-        glNormal3d(0.0, 1.0, 0.0)
-        glVertex3d(xmin, ymax, zmin)
-        glVertex3d(xmin, ymax, zmax)
-        glVertex3d(xmax, ymax, zmin)
-        glVertex3d(xmax, ymax, zmax)
-      glEnd()
+      GL.Begin(GL::TRIANGLE_STRIP)
+        GL.Normal3d(0.0, 1.0, 0.0)
+        GL.Vertex3d(xmin, ymax, zmin)
+        GL.Vertex3d(xmin, ymax, zmax)
+        GL.Vertex3d(xmax, ymax, zmin)
+        GL.Vertex3d(xmax, ymax, zmax)
+      GL.End()
 
       # Draw south face
-      glBegin(GL_TRIANGLE_STRIP)
-        glNormal3d(0.0, -1.0, 0.0)
-        glVertex3d(xmin, ymin, zmax)
-        glVertex3d(xmin, ymin, zmin)
-        glVertex3d(xmax, ymin, zmax)
-        glVertex3d(xmax, ymin, zmin)
-      glEnd()
+      GL.Begin(GL::TRIANGLE_STRIP)
+        GL.Normal3d(0.0, -1.0, 0.0)
+        GL.Vertex3d(xmin, ymin, zmax)
+        GL.Vertex3d(xmin, ymin, zmin)
+        GL.Vertex3d(xmax, ymin, zmax)
+        GL.Vertex3d(xmax, ymin, zmin)
+      GL.End()
     end
   end
 
@@ -257,9 +251,6 @@ module Fox
   # OpenGL cone object
   #
   class FXGLCone < FXGLShape
-    include OpenGL
-    include GLU
-
     # Cone fidelity
     SLICES_NUMBER = 20
     STACKS_NUMBER = 20
@@ -316,15 +307,15 @@ module Fox
     # Draw this cone into _viewer_ (an FXGLViewer instance).
     #
     def drawshape(viewer)
-      quad = gluNewQuadric()
-      gluQuadricDrawStyle(quad, GLU_FILL)
-      glPushMatrix()
-      glRotated(-90, 1, 0, 0)
-      gluCylinder(quad, @radius, 0, @height, @slices, @stacks)
-      gluQuadricOrientation(quad, GLU_INSIDE)
-      gluDisk(quad, 0, @radius, @slices, @loops)
-      gluDeleteQuadric(quad)
-      glPopMatrix()
+      quad = GLU.NewQuadric()
+      GLU.QuadricDrawStyle(quad, GLU::FILL)
+      GL.PushMatrix()
+      GL.Rotated(-90, 1, 0, 0)
+      GLU.Cylinder(quad, @radius, 0, @height, @slices, @stacks)
+      GLU.QuadricOrientation(quad, GLU::INSIDE)
+      GLU.Disk(quad, 0, @radius, @slices, @loops)
+      GLU.DeleteQuadric(quad)
+      GL.PopMatrix()
     end
   end
 
@@ -332,9 +323,6 @@ module Fox
   # OpenGL cylinder object
   #
   class FXGLCylinder < FXGLShape
-    include OpenGL
-    include GLU
-
     # Cylinder fidelity
     SLICES_NUMBER = 20
     STACKS_NUMBER = 20
@@ -391,18 +379,18 @@ module Fox
     # Draw this cylinder into _viewer_ (an FXGLViewer instance).
     #
     def drawshape(viewer)
-      quad = gluNewQuadric()
-      gluQuadricDrawStyle(quad, GLU_FILL)
-      glPushMatrix()
-      glRotated(-90, 1, 0, 0)
-      gluCylinder(quad, @radius, @radius, @height, @slices, @stacks)
-      gluQuadricOrientation(quad, GLU_INSIDE)
-      gluDisk(quad, 0, @radius, @slices, @loops)
-      glTranslated(0, 0, @height)
-      gluQuadricOrientation(quad, GLU_OUTSIDE)
-      gluDisk(quad, 0, @radius, @slices, @loops)
-      glPopMatrix()
-      gluDeleteQuadric(quad)
+      quad = GLU.NewQuadric()
+      GLU.QuadricDrawStyle(quad, GLU::FILL)
+      GL.PushMatrix()
+      GL.Rotated(-90, 1, 0, 0)
+      GLU.Cylinder(quad, @radius, @radius, @height, @slices, @stacks)
+      GLU.QuadricOrientation(quad, GLU::INSIDE)
+      GLU.Disk(quad, 0, @radius, @slices, @loops)
+      GL.Translated(0, 0, @height)
+      GLU.QuadricOrientation(quad, GLU::OUTSIDE)
+      GLU.Disk(quad, 0, @radius, @slices, @loops)
+      GL.PopMatrix()
+      GLU.DeleteQuadric(quad)
     end
   end
 
@@ -410,9 +398,6 @@ module Fox
   # OpenGL sphere object
   #
   class FXGLSphere < FXGLShape
-    include OpenGL
-    include GLU
-
     # Sphere fidelity
     SLICES_NUMBER = 20
     STACKS_NUMBER = 20
@@ -460,10 +445,10 @@ module Fox
     # Draw this sphere into _viewer_ (an FXGLViewer instance).
     #
     def drawshape(viewer)
-      quad = gluNewQuadric()
-      gluQuadricDrawStyle(quad, GLU_FILL)
-      gluSphere(quad, @radius, @slices, @stacks)
-      gluDeleteQuadric(quad)
+      quad = GLU.NewQuadric()
+      GLU.QuadricDrawStyle(quad, GLU::FILL)
+      GLU.Sphere(quad, @radius, @slices, @stacks)
+      GLU.DeleteQuadric(quad)
     end
   end
 end