Added scale transformation for all objects

Author: tylermorganwall

R/RcppExports.R

@@ -1,7 +1,7 @@
 # Generated by using Rcpp::compileAttributes() -> do not edit by hand
 # Generator token: 10BE3573-1514-4C36-9D1C-5A225CD40393
 
-render_scene_rcpp <- function(nx, ny, ns, fov, ambient_light, lookfromvec, lookatvec, aperture, camera_up, type, radius, shape, x, y, z, properties, velocity, moving, n, bghigh, bglow, shutteropen, shutterclose, ischeckered, checkercolors, noise, isnoise, noisephase, noiseintensity, noisecolorlist, angle, isimage, filelocation, islight, lightintensity, isflipped, focus_distance, isvolume, voldensity, parallel, implicit_sample, order_rotation_list, clampval, isgrouped, group_pivot, group_translate, group_angle, group_order_rotation, tri_normal_bools, is_tri_color, tri_color_vert, fileinfo, toneval, progress_bar, numbercores, debugval, hasbackground, background) {
-    .Call(`_rayrender_render_scene_rcpp`, nx, ny, ns, fov, ambient_light, lookfromvec, lookatvec, aperture, camera_up, type, radius, shape, x, y, z, properties, velocity, moving, n, bghigh, bglow, shutteropen, shutterclose, ischeckered, checkercolors, noise, isnoise, noisephase, noiseintensity, noisecolorlist, angle, isimage, filelocation, islight, lightintensity, isflipped, focus_distance, isvolume, voldensity, parallel, implicit_sample, order_rotation_list, clampval, isgrouped, group_pivot, group_translate, group_angle, group_order_rotation, tri_normal_bools, is_tri_color, tri_color_vert, fileinfo, toneval, progress_bar, numbercores, debugval, hasbackground, background)
+render_scene_rcpp <- function(nx, ny, ns, fov, ambient_light, lookfromvec, lookatvec, aperture, camera_up, type, radius, shape, x, y, z, properties, velocity, moving, n, bghigh, bglow, shutteropen, shutterclose, ischeckered, checkercolors, noise, isnoise, noisephase, noiseintensity, noisecolorlist, angle, isimage, filelocation, islight, lightintensity, isflipped, focus_distance, isvolume, voldensity, parallel, implicit_sample, order_rotation_list, clampval, isgrouped, group_pivot, group_translate, group_angle, group_order_rotation, group_scale, tri_normal_bools, is_tri_color, tri_color_vert, fileinfo, filebasedir, toneval, progress_bar, numbercores, debugval, hasbackground, background, scale_list) {
+    .Call(`_rayrender_render_scene_rcpp`, nx, ny, ns, fov, ambient_light, lookfromvec, lookatvec, aperture, camera_up, type, radius, shape, x, y, z, properties, velocity, moving, n, bghigh, bglow, shutteropen, shutterclose, ischeckered, checkercolors, noise, isnoise, noisephase, noiseintensity, noisecolorlist, angle, isimage, filelocation, islight, lightintensity, isflipped, focus_distance, isvolume, voldensity, parallel, implicit_sample, order_rotation_list, clampval, isgrouped, group_pivot, group_translate, group_angle, group_order_rotation, group_scale, tri_normal_bools, is_tri_color, tri_color_vert, fileinfo, filebasedir, toneval, progress_bar, numbercores, debugval, hasbackground, background, scale_list)
 }
 

R/group_objects.R

@@ -8,6 +8,7 @@
 #' applied in the order specified in `order_rotation`.
 #' @param group_order_rotation Default `c(1,2,3)`. The order to apply the rotations, 
 #' referring to "x", "y", and "z".
+#' @param group_scale Default `c(1,1,1)`. Scaling factor for x, y, and z directions for all objects in group.
 #'
 #' @return Tibble of grouped object locations and properties.
 #' @export
@@ -43,7 +44,8 @@
 #'              samples=500, fov=50, parallel=TRUE, clamp_value=5)
 #' }
 group_objects = function(scene, pivot_point=c(0,0,0), group_translate = c(0,0,0),
-                         group_angle = c(0,0,0), group_order_rotation = c(1,2,3)) {
+                         group_angle = c(0,0,0), group_order_rotation = c(1,2,3),
+                         group_scale = c(1,1,1)) {
   if(missing(pivot_point)) {
     pivot_point = c(mean(scene$x), mean(scene$y), mean(scene$z))
   }
@@ -55,5 +57,6 @@ group_objects = function(scene, pivot_point=c(0,0,0), group_translate = c(0,0,0)
   scene$group_translate = list(group_translate)
   scene$group_angle = list(group_angle)
   scene$group_order_rotation = list(group_order_rotation)
+  scene$group_scale = list(group_scale)
   return(scene)
 }

R/objects.R

@@ -188,7 +188,7 @@ render_scene = function(scene, width = 400, height = 400, fov = 20, samples = 10
   light_bool = !is.na(scene$lightintensity)
   light_prop_vec =  scene$lightintensity
 
-  if(!any(light_bool) && missing(ambient_light)) {
+  if(!any(light_bool) && missing(ambient_light) && missing(backgroundimage)) {
     ambient_light = TRUE
   }
 
@@ -222,6 +222,7 @@ render_scene = function(scene, width = 400, height = 400, fov = 20, samples = 10
   group_angle = scene$group_angle 
   group_order_rotation = scene$group_order_rotation 
   group_translate = scene$group_translate 
+  group_scale = scene$group_scale
 
   #triangle normal handler
   tri_normal_bools = purrr::map2_lgl(shapevec,proplist,.f = ~.x == 6 && all(!is.na(.y)))
@@ -232,6 +233,7 @@ render_scene = function(scene, width = 400, height = 400, fov = 20, samples = 10
   fileinfovec = scene$fileinfo
   fileinfovec[is.na(fileinfovec)] = ""
   objfilenamevec = purrr::map_chr(fileinfovec, path.expand)
+  objbasedirvec = purrr::map_chr(objfilenamevec, dirname)
 
   #bg image handler
   if(!is.null(backgroundimage)) {
@@ -242,6 +244,9 @@ render_scene = function(scene, width = 400, height = 400, fov = 20, samples = 10
     backgroundstring = ""
   }
 
+  #scale handler
+  scale_factor = scene$scale_factor
+  
   assertthat::assert_that(all(c(length(xvec),length(yvec),length(zvec),length(rvec),length(typevec),length(proplist)) == length(xvec)))
   assertthat::assert_that(all(!is.null(typevec)))
   for(i in 1:length(xvec)) {
@@ -289,11 +294,11 @@ render_scene = function(scene, width = 400, height = 400, fov = 20, samples = 10
                              isvolume=fog_bool, voldensity = fog_vec , parallel=parallel,
                              implicit_sample = implicit_vec, order_rotation_list = order_rotation_list, clampval = clamp_value,
                              isgrouped = group_bool, group_pivot=group_pivot, group_translate = group_translate,
-                             group_angle = group_angle, group_order_rotation = group_order_rotation,
+                             group_angle = group_angle, group_order_rotation = group_order_rotation, group_scale = group_scale,
                              tri_normal_bools = tri_normal_bools, is_tri_color = is_tri_color, tri_color_vert= tri_color_vert,
-                             fileinfo = objfilenamevec, toneval = toneval,
+                             fileinfo = objfilenamevec, filebasedir = objbasedirvec, toneval = toneval,
                              progress_bar = progress, numbercores = numbercores, debugval = debugval,
-                             hasbackground = hasbackground, background = backgroundstring) 
+                             hasbackground = hasbackground, background = backgroundstring, scale_list = scale_factor) 
   full_array = array(0,c(ncol(rgb_mat$r),nrow(rgb_mat$r),3))
   full_array[,,1] = t(rgb_mat$r)
   full_array[,,2] = t(rgb_mat$g)