AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

CPathFindSearch: Remove use of mutable on m_viz 

We can just drop the const qualifier on DebugDraw() to get rid of the
need to specify this.
This commit is contained in:
Lioncash 2020-04-09 21:49:59 -04:00
parent 549f58d835
commit e0a4dc37a4
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Runtime/World/CPathFindSearch.cpp
View File

@ -357,9 +357,10 @@ void CPathFindVisualizer::Draw(const CPathFindSearch& path) {
m_spline.Render(); m_spline.Render();
} }
void CPathFindSearch::DebugDraw() const { void CPathFindSearch::DebugDraw() {
if (!m_viz) if (!m_viz) {
m_viz.emplace(); m_viz.emplace();
}
m_viz->Draw(*this); m_viz->Draw(*this);
} }

4
Runtime/World/CPathFindSearch.hpp
View File

@ -33,7 +33,7 @@ private:
float xd8_padding = 10.f; float xd8_padding = 10.f;
u32 xdc_flags; // 0x2: flyer, 0x4: path-always-exists (swimmers) u32 xdc_flags; // 0x2: flyer, 0x4: path-always-exists (swimmers)
u32 xe0_indexMask; u32 xe0_indexMask;
mutable std::optional<CPathFindVisualizer> m_viz; std::optional<CPathFindVisualizer> m_viz;
bool Search(rstl::reserved_vector<CPFRegion*, 4>& regs1, const zeus::CVector3f& p1, bool Search(rstl::reserved_vector<CPFRegion*, 4>& regs1, const zeus::CVector3f& p1,
rstl::reserved_vector<CPFRegion*, 4>& regs2, const zeus::CVector3f& p2); rstl::reserved_vector<CPFRegion*, 4>& regs2, const zeus::CVector3f& p2);
void GetSplinePoint(zeus::CVector3f& pOut, const zeus::CVector3f& p1, u32 wpIdx) const; void GetSplinePoint(zeus::CVector3f& pOut, const zeus::CVector3f& p1, u32 wpIdx) const;
@ -61,7 +61,7 @@ public:
void SetCharacterRadius(float r) { xd4_chRadius = r; } void SetCharacterRadius(float r) { xd4_chRadius = r; }
void SetPadding(float padding) { xd8_padding = padding; } void SetPadding(float padding) { xd8_padding = padding; }
float RemainingPathDistance(const zeus::CVector3f& pos) const; float RemainingPathDistance(const zeus::CVector3f& pos) const;
void DebugDraw() const; void DebugDraw();
}; };
} // namespace urde } // namespace urde