mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-07-11 22:54:34 +00:00
update assimp lib
This commit is contained in:
parent
03a348deb7
commit
d3f8fee74e
1725 changed files with 196314 additions and 62009 deletions
|
|
@ -2,7 +2,7 @@
|
|||
Open Asset Import Library (assimp)
|
||||
----------------------------------------------------------------------
|
||||
|
||||
Copyright (c) 2006-2022, assimp team
|
||||
Copyright (c) 2006-2024, assimp team
|
||||
|
||||
All rights reserved.
|
||||
|
||||
|
|
@ -87,10 +87,10 @@ struct Vertex {
|
|||
*/
|
||||
struct Face {
|
||||
Face() AI_NO_EXCEPT :
|
||||
iTexture(0x0), avVertices{} {
|
||||
iTexture(0x0) {
|
||||
// empty
|
||||
}
|
||||
|
||||
|
||||
//! Texture index for the face
|
||||
unsigned int iTexture;
|
||||
|
||||
|
|
@ -162,7 +162,7 @@ struct Bone {
|
|||
class ASSIMP_API SMDImporter : public BaseImporter {
|
||||
public:
|
||||
SMDImporter();
|
||||
~SMDImporter() override;
|
||||
~SMDImporter() override = default;
|
||||
|
||||
// -------------------------------------------------------------------
|
||||
/** Returns whether the class can handle the format of the given file.
|
||||
|
|
@ -206,7 +206,7 @@ protected:
|
|||
* the next section (or to EOF)
|
||||
*/
|
||||
void ParseTrianglesSection(const char* szCurrent,
|
||||
const char** szCurrentOut);
|
||||
const char **szCurrentOut, const char *end);
|
||||
|
||||
// -------------------------------------------------------------------
|
||||
/** Parse the vertex animation section in VTA files
|
||||
|
|
@ -216,7 +216,7 @@ protected:
|
|||
* the next section (or to EOF)
|
||||
*/
|
||||
void ParseVASection(const char* szCurrent,
|
||||
const char** szCurrentOut);
|
||||
const char **szCurrentOu, const char *end);
|
||||
|
||||
// -------------------------------------------------------------------
|
||||
/** Parse the nodes section of the SMD file
|
||||
|
|
@ -226,7 +226,7 @@ protected:
|
|||
* the next section (or to EOF)
|
||||
*/
|
||||
void ParseNodesSection(const char* szCurrent,
|
||||
const char** szCurrentOut);
|
||||
const char **szCurrentOut, const char *end);
|
||||
|
||||
// -------------------------------------------------------------------
|
||||
/** Parse the skeleton section of the SMD file
|
||||
|
|
@ -236,7 +236,7 @@ protected:
|
|||
* the next section (or to EOF)
|
||||
*/
|
||||
void ParseSkeletonSection(const char* szCurrent,
|
||||
const char** szCurrentOut);
|
||||
const char **szCurrentOut, const char *end);
|
||||
|
||||
// -------------------------------------------------------------------
|
||||
/** Parse a single triangle in the SMD file
|
||||
|
|
@ -245,8 +245,7 @@ protected:
|
|||
* \param szCurrentOut Receives the output cursor position
|
||||
*/
|
||||
void ParseTriangle(const char* szCurrent,
|
||||
const char** szCurrentOut);
|
||||
|
||||
const char **szCurrentOut, const char *end);
|
||||
|
||||
// -------------------------------------------------------------------
|
||||
/** Parse a single vertex in the SMD file
|
||||
|
|
@ -256,7 +255,7 @@ protected:
|
|||
* \param vertex Vertex to be filled
|
||||
*/
|
||||
void ParseVertex(const char* szCurrent,
|
||||
const char** szCurrentOut, SMD::Vertex& vertex,
|
||||
const char **szCurrentOut, const char *end, SMD::Vertex &vertex,
|
||||
bool bVASection = false);
|
||||
|
||||
// -------------------------------------------------------------------
|
||||
|
|
@ -271,32 +270,31 @@ protected:
|
|||
/** Parse a line in the skeleton section
|
||||
*/
|
||||
void ParseSkeletonElement(const char* szCurrent,
|
||||
const char** szCurrentOut,int iTime);
|
||||
const char **szCurrentOut, const char *end, int iTime);
|
||||
|
||||
// -------------------------------------------------------------------
|
||||
/** Parse a line in the nodes section
|
||||
*/
|
||||
void ParseNodeInfo(const char* szCurrent,
|
||||
const char** szCurrentOut);
|
||||
|
||||
const char **szCurrentOut, const char *end);
|
||||
|
||||
// -------------------------------------------------------------------
|
||||
/** Parse a floating-point value
|
||||
*/
|
||||
bool ParseFloat(const char* szCurrent,
|
||||
const char** szCurrentOut, float& out);
|
||||
const char **szCurrentOut, const char *end, float &out);
|
||||
|
||||
// -------------------------------------------------------------------
|
||||
/** Parse an unsigned integer. There may be no sign!
|
||||
*/
|
||||
bool ParseUnsignedInt(const char* szCurrent,
|
||||
const char** szCurrentOut, unsigned int& out);
|
||||
const char **szCurrentOut, const char *end, unsigned int &out);
|
||||
|
||||
// -------------------------------------------------------------------
|
||||
/** Parse a signed integer. Signs (+,-) are handled.
|
||||
*/
|
||||
bool ParseSignedInt(const char* szCurrent,
|
||||
const char** szCurrentOut, int& out);
|
||||
const char **szCurrentOut, const char *end, int &out);
|
||||
|
||||
// -------------------------------------------------------------------
|
||||
/** Fix invalid time values in the file
|
||||
|
|
@ -304,7 +302,7 @@ protected:
|
|||
void FixTimeValues();
|
||||
|
||||
// -------------------------------------------------------------------
|
||||
/** Add all children of a bone as subnodes to a node
|
||||
/** Add all children of a bone as sub-nodes to a node
|
||||
* \param pcNode Parent node
|
||||
* \param iParent Parent bone index
|
||||
*/
|
||||
|
|
@ -329,17 +327,15 @@ protected:
|
|||
|
||||
|
||||
// -------------------------------------------------------------------
|
||||
inline bool SkipLine( const char* in, const char** out)
|
||||
{
|
||||
Assimp::SkipLine(in,out);
|
||||
inline bool SkipLine( const char* in, const char** out, const char *end) {
|
||||
Assimp::SkipLine(in, out, end);
|
||||
++iLineNumber;
|
||||
return true;
|
||||
}
|
||||
// -------------------------------------------------------------------
|
||||
inline bool SkipSpacesAndLineEnd( const char* in, const char** out)
|
||||
{
|
||||
inline bool SkipSpacesAndLineEnd(const char *in, const char **out, const char *end) {
|
||||
++iLineNumber;
|
||||
return Assimp::SkipSpacesAndLineEnd(in,out);
|
||||
return Assimp::SkipSpacesAndLineEnd(in, out, end);
|
||||
}
|
||||
|
||||
private:
|
||||
|
|
@ -349,6 +345,7 @@ private:
|
|||
|
||||
/** Buffer to hold the loaded file */
|
||||
std::vector<char> mBuffer;
|
||||
char *mEnd;
|
||||
|
||||
/** Output scene to be filled
|
||||
*/
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue