Skip to content

Commit

Permalink
rayshader v0.37.3: Update to support new rayrender scene class
Browse files Browse the repository at this point in the history
-Fix pkgdown GHA check
-Update imports
  • Loading branch information
tylermorganwall committed Feb 20, 2024
1 parent 8fc3319 commit 4a69c72
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/pkgdown.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
RGL_USE_NULL: true
_SF_USE_S2: false
IN_PKGDOWN: "true"
IN_PKGDOWN: true
steps:
- uses: actions/checkout@v3

Expand Down
10 changes: 5 additions & 5 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Package: rayshader
Type: Package
Title: Create Maps and Visualize Data in 2D and 3D
Version: 0.37.2
Date: 2024-02-18
Version: 0.37.3
Date: 2024-02-19
Author: Tyler Morgan-Wall
Maintainer: Tyler Morgan-Wall <[email protected]>
Description: Uses a combination of raytracing and multiple hill shading methods to produce 2D and 3D data visualizations and maps. Includes water detection and layering functions, programmable color palette generation, several built-in textures for hill shading, 2D and 3D plotting options, a built-in path tracer, 'Wavefront' OBJ file export, and the ability to save 3D visualizations to a 3D printable format.
Expand All @@ -24,9 +24,9 @@ Imports: doParallel,
utils,
methods,
terrainmeshr,
rayimage (>= 0.9.0),
rayvertex (>= 0.8.2),
rayrender (>= 0.30.0)
rayimage (>= 0.10.0),
rayvertex (>= 0.10.4),
rayrender (>= 0.32.2)
Suggests:
reshape2,
viridis,
Expand Down
6 changes: 3 additions & 3 deletions R/render_highquality.R
Original file line number Diff line number Diff line change
Expand Up @@ -230,14 +230,14 @@ render_highquality = function(filename = NA, samples = 128,
stop(sprintf("Point material arguments `%s` not valid for the material. Valid argument names are: \n%s",
all_not_matching, all_arg_names))
}

#Set use_extruded_path to TRUE if path_material is dielectric
path_material_df = path_material()
path_material_raw = path_material()
path_material_df = path_material_raw[[1]]
if(path_material_df$type == "dielectric" && !use_extruded_paths) {
message("dielectric material for paths selected--setting `use_extruded_paths = TRUE` for accurate rendering of material")
use_extruded_paths = TRUE
}

#Get scene info
windowrect = rgl::par3d()$windowRect
if(!is.null(title_text)) {
Expand Down
5 changes: 1 addition & 4 deletions R/utils.R
Original file line number Diff line number Diff line change
Expand Up @@ -93,10 +93,7 @@ generate_base_shape = function(heightmap, baseshape, angle=0) {
#' # See if the documentation should be run.
#' run_documentation()
run_documentation = function() {
return(identical(Sys.getenv("IN_PKGDOWN"), "true") &&
length(find.package("magick", quiet = TRUE)) > 0 &&
length(find.package("sf", quiet = TRUE)) > 0 &&
length(find.package("rgdal", quiet = TRUE)) > 0)
return(identical(Sys.getenv("IN_PKGDOWN"), "true"))
}

#' Unit Vector
Expand Down

0 comments on commit 4a69c72

Please sign in to comment.