TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-18 14:13:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Just the functional assimp lib rather than the entire assimp repository unnecessarily.

Browse source
This commit is contained in:
Areloch 2019-02-28 16:37:15 -06:00
parent 0f7641a282
commit e9ea38eda3
1747 changed files with 9012 additions and 925008 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Engine/lib/assimp/code/RawLoader.cpp
View file

@ -3,8 +3,7 @@
Open Asset Import Library (assimp)
---------------------------------------------------------------------------
Copyright (c) 2006-2018, assimp team
Copyright (c) 2006-2017, assimp team
All rights reserved.
@ -50,8 +49,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
// internal headers
#include "RawLoader.h"
#include <assimp/ParsingUtils.h>
#include <assimp/fast_atof.h>
#include "ParsingUtils.h"
#include "fast_atof.h"
#include <memory>
#include <assimp/IOSystem.hpp>
#include <assimp/DefaultLogger.hpp>
@ -160,7 +159,7 @@ void RAWImporter::InternReadFile( const std::string& pFile,
}
if (num != 12 && num != 9)
{
ASSIMP_LOG_ERROR("A line may have either 9 or 12 floats and an optional texture");
DefaultLogger::get()->error("A line may have either 9 or 12 floats and an optional texture");
continue;
}
@ -244,11 +243,8 @@ void RAWImporter::InternReadFile( const std::string& pFile,
{
cc = &pScene->mRootNode;
pScene->mRootNode->mNumChildren = 0;
} else {
cc = new aiNode*[pScene->mRootNode->mNumChildren];
memset(cc, 0, sizeof(aiNode*) * pScene->mRootNode->mNumChildren);
pScene->mRootNode->mChildren = cc;
}
else cc = pScene->mRootNode->mChildren = new aiNode*[pScene->mRootNode->mNumChildren];
pScene->mNumMaterials = pScene->mNumMeshes;
aiMaterial** mats = pScene->mMaterials = new aiMaterial*[pScene->mNumMaterials];