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

Merge pull request #424 from agnat/rewrite_ForEachInArray

Browse Source 
get rid of std::function
This commit is contained in:
Syoyo Fujita 2023-06-06 23:11:12 +09:00 committed by GitHub
commit 9417144f48
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
tiny_gltf.h
View File

@ -5775,6 +5775,24 @@ static bool ParseLight(Light *light, std::string *err, const detail::json &o,
return true; return true;
} }
namespace detail {
template <typename Callback>
bool ForEachInArray(const detail::json &_v, const char *member, Callback && cb) {
detail::json_const_iterator itm;
if (detail::FindMember(_v, member, itm) && detail::IsArray(detail::GetValue(itm))) {
const detail::json &root = detail::GetValue(itm);
auto it = detail::ArrayBegin(root);
auto end = detail::ArrayEnd(root);
for (; it != end; ++it) {
if (!cb(*it)) return false;
}
}
return true;
};
} // end of namespace detail
bool TinyGLTF::LoadFromString(Model *model, std::string *err, std::string *warn, bool TinyGLTF::LoadFromString(Model *model, std::string *err, std::string *warn,
const char *json_str, const char *json_str,
unsigned int json_str_length, unsigned int json_str_length,
@ -5924,28 +5942,7 @@ bool TinyGLTF::LoadFromString(Model *model, std::string *err, std::string *warn,
} }
} }
#ifdef TINYGLTF_USE_CPP14 using detail::ForEachInArray;
auto ForEachInArray = [](const detail::json &_v, const char *member,
const auto &cb) -> bool
#else
// The std::function<> implementation can be less efficient because it will
// allocate heap when the size of the captured lambda is above 16 bytes with
// clang and gcc, but it does not require C++14.
auto ForEachInArray = [](const detail::json &_v, const char *member,
const std::function<bool(const detail::json &)> &cb) -> bool
#endif
{
detail::json_const_iterator itm;
if (detail::FindMember(_v, member, itm) && detail::IsArray(detail::GetValue(itm))) {
const detail::json &root = detail::GetValue(itm);
auto it = detail::ArrayBegin(root);
auto end = detail::ArrayEnd(root);
for (; it != end; ++it) {
if (!cb(*it)) return false;
}
}
return true;
};
// 2. Parse extensionUsed // 2. Parse extensionUsed
{ {