diff options
| -rw-r--r-- | src/factories/sm64/CollisionFactory.cpp | 4 | ||||
| -rw-r--r-- | src/factories/sm64/PaintingMapFactory.cpp | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/factories/sm64/CollisionFactory.cpp b/src/factories/sm64/CollisionFactory.cpp index 4e0ca06..29b4f84 100644 --- a/src/factories/sm64/CollisionFactory.cpp +++ b/src/factories/sm64/CollisionFactory.cpp @@ -164,7 +164,7 @@ ExportResult SM64::CollisionCodeExporter::Export(std::ostream &write, std::share } if (collision->mSurfaces.size()) { write << fourSpaceTab; - write << "COL_TRI_STOP()"; + write << "COL_TRI_STOP()\n"; ++count; } @@ -231,7 +231,7 @@ ExportResult SM64::CollisionCodeExporter::Export(std::ostream &write, std::share } write << fourSpaceTab; - write << "COL_END()"; + write << "COL_END()\n"; ++count; write << "};\n"; diff --git a/src/factories/sm64/PaintingMapFactory.cpp b/src/factories/sm64/PaintingMapFactory.cpp index b17108b..415322c 100644 --- a/src/factories/sm64/PaintingMapFactory.cpp +++ b/src/factories/sm64/PaintingMapFactory.cpp @@ -6,7 +6,7 @@ #include "utils/TorchUtils.h" #include <regex> -#define FORMAT_INT(x, w) std::dec << std::setfill(' ') << std::setw(w) << x +// #define FORMAT_INT(x, w) std::dec << std::setfill(' ') << std::setw(w) << x ExportResult SM64::PaintingMapHeaderExporter::Export(std::ostream &write, std::shared_ptr<IParsedData> raw, std::string& entryName, YAML::Node &node, std::string* replacement) { const auto symbol = GetSafeNode(node, "symbol", entryName); @@ -32,14 +32,14 @@ ExportResult SM64::PaintingMapCodeExporter::Export(std::ostream &write, std::sha for (auto &mapping : paintingData->mPaintingMappings) { write << fourSpaceTab; - write << FORMAT_INT(mapping.vtxId << "," << mapping.texX << "," << mapping.texY, 6) << ",\n"; + write << mapping.vtxId << ", " << mapping.texX << ", " << mapping.texY << ",\n"; } write << fourSpaceTab << paintingData->mPaintingMappings.size() << ",\n"; for (auto &group : paintingData->mPaintingGroups) { write << fourSpaceTab; - write << FORMAT_INT(group, 4) << ",\n"; + write << group.x << ", " << group.y << ", " << group.z << ", " << ",\n"; } write << "};\n"; |