AxioDL
/
PrimeWorldEditor
mirror of https://github.com/AxioDL/PrimeWorldEditor.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MP1 material fix after MP3 refactor

This commit is contained in:
Jack Andersen 2019-11-16 15:42:36 -10:00
parent dfc9d1ddb0
commit 8ad13ff4c9
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Core/Resource/CMaterialPass.cpp
View File

@ -79,8 +79,8 @@ void CMaterialPass::HashParameters(CFNV1A& rHash)
rHash.HashLong(mKColorSel); rHash.HashLong(mKColorSel);
rHash.HashLong(mKAlphaSel); rHash.HashLong(mKAlphaSel);
rHash.HashLong(mRasSel); rHash.HashLong(mRasSel);
rHash.HashLong(mTevColorScale); rHash.HashFloat(mTevColorScale);
rHash.HashLong(mTevAlphaScale); rHash.HashFloat(mTevAlphaScale);
rHash.HashLong(mTexCoordSource); rHash.HashLong(mTexCoordSource);
rHash.HashLong((uint) mAnimMode); rHash.HashLong((uint) mAnimMode);
rHash.HashData(mAnimParams, sizeof(float) * 8); rHash.HashData(mAnimParams, sizeof(float) * 8);

1
src/Core/Resource/Factory/CMaterialLoader.cpp
View File

@ -75,6 +75,7 @@ CMaterial* CMaterialLoader::ReadPrimeMaterial()
// Flags // Flags
pMat->mOptions = (mpFile->ReadLong() & (uint) EMaterialOption::AllMP1Settings); pMat->mOptions = (mpFile->ReadLong() & (uint) EMaterialOption::AllMP1Settings);
pMat->mOptions.SetFlag(EMaterialOption::ColorWrite);
// Textures // Textures
uint32 NumTextures = mpFile->ReadLong(); uint32 NumTextures = mpFile->ReadLong();

2
src/Core/Resource/Factory/CMaterialLoader.h
View File

@ -8,6 +8,8 @@
#include <Common/FileIO.h> #include <Common/FileIO.h>
#include <assimp/scene.h> #include <assimp/scene.h>
#include <optional>
enum class EMP3RenderConfig enum class EMP3RenderConfig
{ {
NoBloomTransparent, NoBloomTransparent,