ruby-gr 0.0.26 → 0.64.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd24ca7e167933c74ba77c3185be37e322665f41c4e94d547789d28f7b282d7a
-  data.tar.gz: a3f53215287be5208e2217bc83fc033030aa2067cb438e46343b85b33357adab
+  metadata.gz: 89e87b16084dadf1b42355615e60e8b3537179eea0d2bab51a9b482abb060036
+  data.tar.gz: a645e707451e939abe3d6706bcda2bc49544149c21fe0fb93785ae3162794958
 SHA512:
-  metadata.gz: f661c8aa91cb27046f66590643a372391c5d9fa1703146b891137f1a0639c3671243679d4f14697e304e737d17408a5c880c8e2399278285b02fddfe08a18e8a
-  data.tar.gz: 32945088f9c0cbf22a8525c36f0dd527fcd5d81a763986a334736331b1d0ad9013d9f6b89a3202118427a85021b261bd0b35caad6690d38e8969efe0299c7c60
+  metadata.gz: bf43899a660104ac091218d43be18d74f94488f04f44056a8cb09c89ce793aefaa05070dde4bf129b4601f10071b4617bccbcf573818c6d531ed61c8c354c705
+  data.tar.gz: 868a4a08896bce2ac780eeea5d1ebab82d56262dbc9407fb8eb1ad11bc13a71d18a6b291ac57abc3a78d021eb47b788da4d942df057a7071e191d5afaf588a71

data/README.md

@@ -27,23 +27,22 @@
 
 GR.rb supports Ruby 2.5+.
 
