From 724deee2ab2519bf03261f5aa2d392e89c789c2d Mon Sep 17 00:00:00 2001 From: Phillip Stephens Date: Tue, 10 May 2022 01:40:55 -0700 Subject: [PATCH] Fix incorrect light colors --- Runtime/Graphics/CGraphics.cpp | 2 +- aurora/lib/gfx/gx.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Runtime/Graphics/CGraphics.cpp b/Runtime/Graphics/CGraphics.cpp index 234bc151c..aeeacb03c 100644 --- a/Runtime/Graphics/CGraphics.cpp +++ b/Runtime/Graphics/CGraphics.cpp @@ -82,7 +82,7 @@ void CGraphics::DisableAllLights() { void CGraphics::LoadLight(ERglLight light, const CLight& info) { const auto lightId = static_cast(1 << light); -#if 0 +#if 1 zeus::CVector3f pos = info.GetPosition(); zeus::CVector3f dir = info.GetDirection(); if (info.GetType() == ELightType::Directional) { diff --git a/aurora/lib/gfx/gx.cpp b/aurora/lib/gfx/gx.cpp index 577882f76..6adf5b992 100644 --- a/aurora/lib/gfx/gx.cpp +++ b/aurora/lib/gfx/gx.cpp @@ -397,7 +397,7 @@ void GXLoadLightObjImm(const GX::LightObj* light, GX::LightID id) { realLight.dir.assign(light->nx, light->ny, light->nz); realLight.angAtt.assign(light->a0, light->a1, light->a2); realLight.linAtt.assign(light->k0, light->k1, light->k2); - realLight.color.fromRGBA32(light->color.num); + realLight.color.fromRGBA8(light->color.color[0], light->color.color[1], light->color.color[2], light->color.color[3]); g_gxState.lights[idx] = realLight; }