mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-02-13 03:33:48 +00:00
update assimp lib
This commit is contained in:
marauder2k7
parent
03a348deb7
commit
d3f8fee74e
1725 changed files with 196314 additions and 62009 deletions
|
|
@ -3,7 +3,7 @@
|
|||
Open Asset Import Library (assimp)
|
||||
---------------------------------------------------------------------------
|
||||
|
||||
Copyright (c) 2006-2022, assimp team
|
||||
Copyright (c) 2006-2024, assimp team
|
||||
|
||||
All rights reserved.
|
||||
|
||||
|
|
@ -64,9 +64,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|||
#define strtok_s strtok_r
|
||||
#endif
|
||||
|
||||
using namespace Assimp;
|
||||
namespace Assimp {
|
||||
|
||||
static const aiImporterDesc desc = {
|
||||
static constexpr aiImporterDesc desc = {
|
||||
"Valve SMD Importer",
|
||||
"",
|
||||
"",
|
||||
|
|
@ -82,20 +82,18 @@ static const aiImporterDesc desc = {
|
|||
// ------------------------------------------------------------------------------------------------
|
||||
// Constructor to be privately used by Importer
|
||||
SMDImporter::SMDImporter() :
|
||||
configFrameID(),
|
||||
mBuffer(),
|
||||
pScene( nullptr ),
|
||||
configFrameID(),
|
||||
mBuffer(),
|
||||
mEnd(nullptr),
|
||||
pScene(nullptr),
|
||||
iFileSize( 0 ),
|
||||
iSmallestFrame( INT_MAX ),
|
||||
dLengthOfAnim( 0.0 ),
|
||||
bHasUVs(false ),
|
||||
bHasUVs(false ),
|
||||
iLineNumber((unsigned int)-1) {
|
||||
// empty
|
||||
}
|
||||
|
||||
// ------------------------------------------------------------------------------------------------
|
||||
// Destructor, private as well
|
||||
SMDImporter::~SMDImporter() = default;
|
||||
|
||||
// ------------------------------------------------------------------------------------------------
|
||||
// Returns whether the class can handle the format of the given file.
|
||||
|
|
@ -402,8 +400,12 @@ void SMDImporter::AddBoneChildren(aiNode* pcNode, uint32_t iParent) {
|
|||
}
|
||||
}
|
||||
|
||||
// nothing to do
|
||||
if (pcNode->mNumChildren == 0)
|
||||
return;
|
||||
|
||||
// now allocate the output array
|
||||
pcNode->mChildren = new aiNode*[pcNode->mNumChildren];
|
||||
pcNode->mChildren = new aiNode *[pcNode->mNumChildren];
|
||||
|
||||
// and fill all subnodes
|
||||
unsigned int qq( 0 );
|
||||
|
|
@ -453,11 +455,10 @@ void SMDImporter::CreateOutputNodes() {
|
|||
delete pcOldRoot;
|
||||
|
||||
pScene->mRootNode->mParent = nullptr;
|
||||
}
|
||||
else
|
||||
{
|
||||
::strcpy(pScene->mRootNode->mName.data, "<SMD_root>");
|
||||
} else {
|
||||
static constexpr char rootName[11] = "<SMD_root>";
|
||||
pScene->mRootNode->mName.length = 10;
|
||||
::strncpy(pScene->mRootNode->mName.data, rootName, pScene->mRootNode->mName.length);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -535,7 +536,7 @@ void SMDImporter::GetAnimationFileList(const std::string &pFile, IOSystem* pIOHa
|
|||
auto path = base + "/" + name + "_animation.txt";
|
||||
|
||||
std::unique_ptr<IOStream> file(pIOHandler->Open(path.c_str(), "rb"));
|
||||
if (file.get() == nullptr) {
|
||||
if (file == nullptr) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -591,12 +592,12 @@ void SMDImporter::CreateOutputMaterials() {
|
|||
pScene->mMaterials[iMat] = pcMat;
|
||||
|
||||
aiString szName;
|
||||
szName.length = (size_t)ai_snprintf(szName.data,MAXLEN,"Texture_%u",iMat);
|
||||
szName.length = static_cast<ai_uint32>(ai_snprintf(szName.data, AI_MAXLEN, "Texture_%u", iMat));
|
||||
pcMat->AddProperty(&szName,AI_MATKEY_NAME);
|
||||
|
||||
if (aszTextures[iMat].length())
|
||||
{
|
||||
::strncpy(szName.data, aszTextures[iMat].c_str(),MAXLEN-1);
|
||||
::strncpy(szName.data, aszTextures[iMat].c_str(), AI_MAXLEN - 1);
|
||||
szName.length = static_cast<ai_uint32>( aszTextures[iMat].length() );
|
||||
pcMat->AddProperty(&szName,AI_MATKEY_TEXTURE_DIFFUSE(0));
|
||||
}
|
||||
|
|
@ -633,13 +634,13 @@ void SMDImporter::ParseFile() {
|
|||
|
||||
// read line per line ...
|
||||
for ( ;; ) {
|
||||
if(!SkipSpacesAndLineEnd(szCurrent,&szCurrent)) {
|
||||
if(!SkipSpacesAndLineEnd(szCurrent,&szCurrent, mEnd)) {
|
||||
break;
|
||||
}
|
||||
|
||||
// "version <n> \n", <n> should be 1 for hl and hl2 SMD files
|
||||
if (TokenMatch(szCurrent,"version",7)) {
|
||||
if(!SkipSpaces(szCurrent,&szCurrent)) break;
|
||||
if(!SkipSpaces(szCurrent,&szCurrent, mEnd)) break;
|
||||
if (1 != strtoul10(szCurrent,&szCurrent)) {
|
||||
ASSIMP_LOG_WARN("SMD.version is not 1. This "
|
||||
"file format is not known. Continuing happily ...");
|
||||
|
|
@ -648,26 +649,26 @@ void SMDImporter::ParseFile() {
|
|||
}
|
||||
// "nodes\n" - Starts the node section
|
||||
if (TokenMatch(szCurrent,"nodes",5)) {
|
||||
ParseNodesSection(szCurrent,&szCurrent);
|
||||
ParseNodesSection(szCurrent, &szCurrent, mEnd);
|
||||
continue;
|
||||
}
|
||||
// "triangles\n" - Starts the triangle section
|
||||
if (TokenMatch(szCurrent,"triangles",9)) {
|
||||
ParseTrianglesSection(szCurrent,&szCurrent);
|
||||
ParseTrianglesSection(szCurrent, &szCurrent, mEnd);
|
||||
continue;
|
||||
}
|
||||
// "vertexanimation\n" - Starts the vertex animation section
|
||||
if (TokenMatch(szCurrent,"vertexanimation",15)) {
|
||||
bHasUVs = false;
|
||||
ParseVASection(szCurrent,&szCurrent);
|
||||
ParseVASection(szCurrent, &szCurrent, mEnd);
|
||||
continue;
|
||||
}
|
||||
// "skeleton\n" - Starts the skeleton section
|
||||
if (TokenMatch(szCurrent,"skeleton",8)) {
|
||||
ParseSkeletonSection(szCurrent,&szCurrent);
|
||||
ParseSkeletonSection(szCurrent, &szCurrent, mEnd);
|
||||
continue;
|
||||
}
|
||||
SkipLine(szCurrent,&szCurrent);
|
||||
SkipLine(szCurrent, &szCurrent, mEnd);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -675,7 +676,7 @@ void SMDImporter::ReadSmd(const std::string &pFile, IOSystem* pIOHandler) {
|
|||
std::unique_ptr<IOStream> file(pIOHandler->Open(pFile, "rb"));
|
||||
|
||||
// Check whether we can read from the file
|
||||
if (file.get() == nullptr) {
|
||||
if (file == nullptr) {
|
||||
throw DeadlyImportError("Failed to open SMD/VTA file ", pFile, ".");
|
||||
}
|
||||
|
||||
|
|
@ -684,6 +685,7 @@ void SMDImporter::ReadSmd(const std::string &pFile, IOSystem* pIOHandler) {
|
|||
// Allocate storage and copy the contents of the file to a memory buffer
|
||||
mBuffer.resize(iFileSize + 1);
|
||||
TextFileToBuffer(file.get(), mBuffer);
|
||||
mEnd = &mBuffer[mBuffer.size() - 1] + 1;
|
||||
|
||||
iSmallestFrame = INT_MAX;
|
||||
bHasUVs = true;
|
||||
|
|
@ -724,26 +726,26 @@ unsigned int SMDImporter::GetTextureIndex(const std::string& filename) {
|
|||
|
||||
// ------------------------------------------------------------------------------------------------
|
||||
// Parse the nodes section of the file
|
||||
void SMDImporter::ParseNodesSection(const char* szCurrent, const char** szCurrentOut) {
|
||||
void SMDImporter::ParseNodesSection(const char* szCurrent, const char** szCurrentOut, const char *end) {
|
||||
for ( ;; ) {
|
||||
// "end\n" - Ends the nodes section
|
||||
if (0 == ASSIMP_strincmp(szCurrent,"end",3) && IsSpaceOrNewLine(*(szCurrent+3))) {
|
||||
if (0 == ASSIMP_strincmp(szCurrent, "end", 3) && IsSpaceOrNewLine(*(szCurrent+3))) {
|
||||
szCurrent += 4;
|
||||
break;
|
||||
}
|
||||
ParseNodeInfo(szCurrent,&szCurrent);
|
||||
ParseNodeInfo(szCurrent,&szCurrent, end);
|
||||
}
|
||||
SkipSpacesAndLineEnd(szCurrent,&szCurrent);
|
||||
SkipSpacesAndLineEnd(szCurrent, &szCurrent, end);
|
||||
*szCurrentOut = szCurrent;
|
||||
}
|
||||
|
||||
// ------------------------------------------------------------------------------------------------
|
||||
// Parse the triangles section of the file
|
||||
void SMDImporter::ParseTrianglesSection(const char* szCurrent, const char** szCurrentOut) {
|
||||
void SMDImporter::ParseTrianglesSection(const char *szCurrent, const char **szCurrentOut, const char *end) {
|
||||
// Parse a triangle, parse another triangle, parse the next triangle ...
|
||||
// and so on until we reach a token that looks quite similar to "end"
|
||||
for ( ;; ) {
|
||||
if(!SkipSpacesAndLineEnd(szCurrent,&szCurrent)) {
|
||||
if(!SkipSpacesAndLineEnd(szCurrent,&szCurrent, end)) {
|
||||
break;
|
||||
}
|
||||
|
||||
|
|
@ -751,17 +753,17 @@ void SMDImporter::ParseTrianglesSection(const char* szCurrent, const char** szCu
|
|||
if (TokenMatch(szCurrent,"end",3)) {
|
||||
break;
|
||||
}
|
||||
ParseTriangle(szCurrent,&szCurrent);
|
||||
ParseTriangle(szCurrent,&szCurrent, end);
|
||||
}
|
||||
SkipSpacesAndLineEnd(szCurrent,&szCurrent);
|
||||
SkipSpacesAndLineEnd(szCurrent,&szCurrent, end);
|
||||
*szCurrentOut = szCurrent;
|
||||
}
|
||||
// ------------------------------------------------------------------------------------------------
|
||||
// Parse the vertex animation section of the file
|
||||
void SMDImporter::ParseVASection(const char* szCurrent, const char** szCurrentOut) {
|
||||
void SMDImporter::ParseVASection(const char *szCurrent, const char **szCurrentOut, const char *end) {
|
||||
unsigned int iCurIndex = 0;
|
||||
for ( ;; ) {
|
||||
if (!SkipSpacesAndLineEnd(szCurrent,&szCurrent)) {
|
||||
if (!SkipSpacesAndLineEnd(szCurrent,&szCurrent, end)) {
|
||||
break;
|
||||
}
|
||||
|
||||
|
|
@ -775,10 +777,10 @@ void SMDImporter::ParseVASection(const char* szCurrent, const char** szCurrentOu
|
|||
// NOTE: The doc says that time values COULD be negative ...
|
||||
// NOTE2: this is the shape key -> valve docs
|
||||
int iTime = 0;
|
||||
if(!ParseSignedInt(szCurrent,&szCurrent,iTime) || configFrameID != (unsigned int)iTime) {
|
||||
if (!ParseSignedInt(szCurrent, &szCurrent, end, iTime) || configFrameID != (unsigned int)iTime) {
|
||||
break;
|
||||
}
|
||||
SkipLine(szCurrent,&szCurrent);
|
||||
SkipLine(szCurrent,&szCurrent, end);
|
||||
} else {
|
||||
if(0 == iCurIndex) {
|
||||
asTriangles.emplace_back();
|
||||
|
|
@ -786,7 +788,7 @@ void SMDImporter::ParseVASection(const char* szCurrent, const char** szCurrentOu
|
|||
if (++iCurIndex == 3) {
|
||||
iCurIndex = 0;
|
||||
}
|
||||
ParseVertex(szCurrent,&szCurrent,asTriangles.back().avVertices[iCurIndex],true);
|
||||
ParseVertex(szCurrent,&szCurrent, end, asTriangles.back().avVertices[iCurIndex],true);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -795,16 +797,16 @@ void SMDImporter::ParseVASection(const char* szCurrent, const char** szCurrentOu
|
|||
asTriangles.pop_back();
|
||||
}
|
||||
|
||||
SkipSpacesAndLineEnd(szCurrent,&szCurrent);
|
||||
SkipSpacesAndLineEnd(szCurrent,&szCurrent, end);
|
||||
*szCurrentOut = szCurrent;
|
||||
}
|
||||
|
||||
// ------------------------------------------------------------------------------------------------
|
||||
// Parse the skeleton section of the file
|
||||
void SMDImporter::ParseSkeletonSection(const char* szCurrent, const char** szCurrentOut) {
|
||||
void SMDImporter::ParseSkeletonSection(const char *szCurrent, const char **szCurrentOut, const char *end) {
|
||||
int iTime = 0;
|
||||
for ( ;; ) {
|
||||
if (!SkipSpacesAndLineEnd(szCurrent,&szCurrent)) {
|
||||
if (!SkipSpacesAndLineEnd(szCurrent,&szCurrent, end)) {
|
||||
break;
|
||||
}
|
||||
|
||||
|
|
@ -812,15 +814,15 @@ void SMDImporter::ParseSkeletonSection(const char* szCurrent, const char** szCur
|
|||
if (TokenMatch(szCurrent,"end",3)) {
|
||||
break;
|
||||
} else if (TokenMatch(szCurrent,"time",4)) {
|
||||
// "time <n>\n" - Specifies the current animation frame
|
||||
if(!ParseSignedInt(szCurrent,&szCurrent,iTime)) {
|
||||
// "time <n>\n" - Specifies the current animation frame
|
||||
if (!ParseSignedInt(szCurrent, &szCurrent, end, iTime)) {
|
||||
break;
|
||||
}
|
||||
|
||||
iSmallestFrame = std::min(iSmallestFrame,iTime);
|
||||
SkipLine(szCurrent,&szCurrent);
|
||||
SkipLine(szCurrent, &szCurrent, end);
|
||||
} else {
|
||||
ParseSkeletonElement(szCurrent,&szCurrent,iTime);
|
||||
ParseSkeletonElement(szCurrent, &szCurrent, end, iTime);
|
||||
}
|
||||
}
|
||||
*szCurrentOut = szCurrent;
|
||||
|
|
@ -828,17 +830,20 @@ void SMDImporter::ParseSkeletonSection(const char* szCurrent, const char** szCur
|
|||
|
||||
// ------------------------------------------------------------------------------------------------
|
||||
#define SMDI_PARSE_RETURN { \
|
||||
SkipLine(szCurrent,&szCurrent); \
|
||||
SkipLine(szCurrent,&szCurrent, end); \
|
||||
*szCurrentOut = szCurrent; \
|
||||
return; \
|
||||
}
|
||||
// ------------------------------------------------------------------------------------------------
|
||||
// Parse a node line
|
||||
void SMDImporter::ParseNodeInfo(const char* szCurrent, const char** szCurrentOut) {
|
||||
void SMDImporter::ParseNodeInfo(const char *szCurrent, const char **szCurrentOut, const char *end) {
|
||||
unsigned int iBone = 0;
|
||||
SkipSpacesAndLineEnd(szCurrent,&szCurrent);
|
||||
if ( !ParseUnsignedInt(szCurrent,&szCurrent,iBone) || !SkipSpaces(szCurrent,&szCurrent)) {
|
||||
LogErrorNoThrow("Unexpected EOF/EOL while parsing bone index");
|
||||
SkipSpacesAndLineEnd(szCurrent, &szCurrent, end);
|
||||
if ( !ParseUnsignedInt(szCurrent, &szCurrent, end, iBone) || !SkipSpaces(szCurrent,&szCurrent, end)) {
|
||||
throw DeadlyImportError("Unexpected EOF/EOL while parsing bone index");
|
||||
}
|
||||
if (iBone == UINT_MAX) {
|
||||
LogErrorNoThrow("Invalid bone number while parsing bone index");
|
||||
SMDI_PARSE_RETURN;
|
||||
}
|
||||
// add our bone to the list
|
||||
|
|
@ -875,7 +880,7 @@ void SMDImporter::ParseNodeInfo(const char* szCurrent, const char** szCurrentOut
|
|||
szCurrent = szEnd;
|
||||
|
||||
// the only negative bone parent index that could occur is -1 AFAIK
|
||||
if(!ParseSignedInt(szCurrent,&szCurrent,(int&)bone.iParent)) {
|
||||
if(!ParseSignedInt(szCurrent, &szCurrent, end, (int&)bone.iParent)) {
|
||||
LogErrorNoThrow("Unexpected EOF/EOL while parsing bone parent index. Assuming -1");
|
||||
SMDI_PARSE_RETURN;
|
||||
}
|
||||
|
|
@ -886,12 +891,12 @@ void SMDImporter::ParseNodeInfo(const char* szCurrent, const char** szCurrentOut
|
|||
|
||||
// ------------------------------------------------------------------------------------------------
|
||||
// Parse a skeleton element
|
||||
void SMDImporter::ParseSkeletonElement(const char* szCurrent, const char** szCurrentOut,int iTime) {
|
||||
void SMDImporter::ParseSkeletonElement(const char *szCurrent, const char **szCurrentOut, const char *end, int iTime) {
|
||||
aiVector3D vPos;
|
||||
aiVector3D vRot;
|
||||
|
||||
unsigned int iBone = 0;
|
||||
if(!ParseUnsignedInt(szCurrent,&szCurrent,iBone)) {
|
||||
if (!ParseUnsignedInt(szCurrent, &szCurrent, end, iBone)) {
|
||||
ASSIMP_LOG_ERROR("Unexpected EOF/EOL while parsing bone index");
|
||||
SMDI_PARSE_RETURN;
|
||||
}
|
||||
|
|
@ -905,27 +910,27 @@ void SMDImporter::ParseSkeletonElement(const char* szCurrent, const char** szCur
|
|||
SMD::Bone::Animation::MatrixKey& key = bone.sAnim.asKeys.back();
|
||||
|
||||
key.dTime = (double)iTime;
|
||||
if(!ParseFloat(szCurrent,&szCurrent,(float&)vPos.x)) {
|
||||
if(!ParseFloat(szCurrent, &szCurrent, end, (float&)vPos.x)) {
|
||||
LogErrorNoThrow("Unexpected EOF/EOL while parsing bone.pos.x");
|
||||
SMDI_PARSE_RETURN;
|
||||
}
|
||||
if(!ParseFloat(szCurrent,&szCurrent,(float&)vPos.y)) {
|
||||
if(!ParseFloat(szCurrent, &szCurrent, end, (float&)vPos.y)) {
|
||||
LogErrorNoThrow("Unexpected EOF/EOL while parsing bone.pos.y");
|
||||
SMDI_PARSE_RETURN;
|
||||
}
|
||||
if(!ParseFloat(szCurrent,&szCurrent,(float&)vPos.z)) {
|
||||
if(!ParseFloat(szCurrent, &szCurrent, end, (float&)vPos.z)) {
|
||||
LogErrorNoThrow("Unexpected EOF/EOL while parsing bone.pos.z");
|
||||
SMDI_PARSE_RETURN;
|
||||
}
|
||||
if(!ParseFloat(szCurrent,&szCurrent,(float&)vRot.x)) {
|
||||
if(!ParseFloat(szCurrent, &szCurrent, end, (float&)vRot.x)) {
|
||||
LogErrorNoThrow("Unexpected EOF/EOL while parsing bone.rot.x");
|
||||
SMDI_PARSE_RETURN;
|
||||
}
|
||||
if(!ParseFloat(szCurrent,&szCurrent,(float&)vRot.y)) {
|
||||
if(!ParseFloat(szCurrent, &szCurrent, end, (float&)vRot.y)) {
|
||||
LogErrorNoThrow("Unexpected EOF/EOL while parsing bone.rot.y");
|
||||
SMDI_PARSE_RETURN;
|
||||
}
|
||||
if(!ParseFloat(szCurrent,&szCurrent,(float&)vRot.z)) {
|
||||
if(!ParseFloat(szCurrent, &szCurrent, end, (float&)vRot.z)) {
|
||||
LogErrorNoThrow("Unexpected EOF/EOL while parsing bone.rot.z");
|
||||
SMDI_PARSE_RETURN;
|
||||
}
|
||||
|
|
@ -945,11 +950,11 @@ void SMDImporter::ParseSkeletonElement(const char* szCurrent, const char** szCur
|
|||
|
||||
// ------------------------------------------------------------------------------------------------
|
||||
// Parse a triangle
|
||||
void SMDImporter::ParseTriangle(const char* szCurrent, const char** szCurrentOut) {
|
||||
void SMDImporter::ParseTriangle(const char *szCurrent, const char **szCurrentOut, const char *end) {
|
||||
asTriangles.emplace_back();
|
||||
SMD::Face& face = asTriangles.back();
|
||||
|
||||
if(!SkipSpaces(szCurrent,&szCurrent)) {
|
||||
if(!SkipSpaces(szCurrent, &szCurrent, end)) {
|
||||
LogErrorNoThrow("Unexpected EOF/EOL while parsing a triangle");
|
||||
return;
|
||||
}
|
||||
|
|
@ -961,19 +966,19 @@ void SMDImporter::ParseTriangle(const char* szCurrent, const char** szCurrentOut
|
|||
// ... and get the index that belongs to this file name
|
||||
face.iTexture = GetTextureIndex(std::string(szLast,(uintptr_t)szCurrent-(uintptr_t)szLast));
|
||||
|
||||
SkipSpacesAndLineEnd(szCurrent,&szCurrent);
|
||||
SkipSpacesAndLineEnd(szCurrent, &szCurrent, end);
|
||||
|
||||
// load three vertices
|
||||
for (auto &avVertex : face.avVertices) {
|
||||
ParseVertex(szCurrent,&szCurrent, avVertex);
|
||||
ParseVertex(szCurrent, &szCurrent, end, avVertex);
|
||||
}
|
||||
*szCurrentOut = szCurrent;
|
||||
}
|
||||
|
||||
// ------------------------------------------------------------------------------------------------
|
||||
// Parse a float
|
||||
bool SMDImporter::ParseFloat(const char* szCurrent, const char** szCurrentOut, float& out) {
|
||||
if(!SkipSpaces(&szCurrent)) {
|
||||
bool SMDImporter::ParseFloat(const char *szCurrent, const char **szCurrentOut, const char *end, float &out) {
|
||||
if (!SkipSpaces(&szCurrent, end)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
|
|
@ -983,8 +988,8 @@ bool SMDImporter::ParseFloat(const char* szCurrent, const char** szCurrentOut, f
|
|||
|
||||
// ------------------------------------------------------------------------------------------------
|
||||
// Parse an unsigned int
|
||||
bool SMDImporter::ParseUnsignedInt(const char* szCurrent, const char** szCurrentOut, unsigned int& out) {
|
||||
if(!SkipSpaces(&szCurrent)) {
|
||||
bool SMDImporter::ParseUnsignedInt(const char *szCurrent, const char **szCurrentOut, const char *end, unsigned int &out) {
|
||||
if(!SkipSpaces(&szCurrent, end)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
|
|
@ -994,8 +999,8 @@ bool SMDImporter::ParseUnsignedInt(const char* szCurrent, const char** szCurrent
|
|||
|
||||
// ------------------------------------------------------------------------------------------------
|
||||
// Parse a signed int
|
||||
bool SMDImporter::ParseSignedInt(const char* szCurrent, const char** szCurrentOut, int& out) {
|
||||
if(!SkipSpaces(&szCurrent)) {
|
||||
bool SMDImporter::ParseSignedInt(const char *szCurrent, const char **szCurrentOut, const char *end, int &out) {
|
||||
if(!SkipSpaces(&szCurrent, end)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
|
|
@ -1006,37 +1011,37 @@ bool SMDImporter::ParseSignedInt(const char* szCurrent, const char** szCurrentOu
|
|||
// ------------------------------------------------------------------------------------------------
|
||||
// Parse a vertex
|
||||
void SMDImporter::ParseVertex(const char* szCurrent,
|
||||
const char** szCurrentOut, SMD::Vertex& vertex,
|
||||
const char **szCurrentOut, const char *end, SMD::Vertex &vertex,
|
||||
bool bVASection /*= false*/) {
|
||||
if (SkipSpaces(&szCurrent) && IsLineEnd(*szCurrent)) {
|
||||
SkipSpacesAndLineEnd(szCurrent,&szCurrent);
|
||||
return ParseVertex(szCurrent,szCurrentOut,vertex,bVASection);
|
||||
if (SkipSpaces(&szCurrent, end) && IsLineEnd(*szCurrent)) {
|
||||
SkipSpacesAndLineEnd(szCurrent,&szCurrent, end);
|
||||
return ParseVertex(szCurrent, szCurrentOut, end, vertex, bVASection);
|
||||
}
|
||||
if(!ParseSignedInt(szCurrent,&szCurrent,(int&)vertex.iParentNode)) {
|
||||
if(!ParseSignedInt(szCurrent, &szCurrent, end, (int&)vertex.iParentNode)) {
|
||||
LogErrorNoThrow("Unexpected EOF/EOL while parsing vertex.parent");
|
||||
SMDI_PARSE_RETURN;
|
||||
}
|
||||
if(!ParseFloat(szCurrent,&szCurrent,(float&)vertex.pos.x)) {
|
||||
if(!ParseFloat(szCurrent, &szCurrent, end, (float&)vertex.pos.x)) {
|
||||
LogErrorNoThrow("Unexpected EOF/EOL while parsing vertex.pos.x");
|
||||
SMDI_PARSE_RETURN;
|
||||
}
|
||||
if(!ParseFloat(szCurrent,&szCurrent,(float&)vertex.pos.y)) {
|
||||
if(!ParseFloat(szCurrent, &szCurrent, end, (float&)vertex.pos.y)) {
|
||||
LogErrorNoThrow("Unexpected EOF/EOL while parsing vertex.pos.y");
|
||||
SMDI_PARSE_RETURN;
|
||||
}
|
||||
if(!ParseFloat(szCurrent,&szCurrent,(float&)vertex.pos.z)) {
|
||||
if(!ParseFloat(szCurrent, &szCurrent, end, (float&)vertex.pos.z)) {
|
||||
LogErrorNoThrow("Unexpected EOF/EOL while parsing vertex.pos.z");
|
||||
SMDI_PARSE_RETURN;
|
||||
}
|
||||
if(!ParseFloat(szCurrent,&szCurrent,(float&)vertex.nor.x)) {
|
||||
if(!ParseFloat(szCurrent,&szCurrent,end, (float&)vertex.nor.x)) {
|
||||
LogErrorNoThrow("Unexpected EOF/EOL while parsing vertex.nor.x");
|
||||
SMDI_PARSE_RETURN;
|
||||
}
|
||||
if(!ParseFloat(szCurrent,&szCurrent,(float&)vertex.nor.y)) {
|
||||
if(!ParseFloat(szCurrent,&szCurrent, end, (float&)vertex.nor.y)) {
|
||||
LogErrorNoThrow("Unexpected EOF/EOL while parsing vertex.nor.y");
|
||||
SMDI_PARSE_RETURN;
|
||||
}
|
||||
if(!ParseFloat(szCurrent,&szCurrent,(float&)vertex.nor.z)) {
|
||||
if(!ParseFloat(szCurrent, &szCurrent, end, (float&)vertex.nor.z)) {
|
||||
LogErrorNoThrow("Unexpected EOF/EOL while parsing vertex.nor.z");
|
||||
SMDI_PARSE_RETURN;
|
||||
}
|
||||
|
|
@ -1045,11 +1050,11 @@ void SMDImporter::ParseVertex(const char* szCurrent,
|
|||
SMDI_PARSE_RETURN;
|
||||
}
|
||||
|
||||
if(!ParseFloat(szCurrent,&szCurrent,(float&)vertex.uv.x)) {
|
||||
if(!ParseFloat(szCurrent, &szCurrent, end, (float&)vertex.uv.x)) {
|
||||
LogErrorNoThrow("Unexpected EOF/EOL while parsing vertex.uv.x");
|
||||
SMDI_PARSE_RETURN;
|
||||
}
|
||||
if(!ParseFloat(szCurrent,&szCurrent,(float&)vertex.uv.y)) {
|
||||
if(!ParseFloat(szCurrent, &szCurrent, end, (float&)vertex.uv.y)) {
|
||||
LogErrorNoThrow("Unexpected EOF/EOL while parsing vertex.uv.y");
|
||||
SMDI_PARSE_RETURN;
|
||||
}
|
||||
|
|
@ -1057,16 +1062,16 @@ void SMDImporter::ParseVertex(const char* szCurrent,
|
|||
// now read the number of bones affecting this vertex
|
||||
// all elements from now are fully optional, we don't need them
|
||||
unsigned int iSize = 0;
|
||||
if(!ParseUnsignedInt(szCurrent,&szCurrent,iSize)) {
|
||||
if(!ParseUnsignedInt(szCurrent, &szCurrent, end, iSize)) {
|
||||
SMDI_PARSE_RETURN;
|
||||
}
|
||||
vertex.aiBoneLinks.resize(iSize,std::pair<unsigned int, float>(0,0.0f));
|
||||
|
||||
for (auto &aiBoneLink : vertex.aiBoneLinks) {
|
||||
if(!ParseUnsignedInt(szCurrent,&szCurrent,aiBoneLink.first)) {
|
||||
if(!ParseUnsignedInt(szCurrent, &szCurrent, end, aiBoneLink.first)) {
|
||||
SMDI_PARSE_RETURN;
|
||||
}
|
||||
if(!ParseFloat(szCurrent,&szCurrent,aiBoneLink.second)) {
|
||||
if(!ParseFloat(szCurrent, &szCurrent, end, aiBoneLink.second)) {
|
||||
SMDI_PARSE_RETURN;
|
||||
}
|
||||
}
|
||||
|
|
@ -1075,4 +1080,6 @@ void SMDImporter::ParseVertex(const char* szCurrent,
|
|||
SMDI_PARSE_RETURN;
|
||||
}
|
||||
|
||||
} // namespace Assimp
|
||||
|
||||
#endif // !! ASSIMP_BUILD_NO_SMD_IMPORTER
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue