Merge pull request #422 from dmurdoch/bgplotbug

Fix background issues

DESCRIPTION

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

NEWS.md

@@ -1,9 +1,15 @@
-# rgl 1.3.5
+# rgl 1.3.6
 
 ## Minor changes
 
 * `readSTL()` can now read (some) ASCII format STL files.
 
+## Bug fixes
+
+* Background plots did not always appear (issue #421).
+* Changing the background resulted in an additional background
+object instead of replacing the current one.
+
 # rgl 1.3.4
 
 ## Bug fixes

R/bgplot3d.R

@@ -40,7 +40,8 @@ bgplot3d <- function(expression, bg.color = getr3dDefaults("bg", "color"),
     grDevices::devAskNewPage(FALSE)
     value <- try(expression)  
     safe.dev.off()
-    result <- bg3d(texture = filename, col = "white", lit = FALSE, ...)
+    result <- bg3d(texture = filename, col = "white", lit = FALSE,
+                   front = "filled", back = "filled", ...)
   } else {
     value <- NULL
     result <- bg3d(col = bg.color, ...)

R/r3d.rgl.R

@@ -226,6 +226,7 @@ bg3d        <- function(color,
       else if (flags["exp_fog", 1]) "exp"
       else if (flags["exp2_fog", 1]) "exp2"
       else "none"
+    pop3d(type = "background", id = bgid)
   }
   dots <- list(...)
 

inst/htmlwidgets/lib/rglClass/draw.src.js

@@ -1167,14 +1167,17 @@
         savepr = this.prMatrix;
         saveinvpr = this.invPrMatrix;
         savemv = this.mvMatrix;
+        savenorm = this.normMatrix;
         this.prMatrix = new CanvasMatrix4();
         this.invPrMatrix = new CanvasMatrix4();
         this.mvMatrix = new CanvasMatrix4();
+        this.normMatrix = new CanvasMatrix4();
         for (i=0; i < obj.quad.length; i++)
           result = result.concat(this.drawObjId(obj.quad[i], subsceneid));
         this.prMatrix = savepr;
         this.invPrMatrix = saveinvpr;
         this.mvMatrix = savemv;
+        this.normMatrix = savenorm;
 
       } else if (obj.sphere) {
         subscene = this.getObj(subsceneid);