Simpler io (#1246)

xelatihy · Jun 17, 2021 · d15e16c · d15e16c
1 parent a6f3e28
commit d15e16c
Show file tree

Hide file tree

Showing 18 changed files with 4,883 additions and 5,201 deletions.
diff --git a/apps/yimage/yimage.cpp b/apps/yimage/yimage.cpp
@@ -323,7 +323,7 @@ cli_state make_commands(
 // Parse cli
 void parse_cli(app_params& params, int argc, const char** argv) {
   auto cli = make_commands("yimage", params, "Process and view images.");
-  parse_cli(cli, argc, argv);
+  parse_cli_and_handle_errors(cli, argc, argv);
 }
 
 int main(int argc, const char* argv[]) {

diff --git a/apps/ymesh/ymesh.cpp b/apps/ymesh/ymesh.cpp
@@ -1337,7 +1337,7 @@ cli_state make_commands(
 // Parse cli
 void parse_cli(app_params& params, int argc, const char** argv) {
   auto cli = make_commands("ymesh", params, "Process and view meshes.");
-  parse_cli(cli, argc, argv);
+  parse_cli_and_handle_errors(cli, argc, argv);
 }
 
 int main(int argc, const char* argv[]) {

diff --git a/apps/yscene/yscene.cpp b/apps/yscene/yscene.cpp
@@ -426,7 +426,7 @@ cli_state make_commands(
 // Parse cli
 void parse_cli(app_params& params, int argc, const char** argv) {
   auto cli = make_commands("yscene", params, "Process and view scenes.");
-  parse_cli(cli, argc, argv);
+  parse_cli_and_handle_errors(cli, argc, argv);
 }
 
 int main(int argc, const char* argv[]) {

diff --git a/apps/yshape/yshape.cpp b/apps/yshape/yshape.cpp
@@ -556,7 +556,7 @@ cli_state make_commands(
 // Parse cli
 void parse_cli(app_params& params, int argc, const char** argv) {
   auto cli = make_commands("yshape", params, "Process and view shapes.");
-  parse_cli(cli, argc, argv);
+  parse_cli_and_handle_errors(cli, argc, argv);
 }
 
 int main(int argc, const char* argv[]) {

diff --git a/docs/yocto/yocto_scene.md b/docs/yocto/yocto_scene.md
@@ -406,8 +406,7 @@ Yocto/Scene has a function to create a simple Cornell Box scene for testing.
 There are plans to increase support for more test scenes in the future.
 
 ```cpp
-auto scene = new sceneio_scene{...};         // create a complete scene
-make_cornellbox(scene);                      // make cornell box
+auto scene = make_cornellbox();             // make cornell box
 ```
 
 ## Procedural shapes

diff --git a/libs/yocto/CMakeLists.txt b/libs/yocto/CMakeLists.txt
@@ -8,8 +8,10 @@ add_library(yocto
   yocto_image.h yocto_image.cpp
   yocto_scene.h yocto_scene.cpp
   yocto_trace.h yocto_trace.cpp
+  yocto_commonio.h yocto_commonio.cpp
   yocto_sceneio.h yocto_sceneio.cpp
   yocto_cli.h yocto_cli.cpp
+  yocto_parallel.h
   ext/stb_image.h ext/stb_image_resize.h ext/stb_image_write.h ext/stb_image.cpp
   ext/json.hpp
   ext/tinyexr.h ext/tinyexr.cpp