AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-09 01:07:43 +00:00
Code Issues Projects Releases Wiki Activity

New code style refactor

Browse Source
This commit is contained in:
Jack Andersen
2018-12-07 19:30:43 -10:00
parent 41ae32be31
commit 636c82a568
1451 changed files with 171430 additions and 203303 deletions
Download Patch File Download Diff File Expand all files Collapse all files

230
Runtime/GuiSys/CGuiObject.cpp
View File

@@ -4,156 +4,130 @@
#include "CGuiWidget.hpp"
#include "CGuiFrame.hpp"
namespace urde
{
namespace urde {
void CGuiObject::Update(float dt)
{
if (x68_child)
x68_child->Update(dt);
if (x6c_nextSibling)
x6c_nextSibling->Update(dt);
void CGuiObject::Update(float dt) {
if (x68_child)
x68_child->Update(dt);
if (x6c_nextSibling)
x6c_nextSibling->Update(dt);
}
void CGuiObject::Draw(const CGuiWidgetDrawParms& parms) const
{
if (x68_child)
x68_child->Draw(parms);
if (x6c_nextSibling)
x6c_nextSibling->Draw(parms);
void CGuiObject::Draw(const CGuiWidgetDrawParms& parms) const {
if (x68_child)
x68_child->Draw(parms);
if (x6c_nextSibling)
x6c_nextSibling->Draw(parms);
}
void CGuiObject::MoveInWorld(const zeus::CVector3f& vec)
{
if (x64_parent)
x64_parent->RotateW2O(vec);
x4_localXF.origin += vec;
Reorthogonalize();
RecalculateTransforms();
void CGuiObject::MoveInWorld(const zeus::CVector3f& vec) {
if (x64_parent)
x64_parent->RotateW2O(vec);
x4_localXF.origin += vec;
Reorthogonalize();
RecalculateTransforms();
}
void CGuiObject::SetLocalPosition(const zeus::CVector3f& pos)
{
MoveInWorld(pos - x4_localXF.origin);
void CGuiObject::SetLocalPosition(const zeus::CVector3f& pos) { MoveInWorld(pos - x4_localXF.origin); }
void CGuiObject::RotateReset() {
x4_localXF.basis = zeus::CMatrix3f::skIdentityMatrix3f;
Reorthogonalize();
RecalculateTransforms();
}
void CGuiObject::RotateReset()
{
x4_localXF.basis = zeus::CMatrix3f::skIdentityMatrix3f;
Reorthogonalize();
RecalculateTransforms();
zeus::CVector3f CGuiObject::RotateW2O(const zeus::CVector3f& vec) const { return x34_worldXF.transposeRotate(vec); }
zeus::CVector3f CGuiObject::RotateO2P(const zeus::CVector3f& vec) const { return x4_localXF.rotate(vec); }
zeus::CVector3f CGuiObject::RotateTranslateW2O(const zeus::CVector3f& vec) const {
return x34_worldXF.transposeRotate(vec - x34_worldXF.origin);
}
zeus::CVector3f CGuiObject::RotateW2O(const zeus::CVector3f& vec) const
{
return x34_worldXF.transposeRotate(vec);
void CGuiObject::MultiplyO2P(const zeus::CTransform& xf) {
x4_localXF = xf * x4_localXF;
Reorthogonalize();
RecalculateTransforms();
}
zeus::CVector3f CGuiObject::RotateO2P(const zeus::CVector3f& vec) const
{
return x4_localXF.rotate(vec);
}
void CGuiObject::AddChildObject(CGuiObject* obj, bool makeWorldLocal, bool atEnd) {
obj->x64_parent = this;
zeus::CVector3f CGuiObject::RotateTranslateW2O(const zeus::CVector3f& vec) const
{
return x34_worldXF.transposeRotate(vec - x34_worldXF.origin);
}
void CGuiObject::MultiplyO2P(const zeus::CTransform& xf)
{
x4_localXF = xf * x4_localXF;
Reorthogonalize();
RecalculateTransforms();
}
void CGuiObject::AddChildObject(CGuiObject* obj, bool makeWorldLocal, bool atEnd)
{
obj->x64_parent = this;
if (!x68_child)
{
x68_child = obj;
}
else if (atEnd)
{
CGuiObject* prev = nullptr;
CGuiObject* cur = x68_child;
for (; cur ; cur = cur->x6c_nextSibling) {prev = cur;}
if (prev)
prev->x6c_nextSibling = obj;
}
else
{
obj->x6c_nextSibling = x68_child;
x68_child = obj;
}
if (makeWorldLocal)
{
zeus::CVector3f negParentWorld = -x34_worldXF.origin;
zeus::CMatrix3f basisMat(
x34_worldXF.basis[0] / x34_worldXF.basis[0].magnitude(),
x34_worldXF.basis[1] / x34_worldXF.basis[1].magnitude(),
x34_worldXF.basis[2] / x34_worldXF.basis[2].magnitude());
zeus::CVector3f xfWorld = basisMat * negParentWorld;
obj->x4_localXF = zeus::CTransform(basisMat, xfWorld) * obj->x34_worldXF;
}
RecalculateTransforms();
}
CGuiObject* CGuiObject::RemoveChildObject(CGuiObject* obj, bool makeWorldLocal)
{
if (!x68_child) {
x68_child = obj;
} else if (atEnd) {
CGuiObject* prev = nullptr;
CGuiObject* cur = x68_child;
for (; cur && cur != obj ; cur = cur->x6c_nextSibling) {prev = cur;}
if (!cur)
return nullptr;
if (prev)
prev->x6c_nextSibling = cur->x6c_nextSibling;
cur->x6c_nextSibling = nullptr;
cur->x64_parent = nullptr;
if (makeWorldLocal)
cur->x4_localXF = cur->x34_worldXF;
cur->RecalculateTransforms();
return cur;
}
void CGuiObject::RecalculateTransforms()
{
if (x64_parent)
x34_worldXF = x64_parent->x34_worldXF * x4_localXF;
else
x34_worldXF = x4_localXF;
if (x6c_nextSibling)
x6c_nextSibling->RecalculateTransforms();
if (x68_child)
x68_child->RecalculateTransforms();
}
void CGuiObject::Reorthogonalize()
{
static bool Global = false;
if (Global)
{
x4_localXF.orthonormalize();
RecalculateTransforms();
for (; cur; cur = cur->x6c_nextSibling) {
prev = cur;
}
if (prev)
prev->x6c_nextSibling = obj;
} else {
obj->x6c_nextSibling = x68_child;
x68_child = obj;
}
if (makeWorldLocal) {
zeus::CVector3f negParentWorld = -x34_worldXF.origin;
zeus::CMatrix3f basisMat(x34_worldXF.basis[0] / x34_worldXF.basis[0].magnitude(),
x34_worldXF.basis[1] / x34_worldXF.basis[1].magnitude(),
x34_worldXF.basis[2] / x34_worldXF.basis[2].magnitude());
zeus::CVector3f xfWorld = basisMat * negParentWorld;
obj->x4_localXF = zeus::CTransform(basisMat, xfWorld) * obj->x34_worldXF;
}
RecalculateTransforms();
}
void CGuiObject::SetO2WTransform(const zeus::CTransform& xf)
{
x4_localXF = GetParent()->x34_worldXF.inverse() * xf;
CGuiObject* CGuiObject::RemoveChildObject(CGuiObject* obj, bool makeWorldLocal) {
CGuiObject* prev = nullptr;
CGuiObject* cur = x68_child;
for (; cur && cur != obj; cur = cur->x6c_nextSibling) {
prev = cur;
}
if (!cur)
return nullptr;
if (prev)
prev->x6c_nextSibling = cur->x6c_nextSibling;
cur->x6c_nextSibling = nullptr;
cur->x64_parent = nullptr;
if (makeWorldLocal)
cur->x4_localXF = cur->x34_worldXF;
cur->RecalculateTransforms();
return cur;
}
void CGuiObject::RecalculateTransforms() {
if (x64_parent)
x34_worldXF = x64_parent->x34_worldXF * x4_localXF;
else
x34_worldXF = x4_localXF;
if (x6c_nextSibling)
x6c_nextSibling->RecalculateTransforms();
if (x68_child)
x68_child->RecalculateTransforms();
}
void CGuiObject::Reorthogonalize() {
static bool Global = false;
if (Global) {
x4_localXF.orthonormalize();
RecalculateTransforms();
}
}
void CGuiObject::SetLocalTransform(const zeus::CTransform& xf)
{
x4_localXF = xf;
RecalculateTransforms();
void CGuiObject::SetO2WTransform(const zeus::CTransform& xf) {
x4_localXF = GetParent()->x34_worldXF.inverse() * xf;
RecalculateTransforms();
}
void CGuiObject::SetLocalTransform(const zeus::CTransform& xf) {
x4_localXF = xf;
RecalculateTransforms();
}
} // namespace urde