From 9bab475302e6d5bda3f15d5c7856128a3acf9a7d Mon Sep 17 00:00:00 2001 From: ywang Date: Wed, 3 Feb 2021 15:05:58 -0800 Subject: [PATCH 1/2] export min max for sparse accessor --- code/AssetLib/glTF2/glTF2AssetWriter.inl | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/code/AssetLib/glTF2/glTF2AssetWriter.inl b/code/AssetLib/glTF2/glTF2AssetWriter.inl index ab30e418a..5505ab266 100644 --- a/code/AssetLib/glTF2/glTF2AssetWriter.inl +++ b/code/AssetLib/glTF2/glTF2AssetWriter.inl @@ -110,19 +110,18 @@ namespace glTF2 { if (a.bufferView) { obj.AddMember("bufferView", a.bufferView->index, w.mAl); obj.AddMember("byteOffset", (unsigned int)a.byteOffset, w.mAl); - Value vTmpMax, vTmpMin; - if (a.componentType == ComponentType_FLOAT) { - obj.AddMember("max", MakeValue(vTmpMax, a.max, w.mAl), w.mAl); - obj.AddMember("min", MakeValue(vTmpMin, a.min, w.mAl), w.mAl); - } else { - obj.AddMember("max", MakeValueCast(vTmpMax, a.max, w.mAl), w.mAl); - obj.AddMember("min", MakeValueCast(vTmpMin, a.min, w.mAl), w.mAl); - } } - obj.AddMember("componentType", int(a.componentType), w.mAl); obj.AddMember("count", (unsigned int)a.count, w.mAl); obj.AddMember("type", StringRef(AttribType::ToString(a.type)), w.mAl); + Value vTmpMax, vTmpMin; + if (a.componentType == ComponentType_FLOAT) { + obj.AddMember("max", MakeValue(vTmpMax, a.max, w.mAl), w.mAl); + obj.AddMember("min", MakeValue(vTmpMin, a.min, w.mAl), w.mAl); + } else { + obj.AddMember("max", MakeValueCast(vTmpMax, a.max, w.mAl), w.mAl); + obj.AddMember("min", MakeValueCast(vTmpMin, a.min, w.mAl), w.mAl); + } if (a.sparse) { Value sparseValue; From fc955a5f8a7786c49d5c3023218ebb7adcea66e0 Mon Sep 17 00:00:00 2001 From: contriteobserver Date: Wed, 3 Mar 2021 12:23:26 -0800 Subject: [PATCH 2/2] applied extern "C" guards to importerdesc.h addresses #3685 --- include/assimp/importerdesc.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/include/assimp/importerdesc.h b/include/assimp/importerdesc.h index b1a4e3e8e..037f2e7a4 100644 --- a/include/assimp/importerdesc.h +++ b/include/assimp/importerdesc.h @@ -52,6 +52,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include +#ifdef __cplusplus +extern "C" { +#endif + /** Mixed set of flags for #aiImporterDesc, indicating some features * common to many importers*/ enum aiImporterFlags { @@ -143,4 +147,8 @@ Will return a nullptr if no assigned importer desc. was found for the given exte */ ASSIMP_API const C_STRUCT aiImporterDesc *aiGetImporterDesc(const char *extension); +#ifdef __cplusplus +} // end of extern "C" +#endif + #endif // AI_IMPORTER_DESC_H_INC