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

Great success!

Browse Source
This commit is contained in:
jordan4ibanez 2023-11-26 09:30:26 -05:00
parent 571619bf18
commit 4aca3ee1c5
1 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
source/Irrlicht/CB3DJSONMeshFileLoader.cpp
View File

@ -12,11 +12,10 @@
#include "path.h" #include "path.h"
#include <iostream> #include <iostream>
#include "os.h" #include "os.h"
#include "string.h" #include <string>
#include "json/json.hpp" #include "json/json.hpp"
#include <array> #include <array>
using json = nlohmann::json; using json = nlohmann::json;
using namespace nlohmann::literals;
namespace irr namespace irr
{ {
@ -122,6 +121,7 @@ IAnimatedMesh* parseModel(json data) {
IAnimatedMesh* CB3DJSONMeshFileLoader::createMesh(io::IReadFile* file) { IAnimatedMesh* CB3DJSONMeshFileLoader::createMesh(io::IReadFile* file) {
// Less than zero? What is this file a black hole? // Less than zero? What is this file a black hole?
if (file->getSize() <= 0) { if (file->getSize() <= 0) {
os::Printer::log("B3D JSON severe error! File size is 0!", ELL_WARNING); os::Printer::log("B3D JSON severe error! File size is 0!", ELL_WARNING);
@ -130,18 +130,28 @@ IAnimatedMesh* CB3DJSONMeshFileLoader::createMesh(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.
// char* buffer = new char[file->getSize()];
// auto buffer = std::make_unique<char[]>(file->getSize()); auto buffer = std::make_unique<char[]>(file->getSize());
char* buffer = new char[file->getSize()];
// Now we read that dang JSON. // Now we read that dang JSON.
file->read(buffer, file->getSize()); file->read(buffer.get(), file->getSize());
// We have to clone this or it segfaults. I have no idea why. char* output = buffer.get();
char* clone = strdup(buffer);
// Dereference then borrow it. // Irrlicht doesn't null terminate the raw output. So we must doe it ourself.
json data = json::parse(&*clone); buffer[file->getSize()] = '\0';
json data;
try {
data = json::parse(output);
} catch (const json::parse_error& e) {
std::cout << "message: " << e.what() << '\n'
<< "exception id: " << e.id << '\n'
<< "byte position of error: " << e.byte << std::endl;
os::Printer::log("JSON: Failed to parse!", ELL_WARNING);
return nullptr;
}
// Now check some real basic elements of the JSON file. // Now check some real basic elements of the JSON file.
if (!data.contains("format") || !data["format"].is_string() || data["format"] != "BB3DJSON") { if (!data.contains("format") || !data["format"].is_string() || data["format"] != "BB3DJSON") {