Compile with json11.cpp

This commit is contained in:
Syoyo Fujita 2019-02-15 16:09:42 +09:00
parent 4a35464d9b
commit 9e4a4d5b94
3 changed files with 4 additions and 3 deletions

View File

@ -45,6 +45,7 @@ include_directories(
add_executable(glview
glview.cc
../../json11.cpp
../common/trackball.cc
)

View File

@ -678,13 +678,13 @@ static void DrawNode(tinygltf::Model &model, const tinygltf::Node &node) {
// FIXME(syoyo): Refactor.
// DrawCurves(scene, it->second);
if (node.mesh > -1) {
assert(node.mesh < model.meshes.size());
assert(node.mesh < int(model.meshes.size()));
DrawMesh(model, model.meshes[node.mesh]);
}
// Draw child nodes.
for (size_t i = 0; i < node.children.size(); i++) {
assert(node.children[i] < model.nodes.size());
assert(node.children[i] < int(model.nodes.size()));
DrawNode(model, model.nodes[node.children[i]]);
}

View File

@ -8,7 +8,7 @@ solution "glview"
kind "ConsoleApp"
language "C++"
cppdialect "C++11"
files { "glview.cc", "../common/trackball.cc" }
files { "glview.cc", "../../json11.cpp", "../common/trackball.cc" }
includedirs { "./" }
includedirs { "../../" }
includedirs { "../common/" }