TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-17 05:33:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

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

17
Engine/lib/assimp/code/Q3DLoader.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 "Q3DLoader.h"
#include <assimp/StreamReader.h>
#include <assimp/fast_atof.h>
#include "StreamReader.h"
#include "fast_atof.h"
#include <assimp/IOSystem.hpp>
#include <assimp/DefaultLogger.hpp>
#include <assimp/scene.h>
@ -125,7 +124,7 @@ void Q3DImporter::InternReadFile( const std::string& pFile,
}
// Print the file format version
ASSIMP_LOG_INFO_F("Quick3D File format version: ",
DefaultLogger::get()->info("Quick3D File format version: " +
std::string(&((const char*)stream.GetPtr())[8],2));
// ... an store it
@ -413,7 +412,7 @@ outer:
// If we have no materials loaded - generate a default mat
if (materials.empty())
{
ASSIMP_LOG_INFO("Quick3D: No material found, generating one");
DefaultLogger::get()->info("Quick3D: No material found, generating one");
materials.push_back(Material());
materials.back().diffuse = fgColor ;
}
@ -433,7 +432,7 @@ outer:
{
if ((*fit).mat >= materials.size())
{
ASSIMP_LOG_WARN("Quick3D: Material index overflow");
DefaultLogger::get()->warn("Quick3D: Material index overflow");
(*fit).mat = 0;
}
if (fidx[(*fit).mat].empty())++pScene->mNumMeshes;
@ -528,7 +527,7 @@ outer:
{
if (face.indices[n] >= m.verts.size())
{
ASSIMP_LOG_WARN("Quick3D: Vertex index overflow");
DefaultLogger::get()->warn("Quick3D: Vertex index overflow");
face.indices[n] = 0;
}
@ -561,7 +560,7 @@ outer:
{
if (face.uvindices[n] >= m.uv.size())
{
ASSIMP_LOG_WARN("Quick3D: Texture coordinate index overflow");
DefaultLogger::get()->warn("Quick3D: Texture coordinate index overflow");
face.uvindices[n] = 0;
}
*uv = m.uv[face.uvindices[n]];