Now make it even more elegant

This commit is contained in:
jordan4ibanez 2023-11-28 05:38:24 -05:00
parent afad32e8ff
commit 7ce8858957
2 changed files with 15 additions and 10 deletions

View File

@ -207,9 +207,9 @@ CSkinnedMesh* CB3DJSONMeshFileLoader::cleanUp(std::string failure) {
} }
/** /**
* Returns success. * Returns (success, failure reason).
*/ */
bool CB3DJSONMeshFileLoader::parseJSONFile(io::IReadFile* file) { std::tuple<bool, std::string> CB3DJSONMeshFileLoader::parseJSONFile(io::IReadFile* file) {
// So here we turn this mangled disaster into a C string. // So here we turn this mangled disaster into a C string.
// Please consider this the equivalent of duct taping a chainsaw onto a car to cut your lawn. // Please consider this the equivalent of duct taping a chainsaw onto a car to cut your lawn.
auto buffer = std::make_unique<char[]>(file->getSize()); auto buffer = std::make_unique<char[]>(file->getSize());
@ -227,15 +227,15 @@ bool CB3DJSONMeshFileLoader::parseJSONFile(io::IReadFile* file) {
try { try {
JSONDataContainer = json::parse(output); JSONDataContainer = json::parse(output);
} catch (const json::parse_error& e) { } catch (const json::parse_error& e) {
std::cout << "message: " << e.what() << '\n' std::string failureReason = "message: " + std::string(e.what()) + '\n' +
<< "exception id: " << e.id << '\n' "exception id: " + std::to_string(e.id) + '\n' +
<< "byte position of error: " << e.byte << std::endl; "byte position of error: " + std::to_string(e.byte) + '\n';
os::Printer::log("JSON: Failed to parse!", ELL_WARNING); os::Printer::log("JSON: Failed to parse!", ELL_WARNING);
return false; return {false, failureReason};
} }
// I'm not sure if buffer and output gets dropped here. // I'm not sure if buffer and output gets dropped here.
return true; return {true, nullptr};
} }
IAnimatedMesh* CB3DJSONMeshFileLoader::createMesh(io::IReadFile* file) { IAnimatedMesh* CB3DJSONMeshFileLoader::createMesh(io::IReadFile* file) {
@ -246,8 +246,12 @@ IAnimatedMesh* CB3DJSONMeshFileLoader::createMesh(io::IReadFile* file) {
} }
// Try to read this file. // Try to read this file.
if (!this->parseJSONFile(file)) { const std::tuple<bool, std::string> parseResult = this->parseJSONFile(file);
return(this->cleanUp("B3D JSON severe error! File size is 0!"));
// If it failed to parse, we give up.
if (!std::get<0>(parseResult)) {
// Print the reason, and return a nullptr.
return(this->cleanUp(std::get<1>(parseResult)));
} }
//? Now JSONDataContainer exists on this object. //? Now JSONDataContainer exists on this object.

View File

@ -6,6 +6,7 @@
#include "IReadFile.h" #include "IReadFile.h"
#include "path.h" #include "path.h"
#include "json/json.hpp" #include "json/json.hpp"
#include <tuple>
using json = nlohmann::json; using json = nlohmann::json;
@ -31,7 +32,7 @@ private:
// Methods. // Methods.
CSkinnedMesh* cleanUp(std::string); CSkinnedMesh* cleanUp(std::string);
bool parseJSONFile(io::IReadFile* file); std::tuple<bool, std::string> parseJSONFile(io::IReadFile* file);
std::tuple<bool, std::string> load(); std::tuple<bool, std::string> load();
public: public: