minetest
/
irrlicht
mirror of https://github.com/minetest/irrlicht.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Successfully convert Win32 to Posix

This commit is contained in:
jordan4ibanez 2023-11-28 07:25:48 -05:00
parent 9a5e6dd436
commit 7cddd10a54
1 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
source/Irrlicht/CB3DJSONMeshFileLoader.cpp
View File

@ -222,8 +222,10 @@ std::tuple<bool, std::string> CB3DJSONMeshFileLoader::readChunkTEXS() {
if (JSONDataContainer.contains("TEXS") && JSONDataContainer["TEXS"].is_array()) { if (JSONDataContainer.contains("TEXS") && JSONDataContainer["TEXS"].is_array()) {
// We're referencing static memory. // We're referencing static memory.
texs = JSONDataContainer["TEXS"]; texs = JSONDataContainer["TEXS"];
} { println("hello");
} else {
// Since it's optional, it succeeds if it's not there. // Since it's optional, it succeeds if it's not there.
println("goodbye");
return {true, ""}; return {true, ""};
} }
@ -249,22 +251,27 @@ std::tuple<bool, std::string> CB3DJSONMeshFileLoader::readChunkTEXS() {
if (t.contains("name") && t["name"].is_string()) { if (t.contains("name") && t["name"].is_string()) {
// Strings are implicitly converted. // Strings are implicitly converted.
std::string thing = t["name"]; std::string textureName = t["name"];
println(thing.c_str()); B3DTexture.TextureName = textureName.c_str();
// Convert Windows '\' to Posix '/'.
B3DTexture.TextureName.replace('\\','/');
println(B3DTexture.TextureName.c_str());
} }
// This part is a bit complex, for ease of use for the plugin dev/modders advantage. // This part is a bit complex, for ease of use for the plugin dev/modders advantage.
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)) {
return {false, "TEXS: " + std::get<1>(posSuccess)}; // return {false, "TEXS: " + std::get<1>(posSuccess)};
} // }
} else { // } else {
return {false, "Malformed \"pos\" in TEXS block. Must be an array with 2 numbers."}; // return {false, "Malformed \"pos\" in TEXS block. Must be an array with 2 numbers."};
} // }
index++; index++;
} }
@ -293,7 +300,9 @@ std::tuple<bool, std::string> CB3DJSONMeshFileLoader::load() {
} }
// Success, failure reason // Success, failure reason
println("reading");
std::tuple<bool, std::string> texturesSuccess = this->readChunkTEXS(); std::tuple<bool, std::string> texturesSuccess = this->readChunkTEXS();
println("done reading");