AxioDL/PrimeWorldEditor
2
0
Fork 0
mirror of https://github.com/AxioDL/PrimeWorldEditor.git synced 2025-07-04 12:15:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

CWaypointExtra: Make use of ranged-for where applicable

Browse Source 
Same behavior, less moving parts.
This commit is contained in:
Lioncash 2020-06-20 00:06:57 -04:00
parent 8c06309364
commit ef57260f0b
3 changed files with 33 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Core/ScriptExtra/CSplinePathExtra.cpp
View File

@ -3,6 +3,8 @@
#include "Core/Resource/Script/CLink.h"
#include "Core/Scene/CScene.h"
#include <algorithm>
CSplinePathExtra::CSplinePathExtra(CScriptObject* pInstance, CScene* pScene, CScriptNode* pParent)
: CScriptExtra(pInstance, pScene, pParent)
{

60
src/Core/ScriptExtra/CWaypointExtra.cpp
View File

@ -12,8 +12,8 @@ CWaypointExtra::CWaypointExtra(CScriptObject *pInstance, CScene *pScene, CScript
CWaypointExtra::~CWaypointExtra()
{
for (auto it = mPaths.begin(); it != mPaths.end(); it++)
(*it)->RemoveWaypoint(this);
for (auto& path : mPaths)
path->RemoveWaypoint(this);
}
void CWaypointExtra::CheckColor()
@ -24,16 +24,15 @@ void CWaypointExtra::CheckColor()
CSplinePathExtra *pPath = mPaths.front();
mColor = pPath->PathColor();
}
// Fetch color from parent node's model (MP1/2/3)
else if (mGame < EGame::DKCReturns)
{
CScriptNode *pScript = static_cast<CScriptNode*>(mpParent);
auto *pScript = static_cast<CScriptNode*>(mpParent);
CModel *pModel = pScript->ActiveModel();
if (pModel && (pModel->GetMatSetCount() > 0) && (pModel->GetMatCount() > 0))
if (pModel != nullptr && (pModel->GetMatSetCount() > 0) && (pModel->GetMatCount() > 0))
{
CMaterial *pMat = pModel->GetMaterialByIndex(0, 0);
const CMaterial *pMat = pModel->GetMaterialByIndex(0, 0);
mColor = pMat->Konst(0);
}
}
@ -47,28 +46,27 @@ void CWaypointExtra::CheckColor()
void CWaypointExtra::AddToSplinePath(CSplinePathExtra *pPath)
{
for (auto it = mPaths.begin(); it != mPaths.end(); it++)
{
if (*it == pPath)
const auto iter = std::find_if(mPaths.cbegin(), mPaths.cend(),
[pPath](const auto* entry) { return entry == pPath; });
if (iter != mPaths.cend())
return;
}
mPaths.push_back(pPath);
if (mPaths.size() == 1)
CheckColor();
}
void CWaypointExtra::RemoveFromSplinePath(CSplinePathExtra *pPath)
void CWaypointExtra::RemoveFromSplinePath(const CSplinePathExtra *pPath)
{
for (auto it = mPaths.begin(); it != mPaths.end(); ++it)
{
if (*it == pPath)
{
mPaths.erase(it);
const auto iter = std::find_if(mPaths.cbegin(), mPaths.cend(),
[pPath](const auto* entry) { return entry == pPath; });
if (iter == mPaths.cend())
return;
mPaths.erase(iter);
CheckColor();
break;
}
}
}
void CWaypointExtra::BuildLinks()
@ -122,7 +120,7 @@ bool CWaypointExtra::IsPathLink(const CLink *pLink) const
{
const CScriptNode *pNode = mpScene->NodeForInstanceID(pLink->ReceiverID());
if (pNode)
if (pNode != nullptr)
return pNode->Instance()->ObjectTypeID() == mpInstance->ObjectTypeID();
}
@ -131,24 +129,22 @@ bool CWaypointExtra::IsPathLink(const CLink *pLink) const
void CWaypointExtra::GetLinkedWaypoints(std::list<CWaypointExtra*>& rOut)
{
if (!mLinksBuilt) BuildLinks();
if (!mLinksBuilt)
BuildLinks();
for (uint32 iLink = 0; iLink < mLinks.size(); iLink++)
for (auto& link : mLinks)
{
const SWaypointLink& rkLink = mLinks[iLink];
CWaypointExtra *pExtra = static_cast<CWaypointExtra*>(rkLink.pWaypoint->Extra());
rOut.push_back(pExtra);
rOut.push_back(static_cast<CWaypointExtra*>(link.pWaypoint->Extra()));
}
}
void CWaypointExtra::OnTransformed()
{
for (uint32 iLink = 0; iLink < mLinks.size(); iLink++)
for (auto& link : mLinks)
{
SWaypointLink& rLink = mLinks[iLink];
rLink.LineAABB = CAABox::Infinite();
rLink.LineAABB.ExpandBounds(AbsolutePosition());
rLink.LineAABB.ExpandBounds(rLink.pWaypoint->AbsolutePosition());
link.LineAABB = CAABox::Infinite();
link.LineAABB.ExpandBounds(AbsolutePosition());
link.LineAABB.ExpandBounds(link.pWaypoint->AbsolutePosition());
}
}
@ -163,7 +159,7 @@ void CWaypointExtra::AddToRenderer(CRenderer *pRenderer, const SViewInfo& rkView
// won't work properly because we haven't finished loading the scene yet.
if (!mLinksBuilt) BuildLinks();
if (!rkViewInfo.GameMode && (rkViewInfo.ShowFlags & EShowFlag::ObjectGeometry) && mpParent->IsVisible() && !mpParent->IsSelected())
if (!rkViewInfo.GameMode && ((rkViewInfo.ShowFlags & EShowFlag::ObjectGeometry) != 0) && mpParent->IsVisible() && !mpParent->IsSelected())
{
for (uint32 iLink = 0; iLink < mLinks.size(); iLink++)
{
@ -188,5 +184,5 @@ void CWaypointExtra::Draw(FRenderOptions /*Options*/, int ComponentIndex, ERende
CColor CWaypointExtra::TevColor()
{
return (mGame < EGame::DKCReturns ? CColor::White() : mColor);
return mGame < EGame::DKCReturns ? CColor::White() : mColor;
}

2
src/Core/ScriptExtra/CWaypointExtra.h
View File

@ -24,7 +24,7 @@ public:
~CWaypointExtra();
void CheckColor();
void AddToSplinePath(CSplinePathExtra *pPath);
void RemoveFromSplinePath(CSplinePathExtra *pPath);
void RemoveFromSplinePath(const CSplinePathExtra *pPath);
void BuildLinks();
bool IsPathLink(const CLink *pLink) const;
void GetLinkedWaypoints(std::list<CWaypointExtra*>& rOut);