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

Now make it extra nice

Browse Source
This commit is contained in:
jordan4ibanez 2023-11-28 06:53:23 -05:00
parent 52a284c650
commit 075e0c56ae
1 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
source/Irrlicht/CB3DJSONMeshFileLoader.cpp
View File

@ -107,7 +107,7 @@ std::tuple<bool, std::string> grabVec2f(json data, std::string key, irr::core::v
} else { } else {
return {false, buildVectorError(key, -1, 2)}; return {false, buildVectorError(key, -1, 2)};
} }
return {true, nullptr}; return {true, ""};
} }
/** /**
@ -142,7 +142,7 @@ std::tuple<bool, std::string> grabVec3f(json data, std::string key, irr::core::v
} else { } else {
return {false, buildVectorError(key, -1, 3)}; return {false, buildVectorError(key, -1, 3)};
} }
return {true, nullptr}; return {true, ""};
} }
/** /**
@ -177,7 +177,7 @@ std::tuple<bool, std::string> grabQuaternionf(json data, std::string key, irr::c
} else { } else {
return {false, buildVectorError(key, -1, 4)}; return {false, buildVectorError(key, -1, 4)};
} }
return {true, nullptr}; return {true, ""};
} }
@ -203,7 +203,7 @@ std::tuple<bool, std::string> parseNode(json data, SMeshBuffer* meshBuffer) {
return {false, std::get<1>(rotationResult)}; return {false, std::get<1>(rotationResult)};
} }
return {true, nullptr}; return {true, ""};
} }
/** /**
@ -219,7 +219,7 @@ std::tuple<bool, std::string> CB3DJSONMeshFileLoader::readChunkTEXS() {
texs = JSONDataContainer["TEXS"]; texs = JSONDataContainer["TEXS"];
} { } {
// Since it's optional, it succeeds if it's not there. // Since it's optional, it succeeds if it's not there.
return {true, nullptr}; return {true, ""};
} }
if (texs.contains("textures") && texs["textures"].is_array()) { if (texs.contains("textures") && texs["textures"].is_array()) {
@ -238,10 +238,15 @@ std::tuple<bool, std::string> CB3DJSONMeshFileLoader::readChunkTEXS() {
// This part should probably be it's own function. // This part should probably be it's own function.
//todo: look into making this it's own function. //todo: look into making this it's own function.
if (t.contains("name") && t["name"].is_string()) {
auto thing = t["name"];
}
if (t.contains("pos") && t["pos"].is_array()) { if (t.contains("pos") && t["pos"].is_array()) {
irr::core::vector2df pos {0,0}; irr::core::vector2df pos {0,0};
auto posSuccess = grabVec2f(t, "pos", pos); auto posSuccess = grabVec2f(t, "pos", pos);
if (!std::get<0>(posSuccess)) { if (!std::get<0>(posSuccess)) {
@ -261,7 +266,7 @@ std::tuple<bool, std::string> CB3DJSONMeshFileLoader::readChunkTEXS() {
} }
// Everything succeeds, yay! // Everything succeeds, yay!
return {true, nullptr}; return {true, ""};
} }
@ -284,7 +289,7 @@ std::tuple<bool, std::string> CB3DJSONMeshFileLoader::load() {
// return animatedMesh; // return animatedMesh;
return {true, nullptr}; return {true, ""};
} }
/** /**
@ -292,8 +297,10 @@ std::tuple<bool, std::string> CB3DJSONMeshFileLoader::load() {
*/ */
CSkinnedMesh* CB3DJSONMeshFileLoader::cleanUp(std::string failure) { CSkinnedMesh* CB3DJSONMeshFileLoader::cleanUp(std::string failure) {
os::Printer::log(failure.c_str(), ELL_WARNING); os::Printer::log(failure.c_str(), ELL_WARNING);
AnimatedMesh->drop(); if (AnimatedMesh != nullptr) {
AnimatedMesh = 0; AnimatedMesh->drop();
AnimatedMesh = 0;
}
return AnimatedMesh; return AnimatedMesh;
} }
@ -327,7 +334,7 @@ std::tuple<bool, std::string> CB3DJSONMeshFileLoader::parseJSONFile(io::IReadFil
} }
// I'm not sure if buffer and output gets dropped here. // I'm not sure if buffer and output gets dropped here.
return {true, nullptr}; return {true, ""};
} }
IAnimatedMesh* CB3DJSONMeshFileLoader::createMesh(io::IReadFile* file) { IAnimatedMesh* CB3DJSONMeshFileLoader::createMesh(io::IReadFile* file) {