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

fix warning, hopefully ...

issue_3165
kimkulling 2020-06-15 21:34:49 +02:00
parent f0f6612b81
commit 524e2e4728
1 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
code/Common/SceneCombiner.cpp
View File

@ -66,6 +66,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
namespace Assimp { namespace Assimp {
#if (__GNUC__ >= 8 && __GNUC_MINOR__ >= 0)
# pragma GCC diagnostic push
# pragma GCC diagnostic ignored "-Wclass-memaccess"
#endif
// ------------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------------
// Add a prefix to a string // Add a prefix to a string
inline inline
@ -75,7 +80,7 @@ void PrefixString(aiString& string,const char* prefix, unsigned int len) {
return; return;
if (len+string.length>=MAXLEN-1) { if (len+string.length>=MAXLEN-1) {
ASSIMP_LOG_VERBOSE_DEBUG("Can't add an unique prefix because the string is too long"); ASSIMP_LOG_VERBOSE_DEBUG("Can't add an unique prefix because the string is too long");
ai_assert(false); ai_assert(false);
return; return;
} }
@ -98,8 +103,9 @@ void SceneCombiner::AddNodeHashes(aiNode* node, std::set<unsigned int>& hashes)
} }
// Process all children recursively // Process all children recursively
for (unsigned int i = 0; i < node->mNumChildren;++i) for (unsigned int i = 0; i < node->mNumChildren;++i) {
AddNodeHashes(node->mChildren[i],hashes); AddNodeHashes(node->mChildren[i],hashes);
}
} }
// ------------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------------
@ -978,9 +984,7 @@ void GetArrayCopy(Type*& dest, ai_uint num ) {
Type* old = dest; Type* old = dest;
dest = new Type[num]; dest = new Type[num];
for ( size_t i=0; i<num; ++i ) { ::memcpy(dest, old, sizeof(Type) * num);
dest[i] = old[i];
}
} }
// ------------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------------
@ -1076,12 +1080,14 @@ void SceneCombiner::Copy( aiMesh** _dest, const aiMesh* src ) {
GetArrayCopy( dest->mBitangents, dest->mNumVertices ); GetArrayCopy( dest->mBitangents, dest->mNumVertices );
unsigned int n = 0; unsigned int n = 0;
while (dest->HasTextureCoords(n)) while (dest->HasTextureCoords(n)) {
GetArrayCopy( dest->mTextureCoords[n++], dest->mNumVertices ); GetArrayCopy( dest->mTextureCoords[n++], dest->mNumVertices );
}
n = 0; n = 0;
while (dest->HasVertexColors(n)) while (dest->HasVertexColors(n)) {
GetArrayCopy( dest->mColors[n++], dest->mNumVertices ); GetArrayCopy( dest->mColors[n++], dest->mNumVertices );
}
// make a deep copy of all bones // make a deep copy of all bones
CopyPtrArray(dest->mBones,dest->mBones,dest->mNumBones); CopyPtrArray(dest->mBones,dest->mBones,dest->mNumBones);
@ -1343,5 +1349,9 @@ void SceneCombiner::Copy(aiMetadata** _dest, const aiMetadata* src) {
} }
} }
#if (__GNUC__ >= 8 && __GNUC_MINOR__ >= 0)
# pragma GCC diagnostic pop
#endif
} // Namespace Assimp } // Namespace Assimp