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

Split JSON implementation into its own library #1126

Merged
merged 3 commits into from
Dec 29, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -154,5 +154,6 @@
"modernize-*",
"-modernize-use-nodiscard",
"-modernize-use-trailing-return-type"
]
],
"python.pythonPath": "/usr/local/bin/python3"
}
4 changes: 3 additions & 1 deletion docs/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,9 @@ See each header file for documentation.
scattering, multiple importance sampling
- [Yocto/ModelIO](yocto/yocto_modelio.md): parsing and writing for Ply/Obj/Pbrt
formats
- [Yocto/CommonIO](yocto/yocto_commonio.md): printing utilities, file io utilities,
- [Yocto/CommonIO](yocto/yocto_commonio.md): JSON data type, json io utilities,
command line parsing
- [Yocto/JSON](yocto/yocto_json.md): printing utilities, file io utilities,
command line parsing
- [Yocto/Common](yocto/yocto_common.md): container and iterator utilities
- [Yocto/Parallel](yocto/yocto_parallel.md): concurrency utilities
Expand Down
12 changes: 12 additions & 0 deletions docs/yocto/yocto_json.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# Yocto/JSON: Utilities for manipulating JSON data

Yocto/JSON is an implementation of a utilities for hanlding JSON data,
including a Json variant data type, loading, saving and formatting JSON,
and a parser for command line arguments to JSON.
Compared to other libraries, it is more lightweight and provides a common
implementation for the rest of Yocto/GL.
Yocto/JSON is implemented in `yocto_json.h` and `yocto_json.cpp`, and
depends on `json.hpp`.

**This library is experimental** and will be documented appropriately when
the code reaches stability.
1 change: 1 addition & 0 deletions libs/yocto/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ add_library(yocto
yocto_trace.h yocto_trace.cpp
yocto_sceneio.h yocto_sceneio.cpp
yocto_commonio.h yocto_commonio.cpp
yocto_json.h yocto_json.cpp
ext/stb_image.h ext/stb_image_resize.h ext/stb_image_write.h ext/stb_image.cpp
ext/cgltf.h ext/cgltf_write.h ext/cgltf.cpp
ext/json.hpp
Expand Down
Loading