Fixes for Linux/GCC.

Par Winzell · Par Winzell · commit d2a20ee5cbec · 2017-11-06T12:20:15.000-08:00
Between Linux, Darwin and Windows keeping me honest, I am slowly learning C++.
diff --git 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<draco::Mesh>() };
+                auto dracoMesh(std::make_shared<draco::Mesh>());
                 dracoMesh->SetNumFaces(static_cast<size_t>(triangleCount));
 
                 for (uint32_t ii = 0; ii < triangleCount; ii++) {
diff --git 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) {

Original file line number	Diff line number	Diff line change
`@@ -41,11 +41,11 @@ void PrimitiveData::NoteDracoBuffer(const BufferViewData &data)`
`41`	`41`
`42`	`42`	`void PrimitiveData::AddTarget(const AccessorData positions, const AccessorData normals, const AccessorData *tangents)`
`43`	`43`	`{`
`44`		`- targetAccessors.push_back({`
	`44`	`+ targetAccessors.push_back(std::make_tuple(`
`45`	`45`	`positions->ix,`
`46`	`46`	`normals ? normals->ix : -1,`
`47`	`47`	`tangents ? tangents ->ix : -1`
`48`		`- });`
	`48`	`+ ));`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`void to_json(json &j, const PrimitiveData &d) {`