Try to avoid warnings/errors

dmurdoch · Mar 13, 2023 · 3f536d5 · 3f536d5
1 parent 43b1373
commit 3f536d5
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/R/convertScene.R b/R/convertScene.R
@@ -468,7 +468,8 @@ convertScene <- function(x = scene3d(minimal), width = NULL, height = NULL,
           normalization <- ""
           if (length(obj[[n]]) > 6 &&  # Don't bother for short ones
               n %in% c("colors","texcoords") &&
-              0 <= (objrange <- range(obj[[n]]))[1] &&
+              !anyNA(objrange <- range(obj[[n]])) &&
+              0 <= objrange[1] &&
               objrange[2] <= 1) {
             scaled <- 255*obj[[n]]
             rounded <- round(scaled)

diff --git a/R/r3d.rgl.R b/R/r3d.rgl.R
@@ -104,10 +104,13 @@ warnBlackTexture <- function(...,
                              texmode = defaults$texmode) {
   if (!is.null(texture) &&
       length(color) == 1 &&
+      !is.na(color) &&
       color == "missing" &&
+      !is.na(texmode) && 
       texmode == "modulate" &&
-      getOption("rgl.warnBlackTexture", TRUE) &&
+      isTRUE(getOption("rgl.warnBlackTexture", TRUE)) &&
       length(defaults$color) &&
+      !is.na(defaults$color[1]) &&
       defaults$color[1] %in% c("#000000", "black")) {
     warning("Texture will be invisible on black surface", call. = FALSE) 
   }

diff --git a/src/gl.c b/src/gl.c
@@ -1,11 +1,14 @@
-#ifndef RGL_NO_OPENGL
-
 /**
  * SPDX-License-Identifier: (WTFPL OR CC0-1.0) AND Apache-2.0
  */
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+
+/* put this here to avoid warning about empty file */
+
+#ifndef RGL_NO_OPENGL
+
 #include <glad/gl.h>
 
 #ifndef GLAD_IMPL_UTIL_C_