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

code fixes for Hunter-based build

pull/2488/head
Rahul Sheth 2019-05-24 17:03:42 -04:00 committed by Rahul Sheth
parent dab8041bcd
commit 5cda81e84b
3 changed files with 32 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
code/3MF/D3MFOpcPackage.cpp
View File

@ -152,6 +152,15 @@ int IOSystem2Unzip::testerror(voidpf /*opaque*/, voidpf /*stream*/) {
zlib_filefunc_def IOSystem2Unzip::get(IOSystem* pIOHandler) { zlib_filefunc_def IOSystem2Unzip::get(IOSystem* pIOHandler) {
zlib_filefunc_def mapping; zlib_filefunc_def mapping;
#ifdef ASSIMP_USE_HUNTER
mapping.zopen_file = (open_file_func)open;
mapping.zread_file = (read_file_func)read;
mapping.zwrite_file = (write_file_func)write;
mapping.ztell_file = (tell_file_func)tell;
mapping.zseek_file = (seek_file_func)seek;
mapping.zclose_file = (close_file_func)close;
mapping.zerror_file = (error_file_func)testerror;
#else
mapping.zopen_file = open; mapping.zopen_file = open;
mapping.zread_file = read; mapping.zread_file = read;
mapping.zwrite_file = write; mapping.zwrite_file = write;
@ -159,6 +168,7 @@ zlib_filefunc_def IOSystem2Unzip::get(IOSystem* pIOHandler) {
mapping.zseek_file = seek; mapping.zseek_file = seek;
mapping.zclose_file = close; mapping.zclose_file = close;
mapping.zerror_file = testerror; mapping.zerror_file = testerror;
#endif
mapping.opaque = reinterpret_cast<voidpf>(pIOHandler); mapping.opaque = reinterpret_cast<voidpf>(pIOHandler);
return mapping; return mapping;

12
code/OpenGEX/OpenGEXImporter.cpp
View File

@ -213,7 +213,11 @@ static void propId2StdString( Property *prop, std::string &name, std::string &ke
} }
if ( nullptr != prop->m_key ) { if ( nullptr != prop->m_key ) {
#ifdef ASSIMP_USE_HUNTER
name = prop->m_key->m_text.m_buffer;
#else
name = prop->m_key->m_buffer; name = prop->m_key->m_buffer;
#endif
if ( Value::ddl_string == prop->m_value->m_type ) { if ( Value::ddl_string == prop->m_value->m_type ) {
key = prop->m_value->getString(); key = prop->m_value->getString();
} }
@ -498,7 +502,11 @@ static void getRefNames( DDLNode *node, std::vector<std::string> &names ) {
for( size_t i = 0; i < ref->m_numRefs; i++ ) { for( size_t i = 0; i < ref->m_numRefs; i++ ) {
Name *currentName( ref->m_referencedName[ i ] ); Name *currentName( ref->m_referencedName[ i ] );
if( nullptr != currentName && nullptr != currentName->m_id ) { if( nullptr != currentName && nullptr != currentName->m_id ) {
#ifdef ASSIMP_USE_HUNTER
const std::string name( currentName->m_id->m_text.m_buffer );
#else
const std::string name( currentName->m_id->m_buffer ); const std::string name( currentName->m_id->m_buffer );
#endif
if( !name.empty() ) { if( !name.empty() ) {
names.push_back( name ); names.push_back( name );
} }
@ -1039,7 +1047,11 @@ void OpenGEXImporter::handleColorNode( ODDLParser::DDLNode *node, aiScene * /*pS
col.g = col4.g; col.g = col4.g;
col.b = col4.b; col.b = col4.b;
} }
#ifdef ASSIMP_USE_HUNTER
const ColorType colType( getColorType( &prop->m_key->m_text ) );
#else
const ColorType colType( getColorType( prop->m_key ) ); const ColorType colType( getColorType( prop->m_key ) );
#endif
if( DiffuseColor == colType ) { if( DiffuseColor == colType ) {
m_currentMaterial->AddProperty( &col, 1, AI_MATKEY_COLOR_DIFFUSE ); m_currentMaterial->AddProperty( &col, 1, AI_MATKEY_COLOR_DIFFUSE );
} else if( SpecularColor == colType ) { } else if( SpecularColor == colType ) {

10
code/Q3BSP/Q3BSPZipArchive.cpp
View File

@ -123,6 +123,15 @@ int IOSystem2Unzip::testerror(voidpf /*opaque*/, voidpf /*stream*/) {
zlib_filefunc_def IOSystem2Unzip::get(IOSystem* pIOHandler) { zlib_filefunc_def IOSystem2Unzip::get(IOSystem* pIOHandler) {
zlib_filefunc_def mapping; zlib_filefunc_def mapping;
#ifdef ASSIMP_USE_HUNTER
mapping.zopen_file = (open_file_func)open;
mapping.zread_file = (read_file_func)read;
mapping.zwrite_file = (write_file_func)write;
mapping.ztell_file = (tell_file_func)tell;
mapping.zseek_file = (seek_file_func)seek;
mapping.zclose_file = (close_file_func)close;
mapping.zerror_file = (error_file_func)testerror;
#else
mapping.zopen_file = open; mapping.zopen_file = open;
mapping.zread_file = read; mapping.zread_file = read;
mapping.zwrite_file = write; mapping.zwrite_file = write;
@ -130,6 +139,7 @@ zlib_filefunc_def IOSystem2Unzip::get(IOSystem* pIOHandler) {
mapping.zseek_file = seek; mapping.zseek_file = seek;
mapping.zclose_file = close; mapping.zclose_file = close;
mapping.zerror_file = testerror; mapping.zerror_file = testerror;
#endif
mapping.opaque = (voidpf) pIOHandler; mapping.opaque = (voidpf) pIOHandler;
return mapping; return mapping;