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

Merge pull request #450 from nyalldawson/fix_win

Browse Source 
Fix msvc build -- STRICT is a msvc macro name
This commit is contained in:
Syoyo Fujita 2023-09-07 05:59:12 +09:00 committed by GitHub
commit fe6a18269f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tiny_gltf.h
View File

@ -196,8 +196,8 @@ typedef enum {
} Type; } Type;
typedef enum { typedef enum {
PERMISSIVE, Permissive,
STRICT Strict
} ParseStrictness; } ParseStrictness;
static inline int32_t GetComponentSizeInBytes(uint32_t componentType) { static inline int32_t GetComponentSizeInBytes(uint32_t componentType) {
@ -1562,7 +1562,7 @@ class TinyGLTF {
size_t bin_size_ = 0; size_t bin_size_ = 0;
bool is_binary_ = false; bool is_binary_ = false;
ParseStrictness strictness_ = ParseStrictness::STRICT; ParseStrictness strictness_ = ParseStrictness::Strict;
bool serialize_default_values_ = false; ///< Serialize default values? bool serialize_default_values_ = false; ///< Serialize default values?
@ -5059,6 +5059,7 @@ static bool ParsePrimitive(Primitive *primitive, Model *model,
#else #else
(void)model; (void)model;
(void)warn; (void)warn;
(void)strictness;
#endif #endif
return true; return true;
@ -5253,7 +5254,7 @@ static bool ParseMaterial(Material *material, std::string *err, std::string *war
if (ParseNumberArrayProperty(&material->emissiveFactor, err, o, if (ParseNumberArrayProperty(&material->emissiveFactor, err, o,
"emissiveFactor", "emissiveFactor",
/* required */ false)) { /* required */ false)) {
if (strictness==ParseStrictness::PERMISSIVE && material->emissiveFactor.size() == 4) { if (strictness==ParseStrictness::Permissive && material->emissiveFactor.size() == 4) {
if (warn) { if (warn) {
(*warn) += (*warn) +=
"Array length of `emissiveFactor` parameter in " "Array length of `emissiveFactor` parameter in "