Skip to content

Commit

Permalink
rayshader v0.37.2: CRAN doc fixes and update GHA CHECK
Browse files Browse the repository at this point in the history
  • Loading branch information
tylermorganwall committed Feb 19, 2024
1 parent e1d2766 commit 1190a1b
Show file tree
Hide file tree
Showing 14 changed files with 27 additions and 51 deletions.
32 changes: 22 additions & 10 deletions .github/workflows/R-CMD-check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -35,3 +45,5 @@ jobs:
needs: check

- uses: r-lib/actions/check-r-package@v2
with:
upload-snapshots: true
9 changes: 5 additions & 4 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.1
Date: 2024-01-11
Version: 0.37.2
Date: 2024-02-18
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 Down Expand Up @@ -47,13 +47,14 @@ 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,
tylermorganwall/rayvertex,
tylermorganwall/raybevel,
dmurdoch/rgl
Config/testthat/edition: 3
Additional_Repositories: https://github.com/tylermorganwall/raybevel
2 changes: 0 additions & 2 deletions R/make_base_triangulated.R
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 0 additions & 5 deletions R/render_clouds.R
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#' Generate Fractal Perlin Noise
#'
#' @param image Matrix
#'
#' @return image array
#' @keywords internal
Expand Down Expand Up @@ -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
#'
Expand Down Expand Up @@ -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
#'
Expand Down
3 changes: 0 additions & 3 deletions R/render_snapshot_software.R
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
2 changes: 0 additions & 2 deletions R/transform_into_heightmap_coords.R
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
#' Get Position from Lat/Long and heightmap/extent
#'
#' @param image Matrix
#'
#' @return x/y/z
#' @keywords internal
#'
Expand Down
2 changes: 0 additions & 2 deletions R/utils.R
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,6 @@ load_image = function(image, reorient) {

#' Generate Base Shape
#'
#' @param image Matrix
#'
#' @return image array
#' @keywords internal
#'
Expand Down
3 changes: 0 additions & 3 deletions man/gen_fractal_perlin.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 0 additions & 3 deletions man/generate_base_shape.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 0 additions & 3 deletions man/generate_cloud_layer.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 0 additions & 3 deletions man/make_base_triangulated.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 0 additions & 3 deletions man/raymarch_cloud_layer.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 0 additions & 5 deletions man/render_snapshot_software.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 0 additions & 3 deletions man/transform_into_heightmap_coords.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 1190a1b

Please sign in to comment.