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

48
Engine/lib/assimp/code/MDLFileData.h
View file

@ -2,8 +2,7 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
Copyright (c) 2006-2018, assimp team
Copyright (c) 2006-2017, assimp team
All rights reserved.
@ -57,7 +56,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <assimp/anim.h>
#include <assimp/mesh.h>
#include <assimp/Compiler/pushpack1.h>
#include <assimp/ByteSwapper.h>
#include "ByteSwapper.h"
#include <stdint.h>
#include <vector>
@ -709,7 +708,7 @@ struct GroupFrame
SimpleFrame *frames;
} PACK_STRUCT;
#include <assimp/Compiler/poppack1.h>
#include "./../include/assimp/Compiler/poppack1.h"
// -------------------------------------------------------------------------------------
/** \struct IntFace_MDL7
@ -717,9 +716,11 @@ struct GroupFrame
*/
struct IntFace_MDL7 {
// provide a constructor for our own convenience
IntFace_MDL7() AI_NO_EXCEPT {
::memset( mIndices, 0, sizeof(uint32_t) *3);
::memset( iMatIndex, 0, sizeof( unsigned int) *2);
IntFace_MDL7()
{
// set everything to zero
mIndices[0] = mIndices[1] = mIndices[2] = 0;
iMatIndex[0] = iMatIndex[1] = 0;
}
//! Vertex indices
@ -735,11 +736,13 @@ struct IntFace_MDL7 {
* which has been created from two single materials along with the
* original material indices.
*/
struct IntMaterial_MDL7 {
struct IntMaterial_MDL7
{
// provide a constructor for our own convenience
IntMaterial_MDL7() AI_NO_EXCEPT
: pcMat( nullptr ) {
::memset( iOldMatIndices, 0, sizeof(unsigned int) *2);
IntMaterial_MDL7()
{
pcMat = NULL;
iOldMatIndices[0] = iOldMatIndices[1] = 0;
}
//! Material instance
@ -757,7 +760,7 @@ struct IntMaterial_MDL7 {
struct IntBone_MDL7 : aiBone
{
//! Default constructor
IntBone_MDL7() AI_NO_EXCEPT : iParent (0xffff)
IntBone_MDL7() : iParent (0xffff)
{
pkeyPositions.reserve(30);
pkeyScalings.reserve(30);
@ -802,12 +805,12 @@ struct IntFrameInfo_MDL7
struct IntGroupInfo_MDL7
{
//! Default constructor
IntGroupInfo_MDL7() AI_NO_EXCEPT
IntGroupInfo_MDL7()
: iIndex(0)
, pcGroup(nullptr)
, pcGroupUVs(nullptr)
, pcGroupTris(nullptr)
, pcGroupVerts(nullptr)
, pcGroup(NULL)
, pcGroupUVs(NULL)
, pcGroupTris(NULL)
, pcGroupVerts(NULL)
{}
//! Construction from an existing group header
@ -839,12 +842,12 @@ struct IntGroupInfo_MDL7
//! Holds the data that belongs to a MDL7 mesh group
struct IntGroupData_MDL7
{
IntGroupData_MDL7() AI_NO_EXCEPT
: bNeed2UV(false)
IntGroupData_MDL7()
: pcFaces(NULL), bNeed2UV(false)
{}
//! Array of faces that belong to the group
std::vector<MDL::IntFace_MDL7> pcFaces;
MDL::IntFace_MDL7* pcFaces;
//! Array of vertex positions
std::vector<aiVector3D> vPositions;
@ -868,9 +871,10 @@ struct IntGroupData_MDL7
// -------------------------------------------------------------------------------------
//! Holds data from an MDL7 file that is shared by all mesh groups
struct IntSharedData_MDL7 {
struct IntSharedData_MDL7
{
//! Default constructor
IntSharedData_MDL7() AI_NO_EXCEPT
IntSharedData_MDL7()
: apcOutBones(),
iNum()
{