diff options
| author | elijah-thomas774 <elijahthomas774@gmail.com> | 2025-03-30 15:00:55 -0400 |
|---|---|---|
| committer | elijah-thomas774 <elijahthomas774@gmail.com> | 2025-03-30 15:00:55 -0400 |
| commit | 772a0d56bbff35e85293cf75654e5389708cf09b (patch) | |
| tree | 5fe772d95cfd5a4d7dfd7a7c250387fc44a95c85 /src | |
| parent | 3df431e4f0c7c11f09d8d1f8dfa16823e38b1ac7 (diff) | |
LightTexture::fn_804AC0E0 and LightTexture::addLight fix
Diffstat (limited to 'src')
| -rw-r--r-- | src/egg/gfx/eggLightTexture.cpp | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/src/egg/gfx/eggLightTexture.cpp b/src/egg/gfx/eggLightTexture.cpp index 428dbea9..fe00914b 100644 --- a/src/egg/gfx/eggLightTexture.cpp +++ b/src/egg/gfx/eggLightTexture.cpp @@ -396,9 +396,10 @@ void LightTexture::fn_804AC0E0(int i, const GXColor &color, bool b) { int remainder = field_0x9F % field_0x9D; if (remainder > 0) { for (; remainder < field_0x9D; remainder++) { - // TODO: color stack slots swapped - GXSetTevColor(static_cast<GXTevRegID>(GX_TEVREG0 + remainder), DrawGX::BLACK); - GXSetTevKColor(static_cast<GXTevKColorID>(GX_KCOLOR0 + remainder), DrawGX::BLACK); + DrawGX::SetTevColor( + static_cast<GXTevRegID>(GX_TEVREG0 + remainder), DrawGX::BLACK, + static_cast<GXTevKColorID>(GX_KCOLOR0 + remainder), DrawGX::BLACK + ); } f32 origin = GetLightType() != 2 ? 0.0f : 0.5f; @@ -537,7 +538,6 @@ void LightTexture::debugDraw(int i) { } void LightTexture::addLight(const EGG::LightObject &obj) { - // NONMATCHING if (!(obj.CheckFlag1() && obj.CheckFlag0x20() && (mpByteData1[obj.GetIndex()] & 1) != 0 && (field_0x9F < 2 || mLightType != 1))) { return; @@ -552,14 +552,13 @@ void LightTexture::addLight(const EGG::LightObject &obj) { } sCpuTexArray[mpByteData2[obj.GetIndex()]]->load(static_cast<GXTexMapID>(field_0x9E + remainder)); - // TODO - GXColor blackColor = obj.GetBlack(); - // Sorry clang-format, what is this formatting??? - blackColor = (GXColor - ){blackColor.r * obj.getField0x30(), blackColor.g * obj.getField0x30(), blackColor.b * obj.getField0x30(), - blackColor.a}; - GXSetTevColor(static_cast<GXTevRegID>(GX_TEVREG0 + remainder), color); - GXSetTevKColor(static_cast<GXTevKColorID>(GX_KCOLOR0 + remainder), blackColor); + GXColor blk = obj.GetBlack(); + f32 mult = obj.getField0x30(); + blk = (GXColor){blk.r * mult, blk.g * mult, blk.b * mult, obj.GetBlack().a}; + + DrawGX::SetTevColor( + static_cast<GXTevRegID>(GX_TEVREG0 + remainder), color, static_cast<GXTevKColorID>(GX_KCOLOR0 + remainder), blk + ); if (GetLightType() == 0 || GetLightType() == 2) { f32 mtx[2][3]; mtx[0][0] = -vec.x * 0.485f; |