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

Sync with tinygltfloader

Browse Source
This commit is contained in:
Syoyo Fujita 2017-05-25 01:42:38 +09:00
parent 36289fb59f
commit c8d3c76bb1
1 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
tiny_gltf_loader.h
View File

@ -148,6 +148,13 @@ typedef enum {
OBJECT_TYPE = 7 OBJECT_TYPE = 7
} Type; } Type;
#ifdef __clang__
#pragma clang diagnostic push
// Suppress warning for : static Value null_value
// https://stackoverflow.com/questions/15708411/how-to-deal-with-global-constructor-warning-in-clang
#pragma clang diagnostic ignored "-Wexit-time-destructors"
#endif
// Simple class to represent JSON object // Simple class to represent JSON object
class Value { class Value {
public: public:
@ -197,7 +204,7 @@ class Value {
// Lookup value from an array // Lookup value from an array
const Value &Get(int idx) const { const Value &Get(int idx) const {
static Value &null_value = *(new Value()); static Value null_value;
assert(IsArray()); assert(IsArray());
assert(idx >= 0); assert(idx >= 0);
return (static_cast<size_t>(idx) < array_value_.size()) return (static_cast<size_t>(idx) < array_value_.size())
@ -207,7 +214,7 @@ class Value {
// Lookup value from a key-value pair // Lookup value from a key-value pair
const Value &Get(const std::string &key) const { const Value &Get(const std::string &key) const {
static Value &null_value = *(new Value()); static Value null_value;
assert(IsObject()); assert(IsObject());
Object::const_iterator it = object_value_.find(key); Object::const_iterator it = object_value_.find(key);
return (it != object_value_.end()) ? it->second : null_value; return (it != object_value_.end()) ? it->second : null_value;
@ -253,6 +260,10 @@ class Value {
int pad0; int pad0;
}; };
#ifdef __clang__
#pragma clang diagnostic pop
#endif
#define TINYGLTF_VALUE_GET(ctype, var) \ #define TINYGLTF_VALUE_GET(ctype, var) \
template <> \ template <> \
inline const ctype &Value::Get<ctype>() const { \ inline const ctype &Value::Get<ctype>() const { \
@ -566,6 +577,8 @@ class TinyGLTFLoader {
} // namespace tinygltf } // namespace tinygltf
#endif // TINY_GLTF_LOADER_H_
#ifdef TINYGLTF_LOADER_IMPLEMENTATION #ifdef TINYGLTF_LOADER_IMPLEMENTATION
#include <algorithm> #include <algorithm>
//#include <cassert> //#include <cassert>
@ -584,6 +597,15 @@ class TinyGLTFLoader {
#pragma clang diagnostic ignored "-Wreserved-id-macro" #pragma clang diagnostic ignored "-Wreserved-id-macro"
#pragma clang diagnostic ignored "-Wdisabled-macro-expansion" #pragma clang diagnostic ignored "-Wdisabled-macro-expansion"
#pragma clang diagnostic ignored "-Wpadded" #pragma clang diagnostic ignored "-Wpadded"
#ifdef __APPLE__
#if __clang_major__ >= 8 && __clang_minor__ >= 1
#pragma clang diagnostic ignored "-Wcomma"
#endif
#else // __APPLE__
#if (__clang_major__ >= 4) || (__clang_major__ >= 3 && __clang_minor__ > 8)
#pragma clang diagnostic ignored "-Wcomma"
#endif
#endif // __APPLE__
#endif #endif
#define PICOJSON_USE_INT64 #define PICOJSON_USE_INT64
@ -2653,5 +2675,3 @@ bool TinyGLTFLoader::LoadBinaryFromFile(Scene *scene, std::string *err,
} // namespace tinygltf } // namespace tinygltf
#endif // TINYGLTF_LOADER_IMPLEMENTATION #endif // TINYGLTF_LOADER_IMPLEMENTATION
#endif // TINY_GLTF_LOADER_H_