Change: Switch to simdjson's ondemand

spnda · Mar 17, 2023 · 182d902 · 182d902
1 parent d2bf171
commit 182d902
Show file tree

Hide file tree

Showing 7 changed files with 1,444 additions and 948 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -53,6 +53,9 @@ if (FASTGLTF_DOWNLOAD_SIMDJSON)
     target_include_directories(fastgltf_simdjson PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/deps/simdjson> $<INSTALL_INTERFACE:include>)
     compiler_flags(fastgltf_simdjson)
     enable_debug_inlining(fastgltf_simdjson)
+    if (SIMDJSON_VERBOSE_LOGGING)
+        target_compile_definitions(fastgltf_simdjson PUBLIC SIMDJSON_VERBOSE_LOGGING=1)
+    endif()
 
     install(
         FILES deps/simdjson/simdjson.h

diff --git a/examples/gl_viewer/gl_viewer.cpp b/examples/gl_viewer/gl_viewer.cpp
@@ -286,7 +286,8 @@ bool loadGltf(Viewer* viewer, std::string_view cPath) {
 
         constexpr auto gltfOptions = fastgltf::Options::DontRequireValidAssetMember | fastgltf::Options::AllowDouble | fastgltf::Options::LoadGLBBuffers | fastgltf::Options::LoadExternalBuffers;
         fastgltf::GltfDataBuffer data;
-        data.loadFromFile(path);
+        if (!data.loadFromFile(path))
+            return false;
 
         auto type = fastgltf::determineGltfFileType(&data);
         if (type == fastgltf::GltfType::glTF) {