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

Merge branch 'master' of github.com:syoyo/tinygltf

Browse Source
This commit is contained in:
Syoyo Fujita 2021-06-09 21:23:57 +09:00
commit 1588e75e26
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
tiny_gltf.h
View File

@ -191,14 +191,14 @@ AAssetManager *asset_manager = nullptr;
#endif #endif
typedef enum { typedef enum {
NULL_TYPE = 0, NULL_TYPE,
REAL_TYPE = 1, REAL_TYPE,
INT_TYPE = 2, INT_TYPE,
BOOL_TYPE = 3, BOOL_TYPE,
STRING_TYPE = 4, STRING_TYPE,
ARRAY_TYPE = 5, ARRAY_TYPE,
BINARY_TYPE = 6, BINARY_TYPE,
OBJECT_TYPE = 7 OBJECT_TYPE
} Type; } Type;
static inline int32_t GetComponentSizeInBytes(uint32_t componentType) { static inline int32_t GetComponentSizeInBytes(uint32_t componentType) {
@ -604,7 +604,7 @@ struct Sampler {
// `magFilter`. Set -1 in TinyGLTF(issue #186) // `magFilter`. Set -1 in TinyGLTF(issue #186)
int minFilter = int minFilter =
-1; // optional. -1 = no filter defined. ["NEAREST", "LINEAR", -1; // optional. -1 = no filter defined. ["NEAREST", "LINEAR",
// "NEAREST_MIPMAP_LINEAR", "LINEAR_MIPMAP_NEAREST", // "NEAREST_MIPMAP_NEAREST", "LINEAR_MIPMAP_NEAREST",
// "NEAREST_MIPMAP_LINEAR", "LINEAR_MIPMAP_LINEAR"] // "NEAREST_MIPMAP_LINEAR", "LINEAR_MIPMAP_LINEAR"]
int magFilter = int magFilter =
-1; // optional. -1 = no filter defined. ["NEAREST", "LINEAR"] -1; // optional. -1 = no filter defined. ["NEAREST", "LINEAR"]
@ -5832,13 +5832,13 @@ bool TinyGLTF::LoadFromString(Model *model, std::string *err, std::string *warn,
{ {
json_const_iterator it; json_const_iterator it;
if (FindMember(o, "extensions", it)) { if (FindMember(o, "extensions", it)) {
model->extensions_json_string = JsonToString(GetValue(it)); scene.extensions_json_string = JsonToString(GetValue(it));
} }
} }
{ {
json_const_iterator it; json_const_iterator it;
if (FindMember(o, "extras", it)) { if (FindMember(o, "extras", it)) {
model->extras_json_string = JsonToString(GetValue(it)); scene.extras_json_string = JsonToString(GetValue(it));
} }
} }
} }