minetest/irrlicht
1
0
Fork 0
mirror of https://github.com/minetest/irrlicht.git synced 2025-02-22 22:00:26 +01:00
Code Issues Projects Releases Wiki Activity

Just slam a home run with this tooling

Browse Source
This commit is contained in:
jordan4ibanez 2023-11-26 09:58:03 -05:00
parent ad5e8998dd
commit e5d27d10ce
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
source/Irrlicht/CB3DJSONMeshFileLoader.cpp
View File

@ -48,18 +48,22 @@ bool CB3DJSONMeshFileLoader::isALoadableFileExtension(
return core::hasFileExtension(fileName, "json"); return core::hasFileExtension(fileName, "json");
} }
const char* buildVec3fError(std::string key) {
return std::string("Error, ").append(key).append(" in NODE must be an array of 3 numbers!").c_str();
}
/** /**
* Returns true if failure occurs. * Returns true if failure occurs.
*/ */
bool grabVec3f(json data, std::string key, irr::core::vector3df& refVec) { bool grabVec3f(json data, std::string key, irr::core::vector3df& refVec) {
if (data.contains(key) && data[key].is_array() && data[key].size() == 3) { if (data.contains(key) && data[key].is_array() && data[key].size() == 3) {
auto jsonVec3 = data[key]; auto jsonVec3 = data[key];
int i = 0; int i = 0;
for (auto reference = jsonVec3.begin(); reference != jsonVec3.end(); ++reference) { for (auto reference = jsonVec3.begin(); reference != jsonVec3.end(); ++reference) {
auto value = *reference; auto value = *reference;
if (!value.is_number_integer()) { // Can take integer OR float.
os::Printer::log("Error, position in NODE must be an array of 3 integers!", ELL_WARNING); if (!value.is_number()) {
os::Printer::log(buildVec3fError(key), ELL_WARNING);
return true; return true;
} }
switch (i){ switch (i){
@ -76,11 +80,9 @@ bool grabVec3f(json data, std::string key, irr::core::vector3df& refVec) {
i++; i++;
} }
} else { } else {
const auto stringWarning = std::string("Error, ").append(key).append(" in NODE must be an array of 3 integers!"); os::Printer::log(buildVec3fError(key), ELL_WARNING);
os::Printer::log(stringWarning.c_str(), ELL_WARNING);
return true; return true;
} }
return false; return false;
} }