AxioDL/PrimeWorldEditor
2
0
Fork 0
mirror of https://github.com/AxioDL/PrimeWorldEditor.git synced 2025-12-21 10:49:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added interface for importing models in the Model Editor + fixed bugs

Browse Source
This commit is contained in:
parax0
2015-08-10 21:42:50 -04:00
parent 2967a483d9
commit 4d7774f19e
7 changed files with 130 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Resource/factory/CMaterialLoader.cpp
View File

@@ -39,7 +39,7 @@ void CMaterialLoader::ReadPrimeMatSet()
{
mpSet->mMaterials[iMat] = ReadPrimeMaterial();
mpSet->mMaterials[iMat]->mVersion = mVersion;
mpSet->mMaterials[iMat]->mName = std::string("Material #") + std::to_string(iMat);
mpSet->mMaterials[iMat]->mName = std::string("Material #") + std::to_string(iMat + 1);
mpFile->Seek(matsStart + offsets[iMat], SEEK_SET);
}
}
@@ -240,7 +240,7 @@ void CMaterialLoader::ReadCorruptionMatSet()
u32 Next = mpFile->Tell() + Size;
mpSet->mMaterials[iMat] = ReadCorruptionMaterial();
mpSet->mMaterials[iMat]->mVersion = mVersion;
mpSet->mMaterials[iMat]->mName = std::string("Material #") + std::to_string(iMat);
mpSet->mMaterials[iMat]->mName = std::string("Material #") + std::to_string(iMat + 1);
mpFile->Seek(Next, SEEK_SET);
}
}
@@ -581,6 +581,10 @@ CMaterial* CMaterialLoader::LoadAssimpMaterial(const aiMaterial *pAiMat)
// todo: generate new material using import values.
CMaterial *pMat = new CMaterial(mVersion, eNoAttributes);
aiString name;
pAiMat->Get(AI_MATKEY_NAME, name);
pMat->SetName(name.C_Str());
// Create generic custom pass that uses Konst color
CMaterialPass *pPass = new CMaterialPass(pMat);
pPass->SetColorInputs(eZeroRGB, eRasRGB, eKonstRGB, eZeroRGB);