GitHub-Proxy/tinygltf
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/syoyo/tinygltf.git synced 2025-08-17 13:55:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1 from syoyo/master

Browse Source 
update to latest
This commit is contained in:
Chris Gill 2018-12-05 13:03:44 -05:00 committed by GitHub
commit 93db9e20c0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tiny_gltf.h
View File

@ -455,7 +455,8 @@ struct Sampler {
Sampler() Sampler()
: wrapS(TINYGLTF_TEXTURE_WRAP_REPEAT), : wrapS(TINYGLTF_TEXTURE_WRAP_REPEAT),
wrapT(TINYGLTF_TEXTURE_WRAP_REPEAT) {} wrapT(TINYGLTF_TEXTURE_WRAP_REPEAT),
wrapR(TINYGLTF_TEXTURE_WRAP_REPEAT){}
bool operator==(const Sampler &) const; bool operator==(const Sampler &) const;
}; };
@ -1129,8 +1130,6 @@ static bool Equals(const tinygltf::Value &one, const tinygltf::Value &other) {
return false; return false;
} }
} }
return false;
} }
// Equals function for std::vector<double> using TINYGLTF_DOUBLE_EPSILON // Equals function for std::vector<double> using TINYGLTF_DOUBLE_EPSILON
@ -2211,7 +2210,7 @@ static bool ParseStringProperty(
} }
if (ret) { if (ret) {
(*ret) = it.value(); (*ret) = it.value().get<std::string>();
} }
return true; return true;
@ -4817,7 +4816,7 @@ bool TinyGLTF::WriteGltfSceneToFile(Model *model, const std::string &filename,
if (writeBinary) { if (writeBinary) {
WriteBinaryGltfFile(filename, output.dump()); WriteBinaryGltfFile(filename, output.dump());
} else { } else {
WriteGltfFile(filename, output.dump(prettyPrint ? 2 : 0)); WriteGltfFile(filename, output.dump(prettyPrint ? 2 : -1));
} }
return true; return true;