From 34c32cd7d715b4b530182424bf7cd3c94e1528ad Mon Sep 17 00:00:00 2001 From: Briggs Baltzell Date: Thu, 5 Mar 2026 13:42:04 -0600 Subject: [PATCH] Refactor `mColor1`/`mColor2` to `mClothColor`/`mShadowColor` for improved clarity in `d_menu_cloth` and update all related logic. --- include/d/d_menu_cloth.h | 4 ++-- src/d/d_menu_cloth.cpp | 44 ++++++++++++++++++++-------------------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/include/d/d_menu_cloth.h b/include/d/d_menu_cloth.h index d8af8fddb..1ceca2448 100644 --- a/include/d/d_menu_cloth.h +++ b/include/d/d_menu_cloth.h @@ -75,8 +75,8 @@ public: /* 0x9140 */ cXyz mScale; /* 0x914C */ u8 field_0x914C[0x9158 - 0x914C]; /* 0x9158 */ csXyz mRot; - /* 0x915E */ GXColor mColor1; - /* 0x9162 */ GXColor mColor2; + /* 0x915E */ GXColor mClothColor; + /* 0x9162 */ GXColor mShadowColor; }; class daCLOTH_ChildHIO_c { diff --git a/src/d/d_menu_cloth.cpp b/src/d/d_menu_cloth.cpp index 90f337374..3e1ffa1f5 100644 --- a/src/d/d_menu_cloth.cpp +++ b/src/d/d_menu_cloth.cpp @@ -191,15 +191,15 @@ void dMCloth_c::cloth_init() { DCStoreRangeNoSync(mNrmArr[mCurArr], 0x5AC); DCStoreRangeNoSync(mBackNrmArr, 0x5AC); - mColor1.r = (u8)HIO_CHILD.clothColor.r; - mColor1.g = (u8)HIO_CHILD.clothColor.g; - mColor1.b = (u8)HIO_CHILD.clothColor.b; - mColor1.a = (u8)HIO_CHILD.clothColor.a; + mClothColor.r = (u8)HIO_CHILD.clothColor.r; + mClothColor.g = (u8)HIO_CHILD.clothColor.g; + mClothColor.b = (u8)HIO_CHILD.clothColor.b; + mClothColor.a = (u8)HIO_CHILD.clothColor.a; - mColor2.r = (u8)HIO_CHILD.shadowColor.r; - mColor2.g = (u8)HIO_CHILD.shadowColor.g; - mColor2.b = (u8)HIO_CHILD.shadowColor.b; - mColor2.a = (u8)HIO_CHILD.shadowColor.a; + mShadowColor.r = (u8)HIO_CHILD.shadowColor.r; + mShadowColor.g = (u8)HIO_CHILD.shadowColor.g; + mShadowColor.b = (u8)HIO_CHILD.shadowColor.b; + mShadowColor.a = (u8)HIO_CHILD.shadowColor.a; switch (mClothType) { case MENU_CLOTH_TYPE_DEFAULT: { @@ -393,7 +393,7 @@ void dMCloth_c::plot(float xMin, float yMin, float xMax, float yMax) { const s16 idx = x + y * INNER_SIZE; GXPosition1x16(idx); GXNormal1x16(idx); - GXColor4x8(mColor1.r, mColor1.g, mColor1.b, alpha0); + GXColor4x8(mClothColor.r, mClothColor.g, mClothColor.b, alpha0); GXTexCoord2f32(xPos, yPos); } @@ -402,7 +402,7 @@ void dMCloth_c::plot(float xMin, float yMin, float xMax, float yMax) { const s16 idx = xNext + y * INNER_SIZE; GXPosition1x16(idx); GXNormal1x16(idx); - GXColor4x8(mColor1.r, mColor1.g, mColor1.b, alpha1); + GXColor4x8(mClothColor.r, mClothColor.g, mClothColor.b, alpha1); GXTexCoord2f32(xPos + xStep, yPos); } } break; @@ -464,7 +464,7 @@ void dMCloth_c::plot_shadow(float xMin, float yMin, float xMax, float yMax) { const s16 idx = x + y * INNER_SIZE; GXPosition1x16(idx); GXNormal1x16(idx); - GXColor4x8(mColor2.r, mColor2.g, mColor2.b, alpha0); + GXColor4x8(mShadowColor.r, mShadowColor.g, mShadowColor.b, alpha0); GXTexCoord2f32(xPos, yPos); } @@ -473,7 +473,7 @@ void dMCloth_c::plot_shadow(float xMin, float yMin, float xMax, float yMax) { const s16 idx = xNext + y * INNER_SIZE; GXPosition1x16(idx); GXNormal1x16(idx); - GXColor4x8(mColor2.r, mColor2.g, mColor2.b, alpha1); + GXColor4x8(mShadowColor.r, mShadowColor.g, mShadowColor.b, alpha1); GXTexCoord2f32(xPos + xStep, yPos); } } break; @@ -586,7 +586,7 @@ void dMCloth_c::ShadowTevSetting() { } /* 8019ADD4-8019B670 .text draw__9dMCloth_cFf8_GXColor8_GXColorUc */ -void dMCloth_c::draw(float, GXColor color1, GXColor color2, unsigned char) { +void dMCloth_c::draw(float, GXColor clothColor, GXColor shadowColor, unsigned char) { cXyz* pPos = getPos(); cXyz* pPos2 = mShadowPosArr; for (int y = 0; y < INNER_SIZE; y++) { @@ -600,12 +600,12 @@ void dMCloth_c::draw(float, GXColor color1, GXColor color2, unsigned char) { DCStoreRangeNoSync(mShadowPosArr, 0x5ac); - color1 = mColor1; - color2 = mColor2; + clothColor = mClothColor; + shadowColor = mShadowColor; if (mAlphaOut == 1) { // Fade out alpha. - color1.a = mCurrentAlpha; + clothColor.a = mCurrentAlpha; if (mCurrentAlpha > 25) { mCurrentAlpha -= 25; } else { @@ -615,12 +615,12 @@ void dMCloth_c::draw(float, GXColor color1, GXColor color2, unsigned char) { // Interpolate from startAlpha to final alpha. f32 f = (f32)mFadeInCounter / HIO_CHILD.fadeInLength; { - color1.a = cLib_minMaxLimit(HIO_CHILD.clothColor.a, 0, 0xFF); - color1.a = color1.a * f + (1.0f - f) * HIO_CHILD.startAlpha; + clothColor.a = cLib_minMaxLimit(HIO_CHILD.clothColor.a, 0, 0xFF); + clothColor.a = clothColor.a * f + (1.0f - f) * HIO_CHILD.startAlpha; } { - color2.a = cLib_minMaxLimit(HIO_CHILD.shadowColor.a, 0, 0xFF); - color2.a = color2.a * f + (1.0f - f) * HIO_CHILD.startAlpha; + shadowColor.a = cLib_minMaxLimit(HIO_CHILD.shadowColor.a, 0, 0xFF); + shadowColor.a = shadowColor.a * f + (1.0f - f) * HIO_CHILD.startAlpha; } } @@ -657,8 +657,8 @@ void dMCloth_c::draw(float, GXColor color1, GXColor color2, unsigned char) { } break; } - GXSetTevColor(GX_TEVREG0, color1); - GXSetTevColor(GX_TEVREG1, color2); + GXSetTevColor(GX_TEVREG0, clothColor); + GXSetTevColor(GX_TEVREG1, shadowColor); GXTexObj tex_obj;