GitHub-Proxy/tinygltf
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/syoyo/tinygltf.git synced 2025-08-15 02:05:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix build when using RapidJSON backend.

Browse Source
This commit is contained in:
Syoyo Fujita 2020-10-22 22:38:56 +09:00
parent 68adc4ba5e
commit 1923067982
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tests/tester.cc
View File

@ -3,6 +3,9 @@
#define STB_IMAGE_WRITE_IMPLEMENTATION
#include "tiny_gltf.h"
// Nlohmann json(include ../json.hpp)
#include "json.hpp"
#define CATCH_CONFIG_MAIN // This tells Catch to provide a main() - only do this in one cpp file
#include "catch.hpp"
@ -425,8 +428,8 @@ TEST_CASE("serialize-empty-material", "[issue-294]") {
tinygltf::TinyGLTF ctx;
ctx.WriteGltfSceneToStream(&m, os, false, false);
// use nlohmann json(included inside of tiny_gltf.h)
json j = json::parse(os.str());
// use nlohmann json
nlohmann::json j = nlohmann::json::parse(os.str());
REQUIRE(1 == j["materials"].size());
REQUIRE(j["asset"].is_null());