Merge pull request #492 from dmurdoch/tahoe

Add warnings about Tahoe.

Author: dmurdoch

DESCRIPTION

@@ -1,5 +1,5 @@
 Package: rgl
-Version: 1.3.30
+Version: 1.3.31
 Title: 3D Visualization Using OpenGL
 Authors@R: c(person("Duncan", "Murdoch", role = c("aut", "cre"),
                      email = "[email protected]"),

NEWS.md

@@ -1,5 +1,7 @@
-# rgl 1.3.30
+# rgl 1.3.31
 
+* macOS Tahoe 26.1 does not support `rgl` displays.  Give
+a more informative failure warning.
 * Support for classes defined in the `tripack` package
 has been dropped at the request of CRAN.
 * Added the `latex3d()` function to draw LaTeX text using the

R/zzz.R

@@ -36,6 +36,13 @@
                 package = pkg, lib.loc = lib,
                 mustWork = TRUE)
 
+  is_tahoe <- function() {
+    mac_version_string <- system("sw_vers -productVersion", intern = TRUE)
+    mac_version <- as.numeric_version(mac_version_string)
+    tahoe_version <- as.numeric_version("26.0")
+    mac_version >= tahoe_version
+  }
+  
   # OS-specific 
   initValue <- 0  
 
@@ -50,10 +57,12 @@
 
   dll <- try(dyn.load(dynlib <- getDynlib(dir)))
   if (inherits(dll, "try-error")) {
-    warning(paste("\tLoading rgl's DLL failed.", 
+    if (unixos == "Darwin" && !onlyNULL)
+      warning(paste("\tLoading rgl's DLL failed.", 
     	       if (unixos == "Darwin" && !onlyNULL) {
-    	         paste("\n\tThis build of rgl depends on XQuartz, which failed to load.\n",
-    	           "See the discussion in https://stackoverflow.com/a/66127391/2554330")
+    	         paste(if (is_tahoe()) "\n\tYou appear to be running macOS Tahoe or newer.
+    	               Tahoe 26.1 is known not to support OpenGL." else "\n\tThis build of rgl depends on XQuartz, which failed to load.\n",
+    	           "See the discussion in https://stackoverflow.com/a/66127391")
              }),
          call. = FALSE)
     if (!onlyNULL) {

man/writeOBJ.Rd

@@ -79,7 +79,7 @@ specify it in the \code{material} argument, e.g.
 multiple textures.
 
 The defaults for \code{pointsAsPoints} and \code{linesAsLines} have been
-chosen because Blender (\url{https://www.blender.org}) does not import
+chosen because \code{Blender} does not import
 points or lines, only polygons.  If you are exporting to other software you
 may want to change them.
 
@@ -102,6 +102,9 @@ from the input file.
 \references{
 The file format was found at \url{http://www.martinreddy.net/gfx/3d/OBJ.spec}
 on November 11, 2012.  
+
+Blender is an open source 3D object editor.  See
+\code{www.blender.org} for details.
 }
 \author{
 Duncan Murdoch

man/writePLY.Rd

@@ -59,7 +59,7 @@ The current implementation only outputs triangles, quads, planes, spheres,
 points, line segments, line strips and surfaces.
 
 The defaults for \code{pointsAsEdges} and \code{linesAsEdges} have been
-chosen because Blender (\url{https://www.blender.org}) does not import
+chosen because \code{Blender} does not import
 lines, only polygons.  If you are exporting to other software you
 may want to change them.
 
@@ -78,6 +78,9 @@ data was written.
 The file format was found on \code{www.mathworks.com} on November 10, 2012
 at a URL that no longer exists; currently the
 format is described at \code{www.mathworks.com/help/vision/ug/the-ply-format.html}.
+
+Blender is an open source 3D object editor.  See
+\code{www.blender.org} for details.
 }
 \author{
 Duncan Murdoch