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

Fix build on Visual Studio.

Browse Source
This commit is contained in:
Syoyo Fujita 2017-06-20 03:02:57 +09:00
parent 9a1ea7e300
commit 73cd7b9c1d
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
appveyor.yml
View File

@ -9,4 +9,4 @@ configuration: Release
build: build:
parallel: true parallel: true
project: TinyGLTFSolution.sln project: TinyGLTF.sln

12
tiny_gltf_loader.h
View File

@ -2064,7 +2064,10 @@ static bool ParseSkin(Skin *skin, std::string *err, const picojson::object &o) {
ParseNumberProperty(&skeleton, err, o, "skeleton", false, "Skin"); ParseNumberProperty(&skeleton, err, o, "skeleton", false, "Skin");
skin->skeleton = static_cast<int>(skeleton); skin->skeleton = static_cast<int>(skeleton);
skin->joints = std::vector<int>(joints.begin(), joints.end()); skin->joints.resize(joints.size());
for (size_t i = 0; i < joints.size(); i++) {
skin->joints[i] = static_cast<int>(joints[i]);
}
double invBind = -1.0; double invBind = -1.0;
ParseNumberProperty(&invBind, err, o, "inverseBindMatrices", true, "Skin"); ParseNumberProperty(&invBind, err, o, "inverseBindMatrices", true, "Skin");
@ -2270,7 +2273,10 @@ bool TinyGLTFLoader::LoadFromString(Model *model, std::string *err,
Scene scene; Scene scene;
ParseStringProperty(&scene.name, err, o, "name", false); ParseStringProperty(&scene.name, err, o, "name", false);
std::vector<int> nodesIds(nodes.begin(), nodes.end()); std::vector<int> nodesIds;
for (size_t i = 0; i < nodes.size(); i++) {
nodesIds.push_back(static_cast<int>(nodes[i]));
}
scene.nodes = nodesIds; scene.nodes = nodesIds;
model->scenes.push_back(scene); model->scenes.push_back(scene);
@ -2632,7 +2638,7 @@ static void SerializeValue(const std::string &key, const Value &value, picojson:
static void SerializeGltfBufferData(const std::vector<unsigned char> &data, const std::string &binFilePath) static void SerializeGltfBufferData(const std::vector<unsigned char> &data, const std::string &binFilePath)
{ {
std::ofstream output(binFilePath.c_str(), std::ofstream::binary); std::ofstream output(binFilePath.c_str(), std::ofstream::binary);
output.write(reinterpret_cast<const char*>(&data[0]), ssize_t(data.size())); output.write(reinterpret_cast<const char*>(&data[0]), std::streamsize(data.size()));
output.close(); output.close();
} }