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

[F] Fixed type in list. 

[+] Added function to metadata class for conveniance.
[*] Enumeration AI_INT changed to AI_INT32.
pull/1021/head
Alexandr Arutjunov 2016-10-04 23:58:51 +03:00
parent 0ba0eca48e
commit 9d40f36f87
3 changed files with 29 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
code/CMakeLists.txt
View File

@ -611,6 +611,8 @@ ADD_ASSIMP_IMPORTER( X
) )
ADD_ASSIMP_IMPORTER(X3D ADD_ASSIMP_IMPORTER(X3D
X3DExporter.cpp
X3DExporter.hpp
X3DImporter.cpp X3DImporter.cpp
X3DImporter.hpp X3DImporter.hpp
X3DImporter_Geometry2D.cpp X3DImporter_Geometry2D.cpp

4
code/SceneCombiner.cpp
View File

@ -1237,8 +1237,8 @@ void SceneCombiner::Copy (aiMetadata** _dest, const aiMetadata* src)
case AI_BOOL: case AI_BOOL:
out.mData = new bool(*static_cast<bool*>(in.mData)); out.mData = new bool(*static_cast<bool*>(in.mData));
break; break;
case AI_INT: case AI_INT32:
out.mData = new int(*static_cast<int*>(in.mData)); out.mData = new int32_t(*static_cast<int32_t*>(in.mData));
break; break;
case AI_UINT64: case AI_UINT64:
out.mData = new uint64_t(*static_cast<uint64_t*>(in.mData)); out.mData = new uint64_t(*static_cast<uint64_t*>(in.mData));

34
include/assimp/metadata.h
View File

@ -64,12 +64,12 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
// ------------------------------------------------------------------------------- // -------------------------------------------------------------------------------
typedef enum aiMetadataType typedef enum aiMetadataType
{ {
AI_BOOL = 0, AI_BOOL = 0,
AI_INT = 1, AI_INT32 = 1,
AI_UINT64 = 2, AI_UINT64 = 2,
AI_FLOAT = 3, AI_FLOAT = 3,
AI_DOUBLE = 4, AI_DOUBLE = 4,
AI_AISTRING = 5, AI_AISTRING = 5,
AI_AIVECTOR3D = 6, AI_AIVECTOR3D = 6,
#ifndef SWIG #ifndef SWIG
@ -106,7 +106,7 @@ struct aiMetadataEntry
*/ */
// ------------------------------------------------------------------------------- // -------------------------------------------------------------------------------
inline aiMetadataType GetAiType( bool ) { return AI_BOOL; } inline aiMetadataType GetAiType( bool ) { return AI_BOOL; }
inline aiMetadataType GetAiType( int ) { return AI_INT; } inline aiMetadataType GetAiType( int32_t ) { return AI_INT32; }
inline aiMetadataType GetAiType( uint64_t ) { return AI_UINT64; } inline aiMetadataType GetAiType( uint64_t ) { return AI_UINT64; }
inline aiMetadataType GetAiType( float ) { return AI_FLOAT; } inline aiMetadataType GetAiType( float ) { return AI_FLOAT; }
inline aiMetadataType GetAiType( double ) { return AI_DOUBLE; } inline aiMetadataType GetAiType( double ) { return AI_DOUBLE; }
@ -165,8 +165,8 @@ struct aiMetadata
case AI_BOOL: case AI_BOOL:
delete static_cast<bool*>(data); delete static_cast<bool*>(data);
break; break;
case AI_INT: case AI_INT32:
delete static_cast<int*>(data); delete static_cast<int32_t*>(data);
break; break;
case AI_UINT64: case AI_UINT64:
delete static_cast<uint64_t*>(data); delete static_cast<uint64_t*>(data);
@ -248,6 +248,22 @@ struct aiMetadata
return Get(aiString(key), value); return Get(aiString(key), value);
} }
/// \fn inline bool Get(size_t pIndex, const aiString*& pKey, const aiMetadataEntry*& pEntry)
/// Return metadata entry for analyzing it by user.
/// \param [in] pIndex - index of the entry.
/// \param [out] pKey - pointer to the key value.
/// \param [out] pEntry - pointer to the entry: type and value.
/// \return false - if pIndex is out of range, else - true.
inline bool Get(size_t pIndex, const aiString*& pKey, const aiMetadataEntry*& pEntry)
{
if(pIndex >= mNumProperties) return false;
pKey = &mKeys[pIndex];
pEntry = &mValues[pIndex];
return true;
}
#endif // __cplusplus #endif // __cplusplus
}; };