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

Updated assimp to latest

Browse source
This commit is contained in:
Areloch 2019-03-05 14:39:38 -06:00
parent 25ce4477ce
commit 161bf7f83b
461 changed files with 34662 additions and 30165 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Engine/lib/assimp/code/UnrealLoader.cpp
View file

@ -3,7 +3,8 @@
Open Asset Import Library (assimp)
---------------------------------------------------------------------------
Copyright (c) 2006-2017, assimp team
Copyright (c) 2006-2019, assimp team
All rights reserved.
@ -52,9 +53,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef ASSIMP_BUILD_NO_3D_IMPORTER
#include "UnrealLoader.h"
#include "StreamReader.h"
#include "ParsingUtils.h"
#include "fast_atof.h"
#include <assimp/StreamReader.h>
#include <assimp/ParsingUtils.h>
#include <assimp/fast_atof.h>
#include "ConvertToLHProcess.h"
#include <assimp/Importer.hpp>
@ -152,9 +153,9 @@ void UnrealImporter::InternReadFile( const std::string& pFile,
a_path = extension+"_a.3d";
uc_path = extension+".uc";
DefaultLogger::get()->debug("UNREAL: data file is " + d_path);
DefaultLogger::get()->debug("UNREAL: aniv file is " + a_path);
DefaultLogger::get()->debug("UNREAL: uc file is " + uc_path);
ASSIMP_LOG_DEBUG_F( "UNREAL: data file is ", d_path);
ASSIMP_LOG_DEBUG_F("UNREAL: aniv file is ", a_path);
ASSIMP_LOG_DEBUG_F("UNREAL: uc file is ", uc_path);
// and open the files ... we can't live without them
std::unique_ptr<IOStream> p(pIOHandler->Open(d_path));
@ -178,7 +179,7 @@ void UnrealImporter::InternReadFile( const std::string& pFile,
tri.mVertex[i] = d_reader.GetI2();
if (tri.mVertex[i] >= numTris) {
DefaultLogger::get()->warn("UNREAL: vertex index out of range");
ASSIMP_LOG_WARN("UNREAL: vertex index out of range");
tri.mVertex[i] = 0;
}
}
@ -323,7 +324,7 @@ void UnrealImporter::InternReadFile( const std::string& pFile,
}
}
else {
DefaultLogger::get()->error("Unable to open .uc file");
ASSIMP_LOG_ERROR("Unable to open .uc file");
}
std::vector<Unreal::TempMat> materials;