From 4a8b7800ff402aec168f4c6a8ee37683e1ebe036 Mon Sep 17 00:00:00 2001 From: RichardTea <31507749+RichardTea@users.noreply.github.com> Date: Mon, 9 Dec 2019 11:23:57 +0000 Subject: [PATCH] Update M3D ASCII exporter ident and extension Changed to match existing Assimp style. Set extension as per: https://gitlab.com/bztsrc/model3d/blob/master/docs/a3d_format.md --- code/Common/Exporter.cpp | 4 ++-- code/M3D/M3DExporter.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/Common/Exporter.cpp b/code/Common/Exporter.cpp index 25a78114f..784c803b0 100644 --- a/code/Common/Exporter.cpp +++ b/code/Common/Exporter.cpp @@ -103,7 +103,7 @@ void ExportSceneFBX(const char*, IOSystem*, const aiScene*, const ExportProperti void ExportSceneFBXA(const char*, IOSystem*, const aiScene*, const ExportProperties*); void ExportScene3MF( const char*, IOSystem*, const aiScene*, const ExportProperties* ); void ExportSceneM3D(const char*, IOSystem*, const aiScene*, const ExportProperties*); -void ExportSceneA3D(const char*, IOSystem*, const aiScene*, const ExportProperties*); +void ExportSceneM3DA(const char*, IOSystem*, const aiScene*, const ExportProperties*); void ExportAssimp2Json(const char* , IOSystem*, const aiScene* , const Assimp::ExportProperties*); @@ -177,7 +177,7 @@ static void setupExporterArray(std::vector &exporte #ifndef ASSIMP_BUILD_NO_M3D_EXPORTER exporters.push_back(Exporter::ExportFormatEntry("m3d", "Model 3D (binary)", "m3d", &ExportSceneM3D, 0)); - exporters.push_back(Exporter::ExportFormatEntry("a3d", "Model 3D (ascii)", "m3d", &ExportSceneA3D, 0)); + exporters.push_back(Exporter::ExportFormatEntry("m3da", "Model 3D (ascii)", "a3d", &ExportSceneM3DA, 0)); #endif #ifndef ASSIMP_BUILD_NO_3MF_EXPORTER diff --git a/code/M3D/M3DExporter.cpp b/code/M3D/M3DExporter.cpp index 0e84f6d4f..1fe6e7f76 100644 --- a/code/M3D/M3DExporter.cpp +++ b/code/M3D/M3DExporter.cpp @@ -268,7 +268,7 @@ void ExportSceneM3D( // --------------------------------------------------------------------- // Worker function for exporting a scene to ASCII A3D. // Prototyped and registered in Exporter.cpp -void ExportSceneA3D( +void ExportSceneM3DA( const char *pFile, IOSystem *pIOSystem, const aiScene *pScene,