Skip to content

Commit

Permalink
version 0.10.3
Browse files Browse the repository at this point in the history
  • Loading branch information
tylermorganwall authored and cran-robot committed Dec 11, 2023
1 parent 27ab8c5 commit 8926d09
Show file tree
Hide file tree
Showing 84 changed files with 1,650 additions and 672 deletions.
10 changes: 5 additions & 5 deletions DESCRIPTION
@@ -1,8 +1,8 @@
Package: rayvertex
Type: Package
Title: 3D Software Rasterizer
Version: 0.7.9
Date: 2023-06-08
Version: 0.10.3
Date: 2023-12-09
Authors@R: c(person("Tyler", "Morgan-Wall", email = "tylermw@gmail.com",
role = c("aut", "cph", "cre"), comment = c(ORCID = "0000-0002-3131-3814")),
person("Syoyo", "Fujita", role=c("ctb", "cph")),
Expand All @@ -14,7 +14,7 @@ Description: Rasterize images using a 3D software renderer. 3D scenes are create
License: GPL (>= 3)
Copyright: file inst/COPYRIGHTS
Depends: R (>= 4.1)
Imports: Rcpp (>= 1.0.6), grDevices, rayimage (>= 0.6.2), png, digest
Imports: Rcpp (>= 1.0.6), grDevices, rayimage (>= 0.10.0), png, digest
Suggests: Rvcg, magick, raster
LinkingTo: Rcpp, spacefillr, RcppThread, rayimage
RoxygenNote: 7.2.3
Expand All @@ -24,12 +24,12 @@ BugReports: https://github.com/tylermorganwall/rayvertex/issues
Encoding: UTF-8
SystemRequirements: C++17
NeedsCompilation: yes
Packaged: 2023-06-08 13:14:22 UTC; tyler
Packaged: 2023-12-10 03:37:06 UTC; tyler
Author: Tyler Morgan-Wall [aut, cph, cre]
(<https://orcid.org/0000-0002-3131-3814>),
Syoyo Fujita [ctb, cph],
Vilya Harvey [ctb, cph],
G-Truc Creation [ctb, cph],
Sean Barrett [ctb, cph]
Repository: CRAN
Date/Publication: 2023-06-08 13:40:02 UTC
Date/Publication: 2023-12-10 06:00:02 UTC
153 changes: 83 additions & 70 deletions MD5
@@ -1,26 +1,31 @@
7cf022a8ea05f4521f6ac595f2e8ff0b *DESCRIPTION
01fdda09d148284e37922868a3a2c782 *NAMESPACE
1ca5bba3e685c19767ac4cfee3dd0803 *R/RcppExports.R
78e04f920d7e8d8fde977647d1bf293c *R/add_shape.R
8ce588e2169b7812bbe60e2d7a3118ad *R/construct_mesh.R
77c22117ee190574b5d53cda96c24157 *R/lights.R
b8828a6c002d1661210316efec4f7600 *R/lines.R
27e439e713eb915f731ad9ce7cbea61d *R/material_functions.R
3bfdcb98ea32ca2a517d9f48fb023791 *R/merge_scene.R
1ddfad475f278d63c58790dab62b5dbc *R/objects.R
e165929a43b579adc0eba8b5481a762e *DESCRIPTION
90af430f21c54fa2629a282ce779b41d *NAMESPACE
15f628bc502bbe3af60b707abbaad0a6 *R/RcppExports.R
562165f99ac58692839cc6bf2469e403 *R/add_plane_uv_mesh.R
e0e12d7af0816720b2df0c10efafd0b6 *R/add_shape.R
45d15b776e1a7d444265423d2e19cf36 *R/construct_mesh.R
c60e806df002ecb6188126150258b0da *R/flip_orientation_mesh.R
1bc4c086006aa70d179ab75d07d50a24 *R/lights.R
dd9affc17c4d7565dc1fbb07cb0b22bc *R/lines.R
4d43fabc5c664622b18de9a1d3d445d6 *R/material_functions.R
f26020cf5214e4b4d930d45b6b6c7d51 *R/merge_scene.R
876d867a5329156b7a89f315a7d8d903 *R/objects.R
023bb9a74eaa191f2a2f85696537e9a9 *R/r_obj.R
28dec298154488bcb10ad5b9005b714b *R/rasterize_lines.R
dbec98eb7d086ba7443049c1424bde6b *R/rasterize_scene.R
aedd4ace6466b30077ad861fe38b85d0 *R/rasterize_lines.R
ed18b1c19089aad8032b42b2f70a1c41 *R/rasterize_scene.R
7f42fca5c29d80b99313f6f6ebb20a0a *R/rayvertexcpp.R
cb26fb13dd32ad4361515279e25e202a *R/readobj.R
a127648af58b90fe8ab29e77612a62c1 *R/readobj.R
a99b7461e2c69e35dc14197c22ba4507 *R/remove_duplicate_materials.R
1b08f789a4130045343d12d7b3e80e3d *R/save_png.R
bbe27fcecb39739e4fea227f4d0c4c41 *R/scene_from_list.R
146a8bdd020ac6a93ea9b675bea307c0 *R/transform_mesh_functions.R
658034ecd9d82d492d763be2f7a9e3fa *R/util_functions.R
6897447d153a388f2e542db39dccd9c8 *R/scene_from_list.R
66df758c818e674ebfc74b47e8f1131d *R/smooth_normals_mesh.R
392b43b8d7de485d767f262f689c1831 *R/swap_yz.R
fce2f1df75c00d92d6619ab803172307 *R/transform_mesh_functions.R
a8d6a2eb65a0780a364067997939009a *R/util_functions.R
d41d8cd98f00b204e9800998ecf8427e *R/utils-pipe.R
ee9d388d11fecea87d80e6b9248057ca *R/validate_mesh.R
6b03d66c8e6138b32f713d241cde772f *R/validate_scene.R
7a5477389351af59d511e2219a8ae440 *R/write_scene_to_obj.R
a1e93e638184168c10d97140bf4b556a *R/write_scene_to_obj.R
a4f25a0cee728d6c6e064f9ea8a92583 *R/zzz.R
931b2f38f688562d1abb9c2ca2247241 *inst/COPYRIGHTS
2a1af35fc550923e4f21f24a2fb5b4b0 *inst/extdata/arrow.txt
Expand All @@ -34,67 +39,74 @@ c9b8ecf8fabbc9c6053a32e27004de6c *inst/extdata/r_obj.txt
eacd41c3d379e7b54a0d6baf4c48e93b *inst/extdata/xy_plane.txt
5886c7886aeed9cb252b2b68a2d7427b *inst/extdata/xz_plane.txt
3483f4152195d73e03ddef65b8301c1e *inst/extdata/yz_plane.txt
4c651573b70acac290bcf051b076a207 *man/add_light.Rd
20c10134e0f61cf022ec14bbbc35df8d *man/add_lines.Rd
fc16c384bb1984d97bab54a4bf985cf5 *man/add_shape.Rd
60ace5f259954d1e22f3fd1c60b4223a *man/arrow_mesh.Rd
8391eb84e4cd0b2ade778579ac00a3da *man/center_mesh.Rd
2ff345045c2b633e208f84309863ace6 *man/change_material.Rd
37aa89e56ce55da61853562d6d75b8d2 *man/color_lines.Rd
055e465f7018f28c8401c31d9dbc987a *man/cone_mesh.Rd
9aebbeca79d744c7b11fa238e8e7002c *man/construct_mesh.Rd
bc05080bdf1e1c611d7af46918bd4228 *man/convert_color.Rd
a809e9adbed3921956dbbab7877b182b *man/cube_mesh.Rd
277adddf040e7ff54e420fca8700a0de *man/cylinder_mesh.Rd
98849de85f70f60c29200c058576bf9f *man/directional_light.Rd
ee1bdfc64aae0f5f3d01f25a9718c81c *man/add_light.Rd
0f31a4c37d7497aeb84eb52beab64788 *man/add_lines.Rd
8f906169e8d086a35b0463d817ec597b *man/add_plane_uv_mesh.Rd
125c12d35679831c3a228e4838fcce62 *man/add_shape.Rd
5cfce4f94d56bff94e29e5b79796ff1c *man/arrow_mesh.Rd
e18ff6fc698d7df3f1af118d4d006a1e *man/center_mesh.Rd
009bd3ecb4aae5b9f06f29cbdd503618 *man/change_material.Rd
feb734700426f985c0f0aa4ba450ca2e *man/color_lines.Rd
0dd9ac9c7fbc57be077519a8133182d8 *man/cone_mesh.Rd
0a6e6c41495893e2d3fbd2fe46e30306 *man/construct_mesh.Rd
90f8615b89b431873f6cb275bbc00940 *man/convert_color.Rd
cd9ead638638fb6cfc2375192e750883 *man/cross_prod.Rd
6673967c4790e4d0ce66b80fad79536a *man/cube_mesh.Rd
a8838a8d325de4b23788c250efcdd76f *man/cylinder_mesh.Rd
cffbe0d35eb41461e69468a8bcae1322 *man/directional_light.Rd
977cbb1735a0b451507cd6a4523c7f61 *man/flip_orientation_mesh.Rd
a22d71c772cddee523d89ec0ee5d8c37 *man/fliplr.Rd
6e4a020852616f9aeeeddddf334cbaeb *man/flipud.Rd
4028bdb5e9b5f141ba580bae351cad73 *man/generate_cornell_mesh.Rd
c582c40bd4d30753f35687df11c7a6cd *man/generate_line.Rd
3d8c5df0cd3604583c7f6c1c521c174d *man/generate_rot_matrix.Rd
21dea2adba24587088788bc403e75cba *man/generate_toon_outline.Rd
7b7d7f2e744656aa9c384ee25aecabfa *man/generate_cornell_mesh.Rd
42a47f09da8c1107532f14de70542a40 *man/generate_line.Rd
06c7914cbdb8fe2745dbd43567bcd25a *man/generate_rot_matrix.Rd
f666b35db8cc029f117d525cae537052 *man/generate_rotation_matrix_from_direction.Rd
bdea6d9144b796f0fb03c51f41d7faf9 *man/generate_toon_outline.Rd
02076fd7f8a6d074d1693c7ccb551d74 *man/get_file_type.Rd
608fb9ab59df87ee69801361fd3a0aa0 *man/get_mesh_bbox.Rd
89a953e19e17f213dc3ca6c04576c5e8 *man/get_mesh_center.Rd
67884f1568773cb0624334698b3f577b *man/get_mesh_bbox.Rd
546950e0ba38ada4f326c335df268019 *man/get_mesh_center.Rd
59c4ff0e4939f5258b64eeae7b51585a *man/get_time.Rd
e010230e9a6fe0dc93a824035a63c787 *man/init_time.Rd
fcf5810bea4f244441cb5ed17adac523 *man/material_list.Rd
1d555bb43018ecedd167d2d51722e051 *man/merge_scene.Rd
841d9e3402be1a62591efdcc22ef957c *man/mesh3d_mesh.Rd
92ada313db8f97608e7711c28b23e5b5 *man/obj_mesh.Rd
ee53ef199fbe664f09fb49ee0794998f *man/ply_mesh.Rd
a254578ad641ef720a354ad16167a157 *man/point_light.Rd
adce5c764a28dffca1ee6aad8c72bb7d *man/print_time.Rd
c7f6539f2f46efc47dae301f98384028 *man/init_time.Rd
9af31c6325ac62f50f2eab2a6dd18c43 *man/material_list.Rd
b779e35bc709010668aded34f33e2220 *man/merge_scene.Rd
3578596b93a68e9c85668e7d904e4070 *man/mesh3d_mesh.Rd
3e6259cf9a4da38cc286f9f584a2202e *man/obj_mesh.Rd
53e345d20929b99104f7fed6f239cf5b *man/ply_mesh.Rd
7a5962d34678cb2705bef4c48d9243cc *man/point_light.Rd
dcbe8b393b0a1a167296a7c7410f5015 *man/print_time.Rd
853044202d05cd0233ca4664eccdd10e *man/r_obj.Rd
4f3e5c466fe17adb88a534cc1e24dff7 *man/rasterize_lines.Rd
42acefee70ea3245c6be6bf9c433eb0d *man/rasterize_scene.Rd
ec283112549acf698f35de90c78de3cf *man/read_obj.Rd
bc93723ae59300ad632f5d87b35a7c4b *man/rasterize_lines.Rd
f4ff4b053c80ab3a74bf94cec852a295 *man/rasterize_scene.Rd
52f170da909f8b27c532a3327eff51b1 *man/read_obj.Rd
c8a283a408135fd9fe61f75c660087ab *man/read_ply.Rd
e840556b42925827ac06c7b8fcfb8db0 *man/remove_duplicate_materials.Rd
87ecdeeaead897ca8602f531317ec96d *man/rescale.Rd
456a202326d980ba215747b8f7f83a59 *man/rotate_lines.Rd
3d875ec0a8a2f787c4e095622b08d81f *man/rotate_mesh.Rd
78b6abbe25ba487eaf022d79671ad405 *man/run_documentation.Rd
9325c9b7c0844187d7b562fea6abfa74 *man/save_png.Rd
c49f102f2771a4561f40b86c73168d8b *man/scale_lines.Rd
122f1794abcdcae0365b965d7693ed72 *man/scale_mesh.Rd
f739638a55543765a3faf6b52cc40f90 *man/scale_unit_mesh.Rd
62106e376f85807e4b4e02b54a04fecc *man/scene_from_list.Rd
db9cad8fe07d86e2ee968e5e5c8a4be0 *man/segment_mesh.Rd
5eea8ed7f2135f61869fd0013bcf9572 *man/set_material.Rd
ae37d2abd20e52415c14eb190402b54d *man/sphere_mesh.Rd
8e4d33f53d3bf8a49fe0042bce561081 *man/text3d_mesh.Rd
c6e9e53426a3f4e72f2af67784b1009b *man/torus_mesh.Rd
9b0e6e79cb236a37d938cb54d8ce3076 *man/translate_lines.Rd
d22c22e861192fa2b2198ac63eebe505 *man/translate_mesh.Rd
5b7ee6a9f89c61b664d0e58b82f5d19c *man/rotate_lines.Rd
da81ec35308231a380be275a18657535 *man/rotate_mesh.Rd
9e20586639fbea4a2ccaf56fbe3d43f0 *man/run_documentation.Rd
31233b724b85b0ebf153f4ab8a6e613a *man/save_png.Rd
7f392b04f2c74e9d9617bc5f44d60b2d *man/scale_lines.Rd
a2dc53221a6e58fe44cd50a07da7cdee *man/scale_mesh.Rd
a3feb52767e3741a69552f0f83562a26 *man/scale_unit_mesh.Rd
ccff0ca55c7615e87503c48086e9559a *man/scene_from_list.Rd
63aa4027593a5aac570e84a1da00d01f *man/segment_mesh.Rd
fad0f2d15da9c84ca93379d94111f40a *man/set_material.Rd
d7ae2778fb166d1f7e6580dee766510e *man/smooth_normals_mesh.Rd
a11085222cc4bc7d3a94214289ebc04f *man/sphere_mesh.Rd
6a3579860e11d066527d80bec39b05b5 *man/swap_yz.Rd
7b4cbe8aa184a7e0d286b9ffc8c88eb5 *man/text3d_mesh.Rd
70c82cbec085dac2f037d796f1e29fb1 *man/torus_mesh.Rd
7e50cd2d78d3fd9433c36d8ee1cd304a *man/translate_lines.Rd
d72ac4bb724e7573921ee02a0966a02c *man/translate_mesh.Rd
4590ea0e3e65208c00be15398adb4bff *man/validate_mesh.Rd
a5d8756742347a9ad6544b740d142e1b *man/validate_scene.Rd
c14351d0284c389805ea643a8a83970b *man/verify_vertex_shader.Rd
f3ca476c93b335bd0bcc3af19305eaa6 *man/write_scene_to_obj.Rd
9782f0e3727e822fa4161e95a7f6a10f *man/xy_rect_mesh.Rd
21e97d44f856eb7788971cb32d426aca *man/xz_rect_mesh.Rd
41a91f66fb3d519c752ae2da47bcaa97 *man/yz_rect_mesh.Rd
2299f1b0450814b68485fcd719374080 *man/write_scene_to_obj.Rd
1dcb06c06e5b8f66a67d083285fd8946 *man/xy_rect_mesh.Rd
a9565223f15f606e4ca7e46f8b65ae69 *man/xz_rect_mesh.Rd
839283f7fed0755563d9f75e61adb380 *man/yz_rect_mesh.Rd
4f2e5ff14bf3e41dba34982dcbee16a3 *src/Makevars
762902caa7a97ade0842885fb7cabbd5 *src/RcppExports.cpp
d117dfc9c6608b881b374703928269b1 *src/RcppExports.cpp
c9582368bd17960777ba467f42bfb7d4 *src/alphainfo.h
a43984360f58ab71cd346aedf24da09d *src/defines.h
3eab7e6a1241255728e543ab2067b82f *src/earcut.h
Expand Down Expand Up @@ -524,18 +536,19 @@ e8f062f6785fe689e03b6ecfe173e497 *src/glm/vector_relational.hpp
9cc93f719175cbdecfd9bc0e9e16ec7b *src/light.h
9c91fefbf973459b70c860fc8775beb0 *src/line.cpp
e28b804aca08b95fe41fbd924e07fbe8 *src/line.h
2ad02b309122697638ca634d8bac7c48 *src/load_obj.cpp
f0d6ae8ba701d1fb07b8724df5590b0e *src/load_ply.cpp
7a3e462556980e45f9d067639e413638 *src/load_obj.cpp
1e721ad480f959fe33bd6e8de890de3d *src/load_ply.cpp
82f366bac45e3a11355985a263d19ca7 *src/material.h
80110cf04fecc0739b0d4163c668d66e *src/miniply.cpp
d9a11a0c35519499cb3b05b10776ae62 *src/miniply.h
a58212f5a220ee0d426764e39ee52f95 *src/model.h
261d5be9a76e541bc5b983f37691f8fd *src/rasterize_lines_rcpp.cpp
494b3da2ea565414ba4debee21b26f55 *src/rayimage.cpp
a689caedc04e4ac2ce623097ffe51ef1 *src/rayimage.h
26fe6c6f4188a3f6ea57fa69723c41de *src/rayraster.cpp
c1ff5a264d8b4a3f08152f488701d229 *src/rayraster.cpp
76ede45049c00223318f0a6e7da552fe *src/shaders.cpp
ed4a4dda84f4a04ea0d284fae6c8ace7 *src/shaders.h
3b95ed77acf2198dd9c5847b13aaba11 *src/smooth_normals_mesh_rcpp.cpp
20dab7c931f1a56f7e854a418b97fc06 *src/stb_image.h
c06cb7afcda68372ae4bf96cba12c2ed *src/tiny_obj_loader.h
6b085045465b75e053039a30b34581eb *src/tonemap.cpp
Expand Down
6 changes: 6 additions & 0 deletions NAMESPACE
Expand Up @@ -2,6 +2,7 @@

export(add_light)
export(add_lines)
export(add_plane_uv_mesh)
export(add_shape)
export(arrow_mesh)
export(center_mesh)
Expand All @@ -12,6 +13,7 @@ export(construct_mesh)
export(cube_mesh)
export(cylinder_mesh)
export(directional_light)
export(flip_orientation_mesh)
export(generate_cornell_mesh)
export(generate_line)
export(get_mesh_bbox)
Expand All @@ -27,17 +29,21 @@ export(rasterize_scene)
export(read_obj)
export(rotate_lines)
export(rotate_mesh)
export(run_documentation)
export(scale_lines)
export(scale_mesh)
export(scale_unit_mesh)
export(scene_from_list)
export(segment_mesh)
export(set_material)
export(smooth_normals_mesh)
export(sphere_mesh)
export(swap_yz)
export(text3d_mesh)
export(torus_mesh)
export(translate_lines)
export(translate_mesh)
export(validate_mesh)
export(write_scene_to_obj)
export(xy_rect_mesh)
export(xz_rect_mesh)
Expand Down
8 changes: 6 additions & 2 deletions R/RcppExports.R
Expand Up @@ -13,8 +13,12 @@ rasterize_lines_rcpp <- function(line_mat, nx, ny, model_color, lookfrom, lookat
.Call(`_rayvertex_rasterize_lines_rcpp`, line_mat, nx, ny, model_color, lookfrom, lookat, fov, near_clip, far_clip, bounds, camera_up, alpha_line, line_offset, ortho_dims, aa_lines)
}

rasterize <- function(mesh, lightinfo, line_mat, nx, ny, model_color, lookfrom, lookat, fov, typevals, has_shadow_map, calc_ambient, tbn, ambient_radius, shadow_map_bias, numbercores, max_indices, has_normals_vec, has_tex_vec, has_texture, has_ambient_texture, has_normal_texture, has_specular_texture, has_emissive_texture, block_size, use_default_material, near_clip, far_clip, shadow_map_intensity, bounds, shadowdims, camera_up, alpha_line, line_offset, ortho_dims, is_dir_light, aa_lines, has_vertex_tex, has_vertex_normals, has_reflection_map, reflection_map_file, background_sharpness, has_refraction, environment_map_hdr, has_environment_map, bg_color, verbose) {
.Call(`_rayvertex_rasterize`, mesh, lightinfo, line_mat, nx, ny, model_color, lookfrom, lookat, fov, typevals, has_shadow_map, calc_ambient, tbn, ambient_radius, shadow_map_bias, numbercores, max_indices, has_normals_vec, has_tex_vec, has_texture, has_ambient_texture, has_normal_texture, has_specular_texture, has_emissive_texture, block_size, use_default_material, near_clip, far_clip, shadow_map_intensity, bounds, shadowdims, camera_up, alpha_line, line_offset, ortho_dims, is_dir_light, aa_lines, has_vertex_tex, has_vertex_normals, has_reflection_map, reflection_map_file, background_sharpness, has_refraction, environment_map_hdr, has_environment_map, bg_color, verbose)
rasterize <- function(mesh, lightinfo, line_mat, nx, ny, model_color, lookfrom, lookat, fov, typevals, has_shadow_map, calc_ambient, tbn, ambient_radius, shadow_map_bias, numbercores, max_indices, has_normals_vec, has_tex_vec, has_texture, has_ambient_texture, has_bump_texture, has_normal_texture, has_specular_texture, has_emissive_texture, block_size, use_default_material, near_clip, far_clip, shadow_map_intensity, bounds, shadowdims, camera_up, alpha_line, line_offset, ortho_dims, is_dir_light, aa_lines, has_vertex_tex, has_vertex_normals, has_reflection_map, reflection_map_file, background_sharpness, has_refraction, environment_map_hdr, has_environment_map, bg_color, verbose) {
.Call(`_rayvertex_rasterize`, mesh, lightinfo, line_mat, nx, ny, model_color, lookfrom, lookat, fov, typevals, has_shadow_map, calc_ambient, tbn, ambient_radius, shadow_map_bias, numbercores, max_indices, has_normals_vec, has_tex_vec, has_texture, has_ambient_texture, has_bump_texture, has_normal_texture, has_specular_texture, has_emissive_texture, block_size, use_default_material, near_clip, far_clip, shadow_map_intensity, bounds, shadowdims, camera_up, alpha_line, line_offset, ortho_dims, is_dir_light, aa_lines, has_vertex_tex, has_vertex_normals, has_reflection_map, reflection_map_file, background_sharpness, has_refraction, environment_map_hdr, has_environment_map, bg_color, verbose)
}

smooth_normals_mesh_rcpp <- function(mesh_input, override_existing = FALSE) {
.Call(`_rayvertex_smooth_normals_mesh_rcpp`, mesh_input, override_existing)
}

tonemap_image <- function(routput, goutput, boutput, toneval) {
Expand Down

0 comments on commit 8926d09

Please sign in to comment.