v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adding aiCreateQuaternionFromMatrix() and aiDecomposeMatrix() to expose some cpp maths functionality for c. 

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@409 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
pull/1/head
aramis_acg 2009-04-27 15:16:32 +00:00
parent d7b4dd6ae3
commit e4cddb9e9d
2 changed files with 32 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
code/Assimp.cpp
View File

@ -366,3 +366,16 @@ ASSIMP_API void aiSetImportPropertyString(const char* szName,
SetGenericProperty<std::string>(gStringProperties,szName, SetGenericProperty<std::string>(gStringProperties,szName,
std::string( st->data ),NULL); std::string( st->data ),NULL);
} }
// ------------------------------------------------------------------------------------------------
void aiCreateQuaternionFromMatrix(aiQuaternion* quat,const aiMatrix3x3* mat)
{
*quat = aiQuaternion(*mat);
}
// ------------------------------------------------------------------------------------------------
void aiDecomposeMatrix(const aiMatrix4x4* mat, aiVector3D* scaling,
aiQuaternion* rotation,aiVector3D* position)
{
mat->Decompose(*scaling,*rotation,*position);
}

25
include/assimp.h
View File

@ -147,8 +147,8 @@ ASSIMP_API void aiGetExtensionList(C_STRUCT aiString* szOut);
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
/** Get the storage required by an imported asset /** Get the storage required by an imported asset
* \param pIn Input asset. * @param pIn Input asset.
* \param in Data structure to be filled. * @param in Data structure to be filled.
*/ */
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
ASSIMP_API void aiGetMemoryRequirements(const C_STRUCT aiScene* pIn, ASSIMP_API void aiGetMemoryRequirements(const C_STRUCT aiScene* pIn,
@ -160,24 +160,37 @@ ASSIMP_API void aiGetMemoryRequirements(const C_STRUCT aiScene* pIn,
* #Assimp::Importer::SetPropertyInteger(). In the C-API properties are shared by * #Assimp::Importer::SetPropertyInteger(). In the C-API properties are shared by
* all imports. It is not possible to specify them per asset. * all imports. It is not possible to specify them per asset.
* *
* \param szName Name of the configuration property to be set. All constants * @param szName Name of the configuration property to be set. All constants
* are defined in the aiConfig.h header file. * are defined in the aiConfig.h header file.
* \param value New value for the property * @param value New value for the property
*/ */
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
ASSIMP_API void aiSetImportPropertyInteger(const char* szName, int value); ASSIMP_API void aiSetImportPropertyInteger(const char* szName, int value);
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
/** @see aiSetImportPropertyInteger() /** @see aiSetImportPropertyInteger()
*/ */
ASSIMP_API void aiSetImportPropertyFloat(const char* szName, float value); ASSIMP_API void aiSetImportPropertyFloat(const char* szName, float value);
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
/** @see aiSetImportPropertyInteger() /** @see aiSetImportPropertyInteger()
*/ */
ASSIMP_API void aiSetImportPropertyString(const char* szName, ASSIMP_API void aiSetImportPropertyString(const char* szName,
const C_STRUCT aiString* st); const C_STRUCT aiString* st);
// ---------------------------------------------------------------------------
/** @see aiQuaternion(const aiMatrix3x3& pRotMatrix)
*/
void aiCreateQuaternionFromMatrix(C_STRUCT aiQuaternion* quat,const C_STRUCT aiMatrix3x3* mat);
// ---------------------------------------------------------------------------
/** @see aiMatrix4x4::Decompose (aiVector3D&, aiQuaternion&, aiVector3D&) const;
*/
void aiDecomposeMatrix(const C_STRUCT aiMatrix4x4* mat,
C_STRUCT aiVector3D* scaling,
C_STRUCT aiQuaternion* rotation,
C_STRUCT aiVector3D* position);
#ifdef __cplusplus #ifdef __cplusplus
} }