TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-15 20:53:50 +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

21
Engine/lib/assimp/code/SMDLoader.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 "SMDLoader.h"
#include <assimp/fast_atof.h>
#include <assimp/SkeletonMeshBuilder.h>
#include "fast_atof.h"
#include "SkeletonMeshBuilder.h"
#include <assimp/Importer.hpp>
#include <assimp/IOSystem.hpp>
#include <assimp/scene.h>
@ -182,7 +181,7 @@ void SMDImporter::InternReadFile( const std::string& pFile, aiScene* pScene, IOS
{
if (!(*i).mName.length())
{
ASSIMP_LOG_WARN("SMD: Not all bones have been initialized");
DefaultLogger::get()->warn("SMD: Not all bones have been initialized");
break;
}
}
@ -230,7 +229,7 @@ void SMDImporter::LogWarning(const char* msg)
char szTemp[1024];
ai_assert(strlen(msg) < 1000);
ai_snprintf(szTemp,1024,"Line %u: %s",iLineNumber,msg);
ASSIMP_LOG_WARN(szTemp);
DefaultLogger::get()->warn(szTemp);
}
// ------------------------------------------------------------------------------------------------
@ -286,7 +285,7 @@ void SMDImporter::CreateOutputMeshes()
if (UINT_MAX == (*iFace).iTexture)aaiFaces[(*iFace).iTexture].push_back( 0 );
else if ((*iFace).iTexture >= aszTextures.size())
{
ASSIMP_LOG_INFO("[SMD/VTA] Material index overflow in face");
DefaultLogger::get()->error("[SMD/VTA] Material index overflow in face");
aaiFaces[(*iFace).iTexture].push_back((unsigned int)aszTextures.size()-1);
}
else aaiFaces[(*iFace).iTexture].push_back(iNum);
@ -366,7 +365,7 @@ void SMDImporter::CreateOutputMeshes()
if (pairval.first >= asBones.size() ||
pairval.first == face.avVertices[iVert].iParentNode)
{
ASSIMP_LOG_ERROR("[SMD/VTA] Bone index overflow. "
DefaultLogger::get()->error("[SMD/VTA] Bone index overflow. "
"The bone index will be ignored, the weight will be assigned "
"to the vertex' parent node");
continue;
@ -387,7 +386,7 @@ void SMDImporter::CreateOutputMeshes()
{
if (face.avVertices[iVert].iParentNode >= asBones.size())
{
ASSIMP_LOG_ERROR("[SMD/VTA] Bone index overflow. "
DefaultLogger::get()->error("[SMD/VTA] Bone index overflow. "
"The index of the vertex parent bone is invalid. "
"The remaining weights will be normalized to 1.0");
@ -715,7 +714,7 @@ void SMDImporter::ParseFile()
if(!SkipSpaces(szCurrent,&szCurrent)) break;
if (1 != strtoul10(szCurrent,&szCurrent))
{
ASSIMP_LOG_WARN("SMD.version is not 1. This "
DefaultLogger::get()->warn("SMD.version is not 1. This "
"file format is not known. Continuing happily ...");
}
continue;
@ -953,7 +952,7 @@ void SMDImporter::ParseSkeletonElement(const char* szCurrent,
unsigned int iBone = 0;
if(!ParseUnsignedInt(szCurrent,&szCurrent,iBone))
{
ASSIMP_LOG_ERROR("Unexpected EOF/EOL while parsing bone index");
DefaultLogger::get()->error("Unexpected EOF/EOL while parsing bone index");
SMDI_PARSE_RETURN;
}
if (iBone >= asBones.size())