From 72c51a99970552ae2b5662f32f507e8f85b98ded Mon Sep 17 00:00:00 2001 From: hankarun Date: Fri, 29 Nov 2024 22:54:24 +0300 Subject: [PATCH] Convert float to ai_real, (#5902) Co-authored-by: ali turan Co-authored-by: Kim Kulling --- include/assimp/material.h | 4 ++-- include/assimp/material.inl | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/assimp/material.h b/include/assimp/material.h index 48f94c1ed..ccb771020 100644 --- a/include/assimp/material.h +++ b/include/assimp/material.h @@ -1535,7 +1535,7 @@ ASSIMP_API C_ENUM aiReturn aiGetMaterialFloatArray( const char *pKey, unsigned int type, unsigned int index, - float *pOut, + ai_real *pOut, unsigned int *pMax); // --------------------------------------------------------------------------- @@ -1561,7 +1561,7 @@ static inline aiReturn aiGetMaterialFloat(const C_STRUCT aiMaterial *pMat, const char *pKey, unsigned int type, unsigned int index, - float *pOut) { + ai_real *pOut) { return aiGetMaterialFloatArray(pMat, pKey, type, index, pOut, NULL); } diff --git a/include/assimp/material.inl b/include/assimp/material.inl index 31dd438fe..2642b2b3d 100644 --- a/include/assimp/material.inl +++ b/include/assimp/material.inl @@ -67,7 +67,7 @@ AI_FORCE_INLINE aiReturn aiMaterial::GetTexture( aiTextureType type, C_STRUCT aiString* path, aiTextureMapping* mapping /*= NULL*/, unsigned int* uvindex /*= NULL*/, - float* blend /*= NULL*/, + ai_real* blend /*= NULL*/, aiTextureOp* op /*= NULL*/, aiTextureMapMode* mapmode /*= NULL*/) const { return ::aiGetMaterialTexture(this,type,index,path,mapping,uvindex,blend,op,mapmode); @@ -191,7 +191,7 @@ AI_FORCE_INLINE aiReturn aiMaterial::Get(const char* pKey,unsigned int type, } // --------------------------------------------------------------------------- AI_FORCE_INLINE aiReturn aiMaterial::Get(const char* pKey,unsigned int type, - unsigned int idx, float& pOut) const { + unsigned int idx, ai_real& pOut) const { return aiGetMaterialFloat(this,pKey,type,idx,&pOut); } // ---------------------------------------------------------------------------