diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml index 311feda0..74d8c974 100644 --- a/.github/workflows/R-CMD-check.yaml +++ b/.github/workflows/R-CMD-check.yaml @@ -8,25 +8,35 @@ on: name: R-CMD-check -env: - RGL_USE_NULL: TRUE - jobs: R-CMD-check: - runs-on: ubuntu-latest + runs-on: ${{ matrix.config.os }} + + name: ${{ matrix.config.os }} (${{ matrix.config.r }}) + + strategy: + fail-fast: false + matrix: + config: + - {os: macos-latest, r: 'release'} + - {os: windows-latest, r: 'release'} + - {os: ubuntu-latest, r: 'devel', http-user-agent: 'release'} + - {os: ubuntu-latest, r: 'release'} + - {os: ubuntu-latest, r: 'oldrel-1'} + env: GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }} R_KEEP_PKG_SOURCE: yes + steps: - - name: Install system dependencies - if: runner.os == 'Linux' - run: | - sudo apt-get update - sudo apt-get install libavfilter-dev - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 + + - uses: r-lib/actions/setup-pandoc@v2 - uses: r-lib/actions/setup-r@v2 with: + r-version: ${{ matrix.config.r }} + http-user-agent: ${{ matrix.config.http-user-agent }} use-public-rspm: true - uses: r-lib/actions/setup-r-dependencies@v2 @@ -35,3 +45,5 @@ jobs: needs: check - uses: r-lib/actions/check-r-package@v2 + with: + upload-snapshots: true diff --git a/DESCRIPTION b/DESCRIPTION index 650d53e8..6f8399e1 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Package: rayshader Type: Package Title: Create Maps and Visualize Data in 2D and 3D -Version: 0.37.1 -Date: 2024-01-11 +Version: 0.37.2 +Date: 2024-02-18 Author: Tyler Morgan-Wall Maintainer: Tyler Morgan-Wall 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. @@ -47,9 +47,9 @@ Suggests: osmdata, raybevel LinkingTo: Rcpp, progress, RcppArmadillo -RoxygenNote: 7.2.3 +RoxygenNote: 7.3.0 URL: https://www.rayshader.com, - https://github.com/tylermorganwall/rayshader + https://github.com/tylermorganwall/rayshader BugReports: https://github.com/tylermorganwall/rayshader/issues Remotes: tylermorganwall/rayimage, tylermorganwall/rayrender, @@ -57,3 +57,4 @@ Remotes: tylermorganwall/rayimage, tylermorganwall/raybevel, dmurdoch/rgl Config/testthat/edition: 3 +Additional_Repositories: https://github.com/tylermorganwall/raybevel diff --git a/R/make_base_triangulated.R b/R/make_base_triangulated.R index eadd8c5b..dba2ab42 100644 --- a/R/make_base_triangulated.R +++ b/R/make_base_triangulated.R @@ -5,8 +5,6 @@ #'@param tris A two-dimensional matrix, where each entry in the matrix is the elevation at that point. All points are assumed to be evenly spaced. #'@param basedepth Default `0`. #'@param basecolor Default `grey20`. -#'@param zscale Default `1`. The ratio between the x and y spacing (which are assumed to be equal) and the z axis. For example, if the elevation levels are in units -#'of 1 meter and the grid values are separated by 10 meters, `zscale` would be 10. #'@keywords internal make_base_triangulated = function(tris, basedepth=0,basecolor="grey20") { bd = basedepth diff --git a/R/render_clouds.R b/R/render_clouds.R index 4c511e96..91b32187 100644 --- a/R/render_clouds.R +++ b/R/render_clouds.R @@ -1,6 +1,5 @@ #' Generate Fractal Perlin Noise #' -#' @param image Matrix #' #' @return image array #' @keywords internal @@ -38,8 +37,6 @@ gen_fractal_perlin = function(ray_d, xyz, altitude, nrow = NULL, ncol = NULL, t_ #' Calculate a single raymarched cloud layer #' -#' @param image Matrix -#' #' @return image array #' @keywords internal #' @@ -275,8 +272,6 @@ render_clouds = function(heightmap, start_altitude = 1000, end_altitude=2000, #' Calculate a single raymarched cloud layer #' -#' @param image Matrix -#' #' @return image array #' @keywords internal #' diff --git a/R/render_snapshot_software.R b/R/render_snapshot_software.R index c631d619..8773908a 100644 --- a/R/render_snapshot_software.R +++ b/R/render_snapshot_software.R @@ -1,8 +1,5 @@ #'@title Render Software Snapshot #' -#'@param ground_size Default `10000`. The width of the plane representing the ground. -#'@param camera_location Default `NULL`. Custom position of the camera. The `FOV`, `width`, and `height` arguments will still -#'be derived from the rgl window. #'@param ... Additional parameters to pass to `rayvertex::rasterize_scene()` #'@keywords internal render_snapshot_software = function(filename, cache_scene = FALSE, camera_location = NULL, diff --git a/R/transform_into_heightmap_coords.R b/R/transform_into_heightmap_coords.R index 909a6e7f..884a24db 100644 --- a/R/transform_into_heightmap_coords.R +++ b/R/transform_into_heightmap_coords.R @@ -1,7 +1,5 @@ #' Get Position from Lat/Long and heightmap/extent #' -#' @param image Matrix -#' #' @return x/y/z #' @keywords internal #' diff --git a/R/utils.R b/R/utils.R index 78309335..a2a3141c 100644 --- a/R/utils.R +++ b/R/utils.R @@ -35,8 +35,6 @@ load_image = function(image, reorient) { #' Generate Base Shape #' -#' @param image Matrix -#' #' @return image array #' @keywords internal #' diff --git a/man/gen_fractal_perlin.Rd b/man/gen_fractal_perlin.Rd index 6fed7ca5..085f6337 100644 --- a/man/gen_fractal_perlin.Rd +++ b/man/gen_fractal_perlin.Rd @@ -21,9 +21,6 @@ gen_fractal_perlin( scale_z = 1 ) } -\arguments{ -\item{image}{Matrix} -} \value{ image array } diff --git a/man/generate_base_shape.Rd b/man/generate_base_shape.Rd index 1aea43c0..e6745b33 100644 --- a/man/generate_base_shape.Rd +++ b/man/generate_base_shape.Rd @@ -6,9 +6,6 @@ \usage{ generate_base_shape(heightmap, baseshape, angle = 0) } -\arguments{ -\item{image}{Matrix} -} \value{ image array } diff --git a/man/generate_cloud_layer.Rd b/man/generate_cloud_layer.Rd index 9fe6cc14..b731a88c 100644 --- a/man/generate_cloud_layer.Rd +++ b/man/generate_cloud_layer.Rd @@ -23,9 +23,6 @@ generate_cloud_layer( seed = 1 ) } -\arguments{ -\item{image}{Matrix} -} \value{ image array } diff --git a/man/make_base_triangulated.Rd b/man/make_base_triangulated.Rd index 1fdf8b63..44e861f3 100644 --- a/man/make_base_triangulated.Rd +++ b/man/make_base_triangulated.Rd @@ -12,9 +12,6 @@ make_base_triangulated(tris, basedepth = 0, basecolor = "grey20") \item{basedepth}{Default `0`.} \item{basecolor}{Default `grey20`.} - -\item{zscale}{Default `1`. The ratio between the x and y spacing (which are assumed to be equal) and the z axis. For example, if the elevation levels are in units -of 1 meter and the grid values are separated by 10 meters, `zscale` would be 10.} } \description{ Makes the base below the 3D elevation map. diff --git a/man/raymarch_cloud_layer.Rd b/man/raymarch_cloud_layer.Rd index 1b3d2c8f..9c451050 100644 --- a/man/raymarch_cloud_layer.Rd +++ b/man/raymarch_cloud_layer.Rd @@ -27,9 +27,6 @@ raymarch_cloud_layer( seed = 1 ) } -\arguments{ -\item{image}{Matrix} -} \value{ image array } diff --git a/man/render_snapshot_software.Rd b/man/render_snapshot_software.Rd index 635e0424..f17d584a 100644 --- a/man/render_snapshot_software.Rd +++ b/man/render_snapshot_software.Rd @@ -32,12 +32,7 @@ render_snapshot_software( ) } \arguments{ -\item{camera_location}{Default `NULL`. Custom position of the camera. The `FOV`, `width`, and `height` arguments will still -be derived from the rgl window.} - \item{...}{Additional parameters to pass to `rayvertex::rasterize_scene()`} - -\item{ground_size}{Default `10000`. The width of the plane representing the ground.} } \description{ Render Software Snapshot diff --git a/man/transform_into_heightmap_coords.Rd b/man/transform_into_heightmap_coords.Rd index 153528ed..925939f6 100644 --- a/man/transform_into_heightmap_coords.Rd +++ b/man/transform_into_heightmap_coords.Rd @@ -16,9 +16,6 @@ transform_into_heightmap_coords( filter_bounds = TRUE ) } -\arguments{ -\item{image}{Matrix} -} \value{ x/y/z }