From 469fdb1ab2726ce1cb33ea6bcfc9ed77ad3a7a2a Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Thu, 26 Sep 2024 13:49:27 +0200 Subject: [PATCH] Indroduce matgetreal --- include/assimp/material.h | 12 ++++++++++++ include/assimp/material.inl | 6 +++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/include/assimp/material.h b/include/assimp/material.h index 49328e0cd..c6d233067 100644 --- a/include/assimp/material.h +++ b/include/assimp/material.h @@ -1625,6 +1625,18 @@ inline aiReturn aiGetMaterialDouble(const C_STRUCT aiMaterial *pMat, return aiGetMaterialDoubleArray(pMat, pKey, type, index, pOut, (unsigned int *)0x0); } +inline aiReturn aiGetMaterialReal(const C_STRUCT aiMaterial *pMat, + const char *pKey, + unsigned int type, + unsigned int index, + ai_real *pOut) { +#ifndef ASSIMP_DOUBLE_PRECISION + return aiGetMaterialFloatArray(pMat, pKey, type, index, pOut, (unsigned int *)0x0); +#else + return aiGetMaterialDoubleArray(pMat, pKey, type, index, pOut, (unsigned int *)0x0); +#endif +} + // --------------------------------------------------------------------------- /** @brief Retrieve an array of integer values with a specific key * from a material diff --git a/include/assimp/material.inl b/include/assimp/material.inl index 3ee0180a5..cf7bc3848 100644 --- a/include/assimp/material.inl +++ b/include/assimp/material.inl @@ -189,7 +189,11 @@ AI_FORCE_INLINE aiReturn aiMaterial::Get(const char* pKey,unsigned int type, unsigned int idx, ai_real* pOut, unsigned int* pMax) const { - return ::aiGetMaterialFloatArray(this,pKey,type,idx,pOut,pMax); +#ifndef ASSIMP_DOUBLE_PRECISION + return ::aiGetMaterialFloatArray(this, pKey, type, idx, pOut, pMax); +#else + return ::aiGetMaterialDoubleArray(this, pKey, type, idx, pOut, pMax); +#endif } // --------------------------------------------------------------------------- AI_FORCE_INLINE aiReturn aiMaterial::Get(const char* pKey,unsigned int type,