2
0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-09 17:47:43 +00:00

Refactor GuiSys (remove general logic handling)

This commit is contained in:
Jack Andersen
2016-12-15 12:37:34 -10:00
parent 6b765838a7
commit 19a371c931
54 changed files with 446 additions and 2642 deletions

View File

@@ -1,6 +1,4 @@
#include "CGuiLight.hpp"
#include "CGuiAnimController.hpp"
#include "CGuiLogicalEventTrigger.hpp"
#include "CGuiFrame.hpp"
namespace urde
@@ -21,7 +19,7 @@ CGuiLight::CGuiLight(const CGuiWidgetParms& parms, const CLight& light)
CGuiLight::~CGuiLight()
{
xc8_frame->RemoveLight(this);
xb0_frame->RemoveLight(this);
}
CLight CGuiLight::BuildLight() const
@@ -31,13 +29,13 @@ CLight CGuiLight::BuildLight() const
switch (xf8_type)
{
case ELightType::Spot:
ret = CLight::BuildSpot(GetWorldPosition(), x34_worldXF.basis[1], xbc_color, xfc_spotCutoff);
ret = CLight::BuildSpot(GetWorldPosition(), x34_worldXF.basis[1], xa4_color, xfc_spotCutoff);
break;
case ELightType::Point:
ret = CLight::BuildPoint(GetWorldPosition(), xbc_color);
ret = CLight::BuildPoint(GetWorldPosition(), xa4_color);
break;
case ELightType::Directional:
ret = CLight::BuildDirectional(x34_worldXF.basis[1], xbc_color);
ret = CLight::BuildDirectional(x34_worldXF.basis[1], xa4_color);
break;
default: break;
}
@@ -50,9 +48,9 @@ CLight CGuiLight::BuildLight() const
void CGuiLight::SetIsVisible(bool vis)
{
if (vis)
xc8_frame->AddLight(this);
xb0_frame->AddLight(this);
else
xc8_frame->RemoveLight(this);
xb0_frame->RemoveLight(this);
CGuiWidget::SetIsVisible(vis);
}