mirror of
https://github.com/AxioDL/metaforce.git
synced 2025-12-09 07:07:42 +00:00
New code style refactor
This commit is contained in:
Jack Andersen
@@ -1,142 +1,126 @@
|
||||
#include "CGuiSliderGroup.hpp"
|
||||
#include "Input/CFinalInput.hpp"
|
||||
|
||||
namespace urde
|
||||
{
|
||||
namespace urde {
|
||||
|
||||
CGuiSliderGroup::CGuiSliderGroup(const CGuiWidgetParms& parms, float min, float max, float def, float inc)
|
||||
: CGuiCompoundWidget(parms), xb8_minVal(min), xbc_maxVal(max),
|
||||
xc0_roundedCurVal(def), xc4_curVal(def), xc8_increment(inc)
|
||||
{
|
||||
: CGuiCompoundWidget(parms)
|
||||
, xb8_minVal(min)
|
||||
, xbc_maxVal(max)
|
||||
, xc0_roundedCurVal(def)
|
||||
, xc4_curVal(def)
|
||||
, xc8_increment(inc) {}
|
||||
|
||||
void CGuiSliderGroup::SetSelectionChangedCallback(std::function<void(CGuiSliderGroup*, float)>&& func) {
|
||||
xd8_changeCallback = std::move(func);
|
||||
}
|
||||
|
||||
void CGuiSliderGroup::SetSelectionChangedCallback
|
||||
(std::function<void(CGuiSliderGroup*, float)>&& func)
|
||||
{
|
||||
xd8_changeCallback = std::move(func);
|
||||
void CGuiSliderGroup::SetCurVal(float cur) {
|
||||
xc0_roundedCurVal = zeus::clamp(xb8_minVal, cur, xbc_maxVal);
|
||||
xc4_curVal = xc0_roundedCurVal;
|
||||
}
|
||||
|
||||
void CGuiSliderGroup::SetCurVal(float cur)
|
||||
{
|
||||
xc0_roundedCurVal = zeus::clamp(xb8_minVal, cur, xbc_maxVal);
|
||||
xc4_curVal = xc0_roundedCurVal;
|
||||
void CGuiSliderGroup::StartDecreasing() {
|
||||
xf0_state = EState::Decreasing;
|
||||
xf4_24_inputPending = true;
|
||||
}
|
||||
|
||||
void CGuiSliderGroup::StartDecreasing()
|
||||
{
|
||||
xf0_state = EState::Decreasing;
|
||||
xf4_24_inputPending = true;
|
||||
void CGuiSliderGroup::StartIncreasing() {
|
||||
xf0_state = EState::Increasing;
|
||||
xf4_24_inputPending = true;
|
||||
}
|
||||
|
||||
void CGuiSliderGroup::StartIncreasing()
|
||||
{
|
||||
xf0_state = EState::Increasing;
|
||||
xf4_24_inputPending = true;
|
||||
void CGuiSliderGroup::ProcessUserInput(const CFinalInput& input) {
|
||||
if (input.DLALeft()) {
|
||||
StartDecreasing();
|
||||
return;
|
||||
}
|
||||
if (input.DLARight()) {
|
||||
StartIncreasing();
|
||||
return;
|
||||
}
|
||||
if (input.PDPLeft()) {
|
||||
StartDecreasing();
|
||||
return;
|
||||
}
|
||||
if (input.PDPRight()) {
|
||||
StartIncreasing();
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
void CGuiSliderGroup::ProcessUserInput(const CFinalInput& input)
|
||||
{
|
||||
if (input.DLALeft())
|
||||
{
|
||||
StartDecreasing();
|
||||
return;
|
||||
}
|
||||
if (input.DLARight())
|
||||
{
|
||||
StartIncreasing();
|
||||
return;
|
||||
}
|
||||
if (input.PDPLeft())
|
||||
{
|
||||
StartDecreasing();
|
||||
return;
|
||||
}
|
||||
if (input.PDPRight())
|
||||
{
|
||||
StartIncreasing();
|
||||
return;
|
||||
}
|
||||
}
|
||||
void CGuiSliderGroup::Update(float dt) {
|
||||
float fullRange = xbc_maxVal - xb8_minVal;
|
||||
float t1 = fullRange * dt;
|
||||
|
||||
void CGuiSliderGroup::Update(float dt)
|
||||
{
|
||||
float fullRange = xbc_maxVal - xb8_minVal;
|
||||
float t1 = fullRange * dt;
|
||||
float incCurVal;
|
||||
for (incCurVal = xb8_minVal; incCurVal <= xc4_curVal; incCurVal += xc8_increment) {}
|
||||
|
||||
float incCurVal;
|
||||
for (incCurVal = xb8_minVal ; incCurVal <= xc4_curVal ; incCurVal += xc8_increment) {}
|
||||
float upperIncVal = std::min(incCurVal, xbc_maxVal);
|
||||
float lowerIncVal = upperIncVal - xc8_increment;
|
||||
|
||||
float upperIncVal = std::min(incCurVal, xbc_maxVal);
|
||||
float lowerIncVal = upperIncVal - xc8_increment;
|
||||
|
||||
float oldCurVal = xc4_curVal;
|
||||
if (xf0_state == EState::Decreasing)
|
||||
{
|
||||
if (xf4_24_inputPending)
|
||||
xc4_curVal = std::max(oldCurVal - t1, xb8_minVal);
|
||||
else
|
||||
xc4_curVal = std::max(oldCurVal - t1, lowerIncVal);
|
||||
}
|
||||
else if (xf0_state == EState::Increasing)
|
||||
{
|
||||
if (xf4_24_inputPending)
|
||||
xc4_curVal = std::min(oldCurVal + t1, xbc_maxVal);
|
||||
else if (xc4_curVal != lowerIncVal)
|
||||
xc4_curVal = std::min(oldCurVal + t1, upperIncVal);
|
||||
}
|
||||
|
||||
if (xc4_curVal == oldCurVal)
|
||||
xf0_state = EState::None;
|
||||
|
||||
oldCurVal = xc0_roundedCurVal;
|
||||
if (upperIncVal - xc4_curVal <= xc4_curVal - lowerIncVal)
|
||||
xc0_roundedCurVal = upperIncVal;
|
||||
float oldCurVal = xc4_curVal;
|
||||
if (xf0_state == EState::Decreasing) {
|
||||
if (xf4_24_inputPending)
|
||||
xc4_curVal = std::max(oldCurVal - t1, xb8_minVal);
|
||||
else
|
||||
xc0_roundedCurVal = lowerIncVal;
|
||||
xc4_curVal = std::max(oldCurVal - t1, lowerIncVal);
|
||||
} else if (xf0_state == EState::Increasing) {
|
||||
if (xf4_24_inputPending)
|
||||
xc4_curVal = std::min(oldCurVal + t1, xbc_maxVal);
|
||||
else if (xc4_curVal != lowerIncVal)
|
||||
xc4_curVal = std::min(oldCurVal + t1, upperIncVal);
|
||||
}
|
||||
|
||||
if (oldCurVal != xc0_roundedCurVal && xd8_changeCallback)
|
||||
xd8_changeCallback(this, oldCurVal);
|
||||
if (xc4_curVal == oldCurVal)
|
||||
xf0_state = EState::None;
|
||||
|
||||
float fac;
|
||||
if (xbc_maxVal == xb8_minVal)
|
||||
fac = 0.f;
|
||||
else
|
||||
fac = (xc4_curVal - xb8_minVal) / (xbc_maxVal - xb8_minVal);
|
||||
oldCurVal = xc0_roundedCurVal;
|
||||
if (upperIncVal - xc4_curVal <= xc4_curVal - lowerIncVal)
|
||||
xc0_roundedCurVal = upperIncVal;
|
||||
else
|
||||
xc0_roundedCurVal = lowerIncVal;
|
||||
|
||||
const zeus::CVector3f& s0 = xcc_sliderRangeWidgets[0]->GetIdlePosition();
|
||||
const zeus::CVector3f& s1 = xcc_sliderRangeWidgets[1]->GetIdlePosition();
|
||||
if (oldCurVal != xc0_roundedCurVal && xd8_changeCallback)
|
||||
xd8_changeCallback(this, oldCurVal);
|
||||
|
||||
xcc_sliderRangeWidgets[0]->SetLocalPosition(s1 * fac + s0 * (1.f - fac));
|
||||
xf4_24_inputPending = false;
|
||||
float fac;
|
||||
if (xbc_maxVal == xb8_minVal)
|
||||
fac = 0.f;
|
||||
else
|
||||
fac = (xc4_curVal - xb8_minVal) / (xbc_maxVal - xb8_minVal);
|
||||
|
||||
const zeus::CVector3f& s0 = xcc_sliderRangeWidgets[0]->GetIdlePosition();
|
||||
const zeus::CVector3f& s1 = xcc_sliderRangeWidgets[1]->GetIdlePosition();
|
||||
|
||||
xcc_sliderRangeWidgets[0]->SetLocalPosition(s1 * fac + s0 * (1.f - fac));
|
||||
xf4_24_inputPending = false;
|
||||
}
|
||||
|
||||
bool CGuiSliderGroup::AddWorkerWidget(CGuiWidget* worker)
|
||||
{
|
||||
if (worker->GetWorkerId() < 0 || worker->GetWorkerId() > 1)
|
||||
return true;
|
||||
xcc_sliderRangeWidgets[worker->GetWorkerId()] = worker;
|
||||
bool CGuiSliderGroup::AddWorkerWidget(CGuiWidget* worker) {
|
||||
if (worker->GetWorkerId() < 0 || worker->GetWorkerId() > 1)
|
||||
return true;
|
||||
xcc_sliderRangeWidgets[worker->GetWorkerId()] = worker;
|
||||
return true;
|
||||
}
|
||||
|
||||
CGuiWidget* CGuiSliderGroup::GetWorkerWidget(int id) const
|
||||
{
|
||||
if (id < 0 || id > 1)
|
||||
return nullptr;
|
||||
return xcc_sliderRangeWidgets[id];
|
||||
CGuiWidget* CGuiSliderGroup::GetWorkerWidget(int id) const {
|
||||
if (id < 0 || id > 1)
|
||||
return nullptr;
|
||||
return xcc_sliderRangeWidgets[id];
|
||||
}
|
||||
|
||||
std::shared_ptr<CGuiWidget> CGuiSliderGroup::Create(CGuiFrame* frame, CInputStream& in, CSimplePool* sp)
|
||||
{
|
||||
CGuiWidgetParms parms = ReadWidgetHeader(frame, in);
|
||||
std::shared_ptr<CGuiWidget> CGuiSliderGroup::Create(CGuiFrame* frame, CInputStream& in, CSimplePool* sp) {
|
||||
CGuiWidgetParms parms = ReadWidgetHeader(frame, in);
|
||||
|
||||
float min = in.readFloatBig();
|
||||
float max = in.readFloatBig();
|
||||
float cur = in.readFloatBig();
|
||||
float increment = in.readFloatBig();
|
||||
float min = in.readFloatBig();
|
||||
float max = in.readFloatBig();
|
||||
float cur = in.readFloatBig();
|
||||
float increment = in.readFloatBig();
|
||||
|
||||
std::shared_ptr<CGuiWidget> ret = std::make_shared<CGuiSliderGroup>(parms, min, max, cur, increment);
|
||||
ret->ParseBaseInfo(frame, in, parms);
|
||||
return ret;
|
||||
std::shared_ptr<CGuiWidget> ret = std::make_shared<CGuiSliderGroup>(parms, min, max, cur, increment);
|
||||
ret->ParseBaseInfo(frame, in, parms);
|
||||
return ret;
|
||||
}
|
||||
|
||||
}
|
||||
} // namespace urde
|
||||
|
||||
Reference in New Issue
Block a user