TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-08 21:24:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

update assimp to 6.0.5

Browse source
This commit is contained in:
AzaezelX 2026-06-09 12:46:56 -05:00
parent 2d2eb57e2e
commit f5cf21cfeb
941 changed files with 22718 additions and 12240 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Engine/lib/assimp/code/Common/SceneCombiner.cpp
View file

@ -2,8 +2,7 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
Copyright (c) 2006-2024, assimp team
Copyright (c) 2006-2026, assimp team
All rights reserved.
@ -53,7 +52,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
// ----------------------------------------------------------------------------
#include "ScenePrivate.h"
#include "time.h"
#include <assimp/Hash.h>
#include <assimp/SceneCombiner.h>
#include <assimp/StringUtils.h>
@ -61,9 +59,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <assimp/mesh.h>
#include <assimp/metadata.h>
#include <assimp/scene.h>
#include <stdio.h>
#include <assimp/DefaultLogger.hpp>
#include <unordered_set>
#include <ctime>
#include <cstdio>
namespace Assimp {
@ -96,6 +96,11 @@ inline void PrefixString(aiString &string, const char *prefix, unsigned int len)
// ------------------------------------------------------------------------------------------------
// Add node identifiers to a hashing set
void SceneCombiner::AddNodeHashes(aiNode *node, std::set<unsigned int> &hashes) {
if (node == nullptr) {
ASSIMP_LOG_ERROR("Pointer to aiNode is nullptr.");
return;
}
// Add node name to hashing set if it is non-empty - empty nodes are allowed
// and they can't have any anims assigned so its absolutely safe to duplicate them.
if (node->mName.length) {
@ -985,7 +990,7 @@ inline void GetArrayCopy(Type *&dest, ai_uint num) {
Type *old = dest;
dest = new Type[num];
::memcpy(dest, old, sizeof(Type) * num);
std::copy(old, old+num, dest);
}
// ------------------------------------------------------------------------------------------------
@ -1095,10 +1100,6 @@ void SceneCombiner::Copy(aiMesh **_dest, const aiMesh *src) {
// make a deep copy of all faces
GetArrayCopy(dest->mFaces, dest->mNumFaces);
for (unsigned int i = 0; i < dest->mNumFaces; ++i) {
aiFace &f = dest->mFaces[i];
GetArrayCopy(f.mIndices, f.mNumIndices);
}
// make a deep copy of all blend shapes
CopyPtrArray(dest->mAnimMeshes, dest->mAnimMeshes, dest->mNumAnimMeshes);