From d2a20ee5cbec2ccf8d7f5751c9993fe3ed563706 Mon Sep 17 00:00:00 2001 From: Par Winzell Date: Mon, 6 Nov 2017 12:20:15 -0800 Subject: [PATCH] Fixes for Linux/GCC. Between Linux, Darwin and Windows keeping me honest, I am slowly learning C++. --- src/Raw2Gltf.cpp | 2 +- src/glTF/PrimitiveData.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Raw2Gltf.cpp b/src/Raw2Gltf.cpp index 3aafe3c..2c06466 100644 --- a/src/Raw2Gltf.cpp +++ b/src/Raw2Gltf.cpp @@ -537,7 +537,7 @@ ModelData *Raw2Gltf( int triangleCount = surfaceModel.GetTriangleCount(); // initialize Draco mesh with vertex index information - auto dracoMesh { std::make_shared() }; + auto dracoMesh(std::make_shared()); dracoMesh->SetNumFaces(static_cast(triangleCount)); for (uint32_t ii = 0; ii < triangleCount; ii++) { diff --git a/src/glTF/PrimitiveData.cpp b/src/glTF/PrimitiveData.cpp index ab39eab..54c504a 100644 --- a/src/glTF/PrimitiveData.cpp +++ b/src/glTF/PrimitiveData.cpp @@ -41,11 +41,11 @@ void PrimitiveData::NoteDracoBuffer(const BufferViewData &data) void PrimitiveData::AddTarget(const AccessorData *positions, const AccessorData *normals, const AccessorData *tangents) { - targetAccessors.push_back({ + targetAccessors.push_back(std::make_tuple( positions->ix, normals ? normals->ix : -1, tangents ? tangents ->ix : -1 - }); + )); } void to_json(json &j, const PrimitiveData &d) {