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

CMaterialPass: Make use of size_t where applicable 

Plays nicer with standard types.
This commit is contained in:
Lioncash 2020-06-15 14:07:06 -04:00
parent b90bd90e03
commit 95f6c3360d
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -64,7 +64,7 @@ void CMaterialPass::LoadTexture(uint32 PassIndex)
mpTexture->Bind(PassIndex); mpTexture->Bind(PassIndex);
} }
void CMaterialPass::SetAnimCurrent(FRenderOptions Options, uint32 PassIndex) void CMaterialPass::SetAnimCurrent(FRenderOptions Options, size_t PassIndex)
{ {
if (mAnimMode == EUVAnimMode::NoUVAnim) return; if (mAnimMode == EUVAnimMode::NoUVAnim) return;
@ -304,12 +304,12 @@ void CMaterialPass::SetAnimMode(EUVAnimMode Mode)
mpParentMat->Update(); mpParentMat->Update();
} }
void CMaterialPass::SetAnimParam(uint32 ParamIndex, float Value) void CMaterialPass::SetAnimParam(size_t ParamIndex, float Value)
{ {
mAnimParams[ParamIndex] = Value; mAnimParams[ParamIndex] = Value;
} }
void CMaterialPass::SetTexSwapComp(uint32 Comp, char Value) void CMaterialPass::SetTexSwapComp(size_t Comp, char Value)
{ {
mTexSwapComps[Comp] = Value; mTexSwapComps[Comp] = Value;
} }

14
src/Core/Resource/CMaterialPass.h
View File

@ -52,7 +52,7 @@ public:
std::unique_ptr<CMaterialPass> Clone(CMaterial *pParent) const; std::unique_ptr<CMaterialPass> Clone(CMaterial *pParent) const;
void HashParameters(CFNV1A& rHash); void HashParameters(CFNV1A& rHash);
void LoadTexture(uint32 PassIndex); void LoadTexture(uint32 PassIndex);
void SetAnimCurrent(FRenderOptions Options, uint32 PassIndex); void SetAnimCurrent(FRenderOptions Options, size_t PassIndex);
// Setters // Setters
void SetType(CFourCC Type); void SetType(CFourCC Type);
@ -68,15 +68,15 @@ public:
void SetTexCoordSource(uint32 Source); void SetTexCoordSource(uint32 Source);
void SetTexture(CTexture *pTex); void SetTexture(CTexture *pTex);
void SetAnimMode(EUVAnimMode Mode); void SetAnimMode(EUVAnimMode Mode);
void SetAnimParam(uint32 ParamIndex, float Value); void SetAnimParam(size_t ParamIndex, float Value);
void SetTexSwapComp(uint32 Comp, char Value); void SetTexSwapComp(size_t Comp, char Value);
void SetEnabled(bool Enabled); void SetEnabled(bool Enabled);
// Getters // Getters
CFourCC Type() const { return mPassType; } CFourCC Type() const { return mPassType; }
TString NamedType() const { return PassTypeName(mPassType); } TString NamedType() const { return PassTypeName(mPassType); }
ETevColorInput ColorInput(uint32 Input) const { return mColorInputs[Input]; } ETevColorInput ColorInput(size_t Input) const { return mColorInputs[Input]; }
ETevAlphaInput AlphaInput(uint32 Input) const { return mAlphaInputs[Input]; } ETevAlphaInput AlphaInput(size_t Input) const { return mAlphaInputs[Input]; }
ETevOutput ColorOutput() const { return mColorOutput; } ETevOutput ColorOutput() const { return mColorOutput; }
ETevOutput AlphaOutput() const { return mAlphaOutput; } ETevOutput AlphaOutput() const { return mAlphaOutput; }
ETevKSel KColorSel() const { return mKColorSel; } ETevKSel KColorSel() const { return mKColorSel; }
@ -87,8 +87,8 @@ public:
uint32 TexCoordSource() const { return mTexCoordSource; } uint32 TexCoordSource() const { return mTexCoordSource; }
CTexture* Texture() const { return mpTexture; } CTexture* Texture() const { return mpTexture; }
EUVAnimMode AnimMode() const { return mAnimMode; } EUVAnimMode AnimMode() const { return mAnimMode; }
float AnimParam(uint32 ParamIndex) const { return mAnimParams[ParamIndex]; } float AnimParam(size_t ParamIndex) const { return mAnimParams[ParamIndex]; }
char TexSwapComp(uint32 Comp) const { return mTexSwapComps[Comp]; } char TexSwapComp(size_t Comp) const { return mTexSwapComps[Comp]; }
bool IsEnabled() const { return mEnabled; } bool IsEnabled() const { return mEnabled; }
// Static // Static