v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[3393728] [PATCH 2/2] renamed MDL::IntSplittedGroupData_MDL7 to MDL::IntSplitGroupData_MDL7 

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1065 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
pull/2/head
aramis_acg 2011-08-20 22:01:46 +00:00
parent 2ffac898d6
commit 9f32504792
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
code/MDLFileData.h
View File

@ -920,10 +920,10 @@ struct IntSharedData_MDL7
// ------------------------------------------------------------------------------------- // -------------------------------------------------------------------------------------
//! Contains input data for GenerateOutputMeshes_3DGS_MDL7 //! Contains input data for GenerateOutputMeshes_3DGS_MDL7
struct IntSplittedGroupData_MDL7 struct IntSplitGroupData_MDL7
{ {
//! Construction from a given shared data set //! Construction from a given shared data set
IntSplittedGroupData_MDL7(IntSharedData_MDL7& _shared, IntSplitGroupData_MDL7(IntSharedData_MDL7& _shared,
std::vector<aiMesh*>& _avOutList) std::vector<aiMesh*>& _avOutList)
: shared(_shared), avOutList(_avOutList) : shared(_shared), avOutList(_avOutList)
@ -931,7 +931,7 @@ struct IntSplittedGroupData_MDL7
} }
//! Destruction: properly delete all allocated resources //! Destruction: properly delete all allocated resources
~IntSplittedGroupData_MDL7() ~IntSplitGroupData_MDL7()
{ {
// kill all face lists // kill all face lists
if(this->aiSplit) if(this->aiSplit)

6
code/MDLLoader.cpp
View File

@ -1193,7 +1193,7 @@ bool MDLImporter::ProcessFrames_3DGS_MDL7(const MDL::IntGroupInfo_MDL7& groupInf
void MDLImporter::SortByMaterials_3DGS_MDL7( void MDLImporter::SortByMaterials_3DGS_MDL7(
const MDL::IntGroupInfo_MDL7& groupInfo, const MDL::IntGroupInfo_MDL7& groupInfo,
MDL::IntGroupData_MDL7& groupData, MDL::IntGroupData_MDL7& groupData,
MDL::IntSplittedGroupData_MDL7& splitGroupData) MDL::IntSplitGroupData_MDL7& splitGroupData)
{ {
const unsigned int iNumMaterials = (unsigned int)splitGroupData.shared.pcMats.size(); const unsigned int iNumMaterials = (unsigned int)splitGroupData.shared.pcMats.size();
if (!groupData.bNeed2UV) { if (!groupData.bNeed2UV) {
@ -1438,7 +1438,7 @@ void MDLImporter::InternReadFile_3DGS_MDL7( )
szCurrent += pcHeader->mainvertex_stc_size * groupInfo.pcGroup->numverts; szCurrent += pcHeader->mainvertex_stc_size * groupInfo.pcGroup->numverts;
VALIDATE_FILE_SIZE(szCurrent); VALIDATE_FILE_SIZE(szCurrent);
MDL::IntSplittedGroupData_MDL7 splitGroupData(sharedData,avOutList[iGroup]); MDL::IntSplitGroupData_MDL7 splitGroupData(sharedData,avOutList[iGroup]);
MDL::IntGroupData_MDL7 groupData; MDL::IntGroupData_MDL7 groupData;
if (groupInfo.pcGroup->numtris && groupInfo.pcGroup->numverts) if (groupInfo.pcGroup->numtris && groupInfo.pcGroup->numverts)
{ {
@ -1773,7 +1773,7 @@ void MDLImporter::AddAnimationBoneTrafoKey_3DGS_MDL7(unsigned int iTrafo,
// Construct output meshes // Construct output meshes
void MDLImporter::GenerateOutputMeshes_3DGS_MDL7( void MDLImporter::GenerateOutputMeshes_3DGS_MDL7(
MDL::IntGroupData_MDL7& groupData, MDL::IntGroupData_MDL7& groupData,
MDL::IntSplittedGroupData_MDL7& splitGroupData) MDL::IntSplitGroupData_MDL7& splitGroupData)
{ {
const MDL::IntSharedData_MDL7& shared = splitGroupData.shared; const MDL::IntSharedData_MDL7& shared = splitGroupData.shared;

4
code/MDLLoader.h
View File

@ -406,7 +406,7 @@ protected:
void SortByMaterials_3DGS_MDL7( void SortByMaterials_3DGS_MDL7(
const MDL::IntGroupInfo_MDL7& groupInfo, const MDL::IntGroupInfo_MDL7& groupInfo,
MDL::IntGroupData_MDL7& groupData, MDL::IntGroupData_MDL7& groupData,
MDL::IntSplittedGroupData_MDL7& splitGroupData); MDL::IntSplitGroupData_MDL7& splitGroupData);
// ------------------------------------------------------------------- // -------------------------------------------------------------------
/** Read all faces and vertices from a MDL7 group. The function fills /** Read all faces and vertices from a MDL7 group. The function fills
@ -424,7 +424,7 @@ protected:
*/ */
void GenerateOutputMeshes_3DGS_MDL7( void GenerateOutputMeshes_3DGS_MDL7(
MDL::IntGroupData_MDL7& groupData, MDL::IntGroupData_MDL7& groupData,
MDL::IntSplittedGroupData_MDL7& splitGroupData); MDL::IntSplitGroupData_MDL7& splitGroupData);
protected: protected: