Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Simpler io #1246

Merged
merged 38 commits into from
Jun 17, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
e892f8b
updated
xelatihy Jun 15, 2021
3511de2
updated
xelatihy Jun 15, 2021
2489b58
updateed
xelatihy Jun 15, 2021
d8de2b1
updated
xelatihy Jun 15, 2021
0a19d02
updated
xelatihy Jun 15, 2021
237bb1d
updated
xelatihy Jun 15, 2021
ef05141
updated
xelatihy Jun 16, 2021
716acf6
Merge branch 'simpler-io' of github.com:xelatihy/yocto-gl into simple…
xelatihy Jun 16, 2021
717eb56
updated
xelatihy Jun 16, 2021
9752996
updated
xelatihy Jun 16, 2021
ead65f5
updated
xelatihy Jun 16, 2021
4866611
updated
xelatihy Jun 16, 2021
b856eda
updated
xelatihy Jun 16, 2021
8e10e2f
updated
xelatihy Jun 16, 2021
7c2df2a
updated
xelatihy Jun 16, 2021
6a98538
updated
xelatihy Jun 16, 2021
df0b24e
updated
xelatihy Jun 16, 2021
f3e1f70
updated
xelatihy Jun 16, 2021
087b1c5
updated
xelatihy Jun 16, 2021
9766f64
updated
xelatihy Jun 16, 2021
6cc36b1
updated
xelatihy Jun 16, 2021
742f320
updated
xelatihy Jun 16, 2021
7646c61
updated
xelatihy Jun 16, 2021
e7ca49b
updated
xelatihy Jun 17, 2021
f764f88
updated
xelatihy Jun 17, 2021
1f69a78
updated
xelatihy Jun 17, 2021
7e1b109
updated
xelatihy Jun 17, 2021
ba19b2e
updated
xelatihy Jun 17, 2021
292eab4
updated
xelatihy Jun 17, 2021
1ff44d9
updated
xelatihy Jun 17, 2021
4e48d76
updated
xelatihy Jun 17, 2021
4f4a720
updated
xelatihy Jun 17, 2021
b196675
updated
xelatihy Jun 17, 2021
781949e
updated
xelatihy Jun 17, 2021
5d6f2c9
updated
xelatihy Jun 17, 2021
d14dbfb
updated
xelatihy Jun 17, 2021
4b24589
updated
xelatihy Jun 17, 2021
4108c5b
updated
xelatihy Jun 17, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/yimage/yimage.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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[]) {
Expand Down
2 changes: 1 addition & 1 deletion apps/ymesh/ymesh.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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[]) {
Expand Down
2 changes: 1 addition & 1 deletion apps/yscene/yscene.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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[]) {
Expand Down
2 changes: 1 addition & 1 deletion apps/yshape/yshape.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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[]) {
Expand Down
3 changes: 1 addition & 2 deletions docs/yocto/yocto_scene.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions libs/yocto/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading