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

Merge branch 'pr/1'

Browse Source
This commit is contained in:
jrkoonce 2019-09-03 10:30:19 -05:00
commit a3b8b355ae
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tiny_gltf.h
View File

@ -199,7 +199,7 @@ static inline int32_t GetComponentSizeInBytes(uint32_t componentType) {
} }
} }
static inline int32_t GetTypeSizeInBytes(uint32_t ty) { static inline int32_t GetNumComponentsInType(uint32_t ty) {
if (ty == TINYGLTF_TYPE_SCALAR) { if (ty == TINYGLTF_TYPE_SCALAR) {
return 1; return 1;
} else if (ty == TINYGLTF_TYPE_VEC2) { } else if (ty == TINYGLTF_TYPE_VEC2) {
@ -861,12 +861,12 @@ struct Accessor {
return -1; return -1;
} }
int typeSizeInBytes = GetTypeSizeInBytes(static_cast<uint32_t>(type)); int numComponents = GetNumComponentsInType(static_cast<uint32_t>(type));
if (typeSizeInBytes <= 0) { if (numComponents <= 0) {
return -1; return -1;
} }
return componentSizeInBytes * typeSizeInBytes; return componentSizeInBytes * numComponents;
} else { } else {
// Check if byteStride is a mulple of the size of the accessor's component // Check if byteStride is a mulple of the size of the accessor's component
// type. // type.
@ -5154,9 +5154,7 @@ bool TinyGLTF::LoadFromString(Model *model, std::string *err, std::string *warn,
return false; return false;
} }
std::vector<int> nodes; std::vector<int> nodes;
if (!ParseIntegerArrayProperty(&nodes, err, o, "nodes", false)) { ParseIntegerArrayProperty(&nodes, err, o, "nodes", false);
return false;
}
Scene scene; Scene scene;
scene.nodes = std::move(nodes); scene.nodes = std::move(nodes);