-First, [install GR](#gr-installation). Then install `ruby-gr` gem.
+First, [install GR](#gr-installation). Then install `gr-plot` gem.
 
 ```sh
-gem install ruby-gr
+gem install gr-plot
 ```
-Note: If you are using [RubyInstaller](https://rubyinstaller.org/) (Windows), pacman will automatically install [mingw-w64-gr](https://packages.msys2.org/base/mingw-w64-gr).
 
-Set environment variable `GRDIR`.
+[pkg-config](https://github.com/ruby-gnome/pkg-config) will detect the location of the shared library. Otherwise, you need to specify the environment variable. 
 
 ```sh
 export GRDIR="/your/path/to/gr"
 ```
 
-If you use package managers to install GR, [pkg-config](https://github.com/ruby-gnome/pkg-config) may automatically detect the shared library location without specifying the `GRDIR` environment variable.
-
 ## Quick Start
 
+:point_right: [Wiki -plotting functions](https://github.com/red-data-tools/GR.rb/wiki/Plotting-functions)
+
 <p align="center">
   <img src="https://user-images.githubusercontent.com/5798442/69689128-74cb1480-110b-11ea-9097-29e878a19e8f.png">
 </p>
@@ -54,41 +53,15 @@ require 'gr/plot'
 x = [0, 0.2, 0.4, 0.6, 0.8, 1.0]
 y = [0.3, 0.5, 0.4, 0.2, 0.6, 0.7]
 
+# show the figure
 GR.plot(x, y)
-```
-
-<p align="center">
-  <img src="https://user-images.githubusercontent.com/5798442/84570709-242ab880-adca-11ea-9099-3a6b3418bf19.png">
-</p>
-
-```ruby
-require 'gr/plot'
 
-x  = Numo::DFloat.linspace(0, 10, 101)
-y1 = Numo::NMath.sin(x)
-y2 = Numo::NMath.cos(x)
-
-GR.plot(
-  [x, y1, 'bo'], [x, y2, 'g*'],
-  title:    "Multiple plot example",
-  xlabel:   "x",
-  ylabel:   "y",
-  ylim:     [-1.2, 1.2],
-  labels:   ["sin(x)", "cos(x)"],
-  location: 11
-)
-```
-
-Save the figure in PNG format.
-
-```ruby
+# Save the figure in PNG format.
 GR.savefig("figure.png")
 ```
 
 ## API Overview
 
-There are two different approaches when plotting with GR.rb. One is to call Matlab-like APIs. The other is to call GR/GR3 native functions.
-
 #### GR::Plot - A simple, matlab-style API.
 
 ```ruby
@@ -96,8 +69,7 @@ require 'gr/plot'
 GR.plot(x, y)
 ```
 
-Below are a list of available functions. See [GR.rb Wiki](https://github.com/red-data-tools/GR.rb/wiki) for details.
-Some GR module methods are overwritten.
+List of available functions. 
 
 [`plot`](../../wiki/Plotting-functions#plot)
 [`step`](../../wiki/Plotting-functions#step)
@@ -123,7 +95,8 @@ Some GR module methods are overwritten.
 [`imshow`](../../wiki/Plotting-functions#imshow)
 [`isosurface`](../../wiki/Plotting-functions#isosurface)
 
-We are preparing a [more object-oriented interface](https://github.com/kojix2/GRUtils.rb) based on [GRUtils.jl](https://github.com/heliosdrm/GRUtils.jl) in the future.
+See [GR.rb Wiki](https://github.com/red-data-tools/GR.rb/wiki) for details.
+Some GR module methods are overwritten. Code has been moved to [gr-plot](https://github.com/red-data-tools/gr-plot).
 
 #### GR - A module for calling native GR functions.
 
@@ -148,73 +121,57 @@ require 'gr3'
 GR3.cameralookat(-3, 2, -2, 0, 0, 0, 0, 0, -1)
 ```
 
+### Using GR.rb non-interactively
+
+Both APIs will by default start a Qt based window to show the result of the last call.
+This behavior is caused by GR itself as it will [implicitly generate output to a file or application](https://gr-framework.org/workstations.html#no-output).
+If you want to use GR.rb non-interactively, eg., as part of a static site build, you can do this by setting the environment variable `GKS_WSTYPE`to `100`.
+
+```sh
+export GKS_WSTYPE=100
+```
+
 ## Documentation
 
 - [GR.rb Wiki](https://github.com/red-data-tools/GR.rb/wiki)
-- [GR Framework](https://gr-framework.org/)
-- [GR.rb API Documentation](https://rubydoc.info/gems/ruby-gr)
-
-Although GR.rb adds methods dynamically, we try our best to provide a complete yard document. If you want to see more up-to-date information, we recommend using the official GR reference.
+- [GR.rb API Documentation](https://rubydoc.info/gems/ruby-gr) - Yard documents.
+- [GR Framework](https://gr-framework.org/) - The official GR reference.
 
 ## GR Installation
 
 ### Installing an official release (recommended)
 
-Download the [latest release](https://github.com/sciapp/gr/releases).
-
-Set environment variable GRDIR.
+Download the [latest release](https://github.com/sciapp/gr/releases) and place it where you want. Then set environment variable `GRDIR`.
 
 ```sh
 export GRDIR="your/path/to/gr"
 ```
 
-* macOS Catalina and macOS Mojave: See the "How to open an app that hasn’t been notarized or is from an unidentified developer" section under [Safely open apps on your Mac](https://support.apple.com/en-us/HT202491) in the Apple documentation.
+macOS : See ["How to open apps from un-notarized or unidentified developers"](https://support.apple.com/en-us/HT202491) in the Apple documentation.
 
 ### Using package managers
 
-* The third party GR packages for Mac, Linux and Windows are available (for advanced users).
-* If you find any problem, please report the issue [here](https://github.com/red-data-tools/GR.rb/issues).
-* Note: These packages may not have some features such as video output.
+The third party GR packages for Mac, Linux and Windows are available for advanced users. However, these packages are provided by OSS volunteers and may not be the latest version or support some features (such as video output). If you find any problem, please report the issue [here](https://github.com/red-data-tools/GR.rb/issues). 
 
 #### Mac - Homebrew
 
 ```sh
 brew install libgr
-# brew install --build-from-source libgr
+export GKS_WSTYPE=411 # Set the workstation type to gksqt (recommended)
 ```
 
+#### Linux - openSUSE Build service
 
-#### Linux - APT
-
-[packages.red-data-tools.org](https://github.com/red-data-tools/packages.red-data-tools.org) provides `libgr-dev`, `libgr3-dev` and `libgrm-dev`
-
-Debian GNU/Linux and Ubuntu 
+GR releases are also available from the [openSUSE Build service](https://software.opensuse.org//download.html?project=science%3Agr-framework&package=gr) for CentOS, Debian, Fedora openSUSE and Ubuntu. Obtain a packaged release [here](https://software.opensuse.org//download.html?project=science%3Agr-framework&package=gr).
 
 ```sh
-sudo apt install -y -V ca-certificates lsb-release wget
-wget https://packages.red-data-tools.org/$(lsb_release --id --short | tr 'A-Z' 'a-z')/red-data-tools-apt-source-latest-$(lsb_release --codename --short).deb
-sudo apt install -y -V ./red-data-tools-apt-source-latest-$(lsb_release --codename --short).deb
-sudo apt update
-sudo apt install libgrm-dev
+export GRDIR="/usr/gr" # Check the location with `dpkg -L gr`
 ```
 
-#### Linux - Yum
-
-CentOS
-
-```sh
-(. /etc/os-release && sudo dnf install -y https://packages.red-data-tools.org/centos/${VERSION_ID}/red-data-tools-release-latest.noarch.rpm)
-sudo dnf install -y gr-devel
-```
-
-### Windows - MSYS2
+#### Windows - MSYS2
 
 If you are using Rubyinstaller, pacman will automatically install [mingw-w64-gr](https://packages.msys2.org/base/mingw-w64-gr) when the gem is installed.
 
-## Backend for Charty
-
-GR.rb will be the default backend for [Charty](https://github.com/red-data-tools/charty).
-
 ## Contributing
 
 GR.rb is a library under development, so even small improvements like fixing typos are welcome!
@@ -227,6 +184,17 @@ Please feel free to send us your PR.
 * Update GR packages ( Homebrew, MinGW, red-data-tools )
 * Create visualization tools based on GR.rb
 
+If you are not familiar with Ruby gem development, please see
+[I'm new to Ruby](https://github.com/red-data-tools/GR.rb/wiki/I%27m-new-to-Ruby)
+
+```
+Do you need commit rights to my repository?
+Do you want to get admin rights and take over the project?
+If so, please feel free to contact us.
+```
+
+I've seen a lot of OSS abandoned because no one has commit rights to the original repository anymore; the right to request commit rights for GR.rb is always open.
+
 ## Acknowledgements
 
 We would like to thank Josef Heinen, the creator of [GR](https://github.com/sciapp/gr) and [GR.jl](https://github.com/jheinen/GR.jl), Florian Rhiem, the creator of [python-gr](https://github.com/sciapp/python-gr), and all [GR](https://github.com/sciapp/gr) developers.

data/lib/gr/ffi.rb

@@ -33,7 +33,9 @@ module GR
     try_extern 'void gr_polyline(int, double *, double *)'
     try_extern 'void gr_polymarker(int, double *, double *)'
     try_extern 'void gr_text(double, double, char *)'
+    try_extern 'void gr_textx(double, double, char *, int)'
     try_extern 'void gr_inqtext(double, double, char *, double *, double *)'
+    try_extern 'gr_inqtextx(double, double, char *, int, double *, double *)'
     try_extern 'void gr_fillarea(int, double *, double *)'
     try_extern 'void gr_cellarray(double, double, double, double, ' \
                'int, int, int, int, int, int, int *)'
@@ -117,6 +119,7 @@ module GR
     try_extern 'void gr_setcolormap(int)'
     try_extern 'void gr_inqcolormap(int *)'
     try_extern 'void gr_setcolormapfromrgb(int n, double *r, double *g, double *b, double *x)'
+    try_extern 'void gr_inqcolormapinds(int *, int *)'
     try_extern 'void gr_colorbar(void)'
     try_extern 'void gr_inqcolor(int, int *)'
     try_extern 'int gr_inqcolorfromrgb(double, double, double)'
@@ -208,5 +211,13 @@ module GR
     try_extern 'void gr_inqtextencoding(int *)'
     try_extern 'void gr_loadfont(char *, int *)'
     # gr_setcallback(char *(*)(const char *));
+    try_extern 'void gr_setthreadnumber(int)'
+    try_extern 'void gr_setpicturesizeforvolume(int, int)'
+    try_extern 'void gr_setvolumebordercalculation(int)'
+    try_extern 'void gr_setapproximativecalculation(int)'
+    try_extern 'void gr_inqvolumeflags(int *, int *, int *, int *, int *)'
+    try_extern 'void gr_cpubasedvolume(int, int, int, double *, int, double *, double *, double *, double *)'
+    try_extern 'void gr_inqvpsize(int *, int *, double *)'
+    try_extern 'void gr_polygonmesh3d(int, const double *, const double *, const double *, int, const int *, const int *)'
   end
 end

data/lib/gr.rb

@@ -58,7 +58,7 @@ module GR
 
   # Platforms |  path
   # Windows   |  bin/libgr.dll
-  # MacOSX    |  lib/libGR.so (v0.53.0 .so)
+  # MacOSX    |  lib/libGR.dylib ( <= v0.53.0 .so)
   # Ubuntu    |  lib/libGR.so
   platform = RbConfig::CONFIG['host_os']
   lib_names, pkg_name = \
@@ -66,10 +66,14 @@ module GR
     when /mswin|msys|mingw|cygwin|bccwin|wince|emc/
       [['libGR.dll'], 'gr']
     when /darwin|mac os/
+      ENV['GKSwstype'] ||= 'gksqt'
       [['libGR.dylib', 'libGR.so'], 'gr']
     else
       [['libGR.so'], 'gr']
     end
+
+  # On Windows + RubyInstaller,
+  # the environment variable GKS_FONTPATH will be set.
   lib_path = GRCommons::GRLib.search(lib_names, pkg_name)
 
   raise NotFoundError, "#{lib_names} not found" if lib_path.nil?
@@ -178,7 +182,7 @@ module GR
     # @param x         [Array, NArray]          A list containing the X coordinates
     # @param y         [Array, NArray]          A list containing the Y coordinates
     # @param linewidth [Array, NArray, Numeric] A list containing the line widths
-    # @param line_z    [Array, NArray]          A list to be converted to colors
+    # @param line_z    [Array, NArray, Numeric] A list to be converted to colors
     #
     # The values for x and y are in world coordinates.
     # The attributes that control the appearance of a polyline are linetype,
@@ -190,13 +194,24 @@ module GR
       if linewidth.nil? && line_z.nil?
         super(n, x, y)
       else
-        linewidth = Array.new(n, linewidth) if linewidth.is_a?(Numeric)
-        linewidth.map! { |i| (100 * i).round }
-        line_z ||= Array.new(n, 0)
-        raise ArgumentError if n != equal_length(linewidth, line_z)
-
-        color = to_rgb_color(line_z)
-        gdp(x, y, GDP_DRAW_LINES, linewidth.zip(color).flatten)
+        linewidth ||= GR.inqlinewidth
+        linewidth = if linewidth.is_a?(Numeric)
+                      Array.new(n, linewidth * 100)
+                    else
+                      raise ArgumentError if n != linewidth.length
+
+                      linewidth.map { |i| (100 * i).round }
+                    end
+        line_z ||= GR.inqcolor(989) # FIXME
+        color = if line_z.is_a?(Numeric)
+                  Array.new(n, line_z)
+                else
+                  raise ArgumentError if n != line_z.length
+
+                  to_rgb_color(line_z)
+                end
+        z = linewidth.to_a.zip(color).flatten # to_a : NArray
+        gdp(x, y, GDP_DRAW_LINES, z)
       end
     end
 
@@ -205,7 +220,7 @@ module GR
     # @param x          [Array, NArray]          A list containing the X coordinates
     # @param y          [Array, NArray]          A list containing the Y coordinates
     # @param markersize [Array, NArray, Numeric] A list containing the marker sizes
-    # @param marker_z   [Array, NArray]          A list to be converted to colors
+    # @param marker_z   [Array, NArray, Numeric] A list to be converted to colors
     #
     # The values for x and y are in world coordinates.
     # The attributes that control the appearance of a polymarker are marker type,
@@ -217,13 +232,24 @@ module GR
       if markersize.nil? && marker_z.nil?
         super(n, x, y)
       else
-        markersize = Array.new(n, markersize) if markersize.is_a?(Numeric)
-        markersize.map! { |i| (100 * i).round }
-        marker_z ||= Array.new(n, 0)
-        raise ArgumentError if n != equal_length(markersize, marker_z)
-
-        color = to_rgb_color(marker_z)
-        gdp(x, y, GDP_DRAW_MARKERS, markersize.zip(color).flatten)
+        markersize ||= GR.inqmarkersize
+        markersize = if markersize.is_a?(Numeric)
+                       Array.new(n, markersize * 100)
+                     else
+                       raise ArgumentError if n != markersize.length
+
+                       markersize.map { |i| (100 * i).round }
+                     end
+        marker_z ||= GR.inqcolor(989) # FIXME
+        color = if marker_z.is_a?(Numeric)
+                  Array.new(n, marker_z)
+                else
+                  raise ArgumentError if n != marker_z.length
+
+                  to_rgb_color(marker_z)
+                end
+        z = markersize.to_a.zip(color).flatten # to_a : NArray
+        gdp(x, y, GDP_DRAW_MARKERS, z)
       end
     end
 
@@ -308,9 +334,9 @@ module GR
     # raidus. The center point of the resulting disk is located at `xorg`, `yorg`
     # and the radius of the disk is `rmax`.
     #
-    # @param xorg    [Numeric]       X coordinate of the disk center in world
+    # @param x_org   [Numeric]       X coordinate of the disk center in world
     #                                coordinates
-    # @param yorg    [Numeric]       Y coordinate of the disk center in world
+    # @param y_org   [Numeric]       Y coordinate of the disk center in world
     #                                coordinates
     # @param phimin  [Numeric]       start angle of the disk sector in degrees
     # @param phimax  [Numeric]       end angle of the disk sector in degrees
@@ -318,7 +344,7 @@ module GR
     #                                coordinates
     # @param rmax    [Numeric]       outer radius of the punctured disk in world
     #                                coordinates
-    # @param dimiphi [Integer]       Phi (X) dimension of the color index array
+    # @param dimphi  [Integer]       Phi (X) dimension of the color index array
     # @param dimr    [Integer]       iR (Y) dimension of the color index array
     # @param color   [Array, NArray] Color index array
     #
@@ -1355,7 +1381,7 @@ module GR
     # @param x      [Array, NArray] A list containing the X coordinates
     # @param y      [Array, NArray] A list containing the Y coordinates
     # @param z      [Array, NArray] A list containing the Z coordinates
-    # @param lavels [Array, NArray] A list of contour levels
+    # @param levels [Array, NArray] A list of contour levels
     #
     def tricontour(x, y, z, levels)
       npoints = x.length # equal_length ?
@@ -1414,6 +1440,16 @@ module GR
       super(n, r, g, b, positions)
     end
 
+    # Inquire the color index range of the current colormap.
+    #
+    # @return [Array] first_color_ind The color index of the first color,
+    #                 last_color_ind The color index of the last color
+    def inqcolormapinds
+      inquiry %i[int int] do |first_color_ind, last_color_ind|
+        super(first_color_ind, last_color_ind)
+      end
+    end
+
     # @!method colorbar
 
     def inqcolor(color)
@@ -1601,14 +1637,14 @@ module GR
     # curves.
     #
     # @param points [Array, NArray] (N, 2) array of (x, y) vertices
-    # @parm codes [Array, NArray] N-length array of path codes
+    # @param codes [Array, NArray] N-length array of path codes
     #  *  STOP      : end the entire path
     #  *  MOVETO    : move to the given vertex
     #  *  LINETO    : draw a line from the current position to the given vertex
     #  *  CURVE3    : draw a quadratic Bézier curve
     #  *  CURVE4    : draw a cubic Bézier curve
     #  *  CLOSEPOLY : draw a line segment to the start point of the current path
-    # @parm fill [Integer]
+    # @param fill [Integer]
     #   A flag indication whether resulting path is to be filled or not
     #
     def drawpath(points, codes, fill)
@@ -1668,7 +1704,7 @@ module GR
     def readimage(path)
       # Feel free to make a pull request if you catch a mistake
       # or you have an idea to improve it.
-      data = Fiddle::Pointer.malloc(Fiddle::SIZEOF_INTPTR_T)
+      data = Fiddle::Pointer.malloc(Fiddle::SIZEOF_INTPTR_T, Fiddle::RUBY_FREE)
       w, h = inquiry [:int, :int] do |width, height|
         # data is a pointer of a pointer
         super(path, width, height, data.ref)
@@ -1806,7 +1842,7 @@ module GR
       # Feel free to make a pull request if you catch a mistake
       # or you have an idea to improve it.
       npoints = equal_length(x, y)
-      triangles = Fiddle::Pointer.malloc(Fiddle::SIZEOF_INTPTR_T)
+      triangles = Fiddle::Pointer.malloc(Fiddle::SIZEOF_INTPTR_T, Fiddle::RUBY_FREE)
       dim = 3
       n_tri = inquiry_int do |ntri|
         super(npoints, x, y, ntri, triangles.ref)
@@ -2113,9 +2149,9 @@ module GR
     #
     # @param flag [Integer] projection type
     #  The available options are:
-    #  * 0 : GR_PROJECTION_DEFAULT      - default
-    #  * 1 : GR_PROJECTION_ORTHOGRAPHIC - orthographic
-    #  * 2 : GR_PROJECTION_PERSPECTIVE  - perspective
+    #  * 0 : PROJECTION_DEFAULT      - default
+    #  * 1 : PROJECTION_ORTHOGRAPHIC - orthographic
+    #  * 2 : PROJECTION_PERSPECTIVE  - perspective
     #
     # @!method setprojectiontype
 
@@ -2279,6 +2315,76 @@ module GR
         super(str, font)
       end
     end
+
+    # Set the number of threads which can run parallel.
+    # The default value is the number of threads the cpu has.
+    #
+    # @param num [Integer] num number of threads
+    #
+    # @!method setthreadnumber
+
+    # Set the width and height of the resulting picture.
+    # These values are only used for gr_volume and gr_cpubasedvolume.
+    # The default values are 1000 for both.
+    #
+    # @param width  [Integer] width of the resulting image
+    # @param height [Integer] height of the resulting image
+    #
+    # @!method setpicturesizeforvolume
+
+    # Set the gr_volume border type with this flag.
+    # This inflicts how the volume is calculated. When the flag is set to
+    # GR_VOLUME_WITH_BORDER the border will be calculated the same as the points
+    # inside the volume.
+    #
+    # @param flag [Integer] calculation of the gr_volume border
+    #  The available options are:
+    #  * 0 : VOLUME_WITHOUT_BORDER - default value
+    #  * 1 : VOLUME_WITH_BORDER    - gr_volume with border
+    #
+    # @!method setvolumebordercalculation    # @!method setthreadnumber
+
+    # Set if gr_cpubasedvolume is calculated approximative or exact.
+    # To use the exact calculation set approximative_calculation to 0.
+    # The default value is the approximative version, which can be set with the
+    # number 1.
+    #
+    # @param approximative_calculation [Integer] exact or approximative calculation
+    #                                            of the volume
+    #
+    # @!method setapproximativecalculation
+
+    # Inquire the parameters which can be set for cpubasedvolume.
+    # The size of the resulting image, the way the volumeborder is calculated and
+    # the amount of threads which are used.
+    #
+    # @return [Array]
+    #  * border -                    flag which tells how the border is calculated
+    #  * max_threads -               number of threads
+    #  * picture_width -             width of the resulting image
+    #  * picture_height -            height of the resulting image
+    #  * approximative_calculation - exact or approximative calculation of gr_cpubasedvolume
+    #
+    def inqvolumeflags
+      inquiry([:int] * 5) do |*pts|
+        super(*pts)
+      end
+    end
+
+    # FIXME! (#61)
+    # @!method cpubasedvolume
+
+    def inqvpsize
+      inquiry %i[int int double] do |*pts|
+        super(*pts)
+      end
+    end
+
+    def polygonmesh3d(px, py, pz, connections, colors)
+      n_points = equal_length(px, py, pz)
+      n_connections = colors.length
+      super(n_points, px, py, pz, n_connections, int(connections), int(colors))
+    end
   end
 
   ASF_BUNDLED    = 0
@@ -2487,8 +2593,8 @@ module GR
   PATH_CURVE4    = 0x04
   PATH_CLOSEPOLY = 0x4f
 
-  GDP_DRAW_PATH = 1
-  GDP_DRAW_LINES = 2
+  GDP_DRAW_PATH    = 1
+  GDP_DRAW_LINES   = 2
   GDP_DRAW_MARKERS = 3
 
   MPL_SUPPRESS_CLEAR  = 1
@@ -2534,7 +2640,17 @@ module GR
     (UPSAMPLE_VERTICAL_LANCZOS | UPSAMPLE_HORIZONTAL_LANCZOS |
      DOWNSAMPLE_VERTICAL_LANCZOS | DOWNSAMPLE_HORIZONTAL_LANCZOS)
 
-  PROJECTION_DEFAULT = 0
+  PROJECTION_DEFAULT      = 0
   PROJECTION_ORTHOGRAPHIC = 1
-  PROJECTION_PERSPECTIVE = 2
+  PROJECTION_PERSPECTIVE  = 2
+
+  VOLUME_WITHOUT_BORDER = 0
+  VOLUME_WITH_BORDER    = 1
+
+  VOLUME_EMISSION   = 0
+  VOLUME_ABSORPTION = 1
+  VOLUME_MIP        = 2
+
+  TEXT_USE_WC = (1 << 0)
+  TEXT_ENABLE_INLINE_MATH = (1 << 1)
 end

data/lib/gr3/ffi.rb

@@ -91,6 +91,8 @@ module GR3
            'double offset_x, double offset_y, double offset_z)'
     try_extern 'int gr3_createsurfacemesh(int *mesh, int nx, int ny, ' \
            'float *px, float *py, float *pz, int option)'
+    try_extern 'int gr3_createsurface3dmesh(int *mesh, int ncols, int nrows, ' \
+           'float *px, float *py, float *pz);'
     try_extern 'void gr3_drawmesh_grlike(int mesh, int n, ' \
            'const float *positions, const float *directions, const float *ups, ' \
            'const float *colors, const float *scales)'
@@ -140,5 +142,14 @@ module GR3
            'int algorithm, double *dmin_ptr, double *dmax_ptr)'
     try_extern 'void gr3_setorthographicprojection' \
            '(float left, float right, float bottom, float top, float znear, float zfar)'
+    try_extern 'void gr3_setsurfaceoption(int option)'
+    try_extern 'int gr3_getsurfaceoption(void)'
+    try_extern 'int gr3_getlightsources(int max_num_lights, float *positions, float *colors)'
+    try_extern 'int gr3_setlightsources(int num_lights, float *positions, float *colors)'
+    try_extern 'void gr3_setlightparameters(float ambient, float diffuse, float specular, float specular_power)'
+    try_extern 'void gr3_getlightparameters(float *ambient, float *diffuse, float *specular, float *specular_power)'
+    try_extern 'void gr3_setdefaultlightparameters()'
+    try_extern 'void gr3_setclipping(float xmin, float xmax, float ymin, float ymax, float zmin, float zmax)'
+    try_extern 'void gr3_getclipping(float *xmin, float *xmax, float *ymin, float *ymax, float *zmin, float *zmax)'
   end
 end

data/lib/gr3.rb

@@ -68,7 +68,7 @@ module GR3
 
   # Platforms |  path
   # Windows   |  bin/libGR3.dll
-  # MacOSX    |  lib/libGR3.dylib (v0.53.0 .so)
+  # MacOSX    |  lib/libGR3.dylib ( <= v0.53.0 .so)
   # Ubuntu    |  lib/libGR3.so
   platform = RbConfig::CONFIG['host_os']
   lib_names, pkg_name = \
@@ -76,10 +76,14 @@ module GR3
     when /mswin|msys|mingw|cygwin|bccwin|wince|emc/
       [['libGR3.dll'], 'gr3']
     when /darwin|mac os/
+      ENV['GKSwstype'] ||= 'gksqt'
       [['libGR3.dylib', 'libGR3.so'], 'gr3']
     else
       [['libGR3.so'], 'gr3']
     end
+
+  # On Windows + RubyInstaller,
+  # the environment variable GKS_FONTPATH will be set.
   lib_path = GRCommons::GRLib.search(lib_names, pkg_name)
 
   raise NotFoundError, "#{lib_names} not found" if lib_path.nil?

data/lib/gr_commons/fiddley.rb

@@ -188,7 +188,7 @@ module GRCommons
           @size = @ptr.size
         else
           @size = type2size(type) * num
-          @ptr = Fiddle::Pointer.malloc(@size)
+          @ptr = Fiddle::Pointer.malloc(@size, Fiddle::RUBY_FREE)
         end
       end