AxioDL/PrimeWorldEditor
2
0
Fork 0
mirror of https://github.com/AxioDL/PrimeWorldEditor.git synced 2025-06-18 12:33:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

CMaterial: Make use of size_t where applicable

Browse Source 
Prevents truncation warnings from occurring.
This commit is contained in:
Lioncash 2020-06-15 13:59:46 -04:00
parent 5b96480a45
commit e7b3015f08
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Core/Resource/CMaterial.cpp
View File

@ -272,15 +272,15 @@ void CMaterial::Update()
mShaderStatus = EShaderStatus::NoShader; mShaderStatus = EShaderStatus::NoShader;
} }
void CMaterial::SetNumPasses(uint32 NumPasses) void CMaterial::SetNumPasses(size_t NumPasses)
{ {
uint32 OldCount = mPasses.size(); const size_t OldCount = mPasses.size();
mPasses.resize(NumPasses); mPasses.resize(NumPasses);
if (NumPasses > OldCount) if (NumPasses > OldCount)
{ {
for (uint32 iPass = OldCount; iPass < NumPasses; iPass++) for (size_t i = OldCount; i < NumPasses; i++)
mPasses[iPass] = std::make_unique<CMaterialPass>(this); mPasses[i] = std::make_unique<CMaterialPass>(this);
} }
mRecalcHash = true; mRecalcHash = true;

12
src/Core/Resource/CMaterial.h
View File

@ -123,7 +123,7 @@ public:
bool SetCurrent(FRenderOptions Options); bool SetCurrent(FRenderOptions Options);
uint64 HashParameters(); uint64 HashParameters();
void Update(); void Update();
void SetNumPasses(uint32 NumPasses); void SetNumPasses(size_t NumPasses);
// Accessors // Accessors
TString Name() const { return mName; } TString Name() const { return mName; }
@ -132,14 +132,14 @@ public:
FVertexDescription VtxDesc() const { return mVtxDesc; } FVertexDescription VtxDesc() const { return mVtxDesc; }
GLenum BlendSrcFac() const { return mBlendSrcFac; } GLenum BlendSrcFac() const { return mBlendSrcFac; }
GLenum BlendDstFac() const { return mBlendDstFac; } GLenum BlendDstFac() const { return mBlendDstFac; }
CColor Konst(uint32 KIndex) const { return mKonstColors[KIndex]; } CColor Konst(size_t KIndex) const { return mKonstColors[KIndex]; }
CColor TevColor(ETevOutput Out) const { return mTevColors[int(Out)]; } CColor TevColor(ETevOutput Out) const { return mTevColors[static_cast<size_t>(Out)]; }
CTexture* IndTexture() const { return mpIndirectTexture; } CTexture* IndTexture() const { return mpIndirectTexture; }
bool IsLightingEnabled() const { return mLightingEnabled; } bool IsLightingEnabled() const { return mLightingEnabled; }
uint32 EchoesUnknownA() const { return mEchoesUnknownA; } uint32 EchoesUnknownA() const { return mEchoesUnknownA; }
uint32 EchoesUnknownB() const { return mEchoesUnknownB; } uint32 EchoesUnknownB() const { return mEchoesUnknownB; }
uint32 PassCount() const { return mPasses.size(); } uint32 PassCount() const { return mPasses.size(); }
CMaterialPass* Pass(uint32 PassIndex) const { return mPasses[PassIndex].get(); } CMaterialPass* Pass(size_t PassIndex) const { return mPasses[PassIndex].get(); }
CMaterial* GetNextDrawPass() const { return mpNextDrawPassMaterial.get(); } CMaterial* GetNextDrawPass() const { return mpNextDrawPassMaterial.get(); }
CMaterial* GetBloomVersion() const { return mpBloomMaterial.get(); } CMaterial* GetBloomVersion() const { return mpBloomMaterial.get(); }
@ -147,8 +147,8 @@ public:
void SetOptions(FMaterialOptions Options) { mOptions = Options; Update(); } void SetOptions(FMaterialOptions Options) { mOptions = Options; Update(); }
void SetVertexDescription(FVertexDescription Desc) { mVtxDesc = Desc; Update(); } void SetVertexDescription(FVertexDescription Desc) { mVtxDesc = Desc; Update(); }
void SetBlendMode(GLenum SrcFac, GLenum DstFac) { mBlendSrcFac = SrcFac; mBlendDstFac = DstFac; mRecalcHash = true; } void SetBlendMode(GLenum SrcFac, GLenum DstFac) { mBlendSrcFac = SrcFac; mBlendDstFac = DstFac; mRecalcHash = true; }
void SetKonst(const CColor& Konst, uint32 KIndex) { mKonstColors[KIndex] = Konst; Update(); } void SetKonst(const CColor& Konst, size_t KIndex) { mKonstColors[KIndex] = Konst; Update(); }
void SetTevColor(const CColor& Color, ETevOutput Out) { mTevColors[int(Out)] = Color; } void SetTevColor(const CColor& Color, ETevOutput Out) { mTevColors[static_cast<size_t>(Out)] = Color; }
void SetIndTexture(CTexture *pTex) { mpIndirectTexture = pTex; } void SetIndTexture(CTexture *pTex) { mpIndirectTexture = pTex; }
void SetLightingEnabled(bool Enabled) { mLightingEnabled = Enabled; Update(); } void SetLightingEnabled(bool Enabled) { mLightingEnabled = Enabled; Update(); }