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

CCameraSpline: Make use of TCastToConstPtr where applicable 

Makes the read-only intent explicit.
This commit is contained in:
Lioncash 2020-04-05 01:25:52 -04:00
parent 7d8bcfbd5e
commit 4e55edf0fe
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Runtime/Camera/CCameraManager.cpp
View File

@ -655,9 +655,9 @@ bool CCameraManager::HasBallCameraInitialPositionHint(CStateManager& mgr) const
} }
void CCameraManager::RemoveCinemaCamera(TUniqueId uid, CStateManager& mgr) { void CCameraManager::RemoveCinemaCamera(TUniqueId uid, CStateManager& mgr) {
const auto search = std::find(x4_cineCameras.begin(), x4_cineCameras.end(), uid); const auto search = std::find(x4_cineCameras.cbegin(), x4_cineCameras.cend(), uid);
if (search == x4_cineCameras.end()) { if (search == x4_cineCameras.cend()) {
return; return;
} }
@ -671,10 +671,10 @@ void CCameraManager::DeleteCameraHint(TUniqueId id, CStateManager& mgr) {
return; return;
} }
const auto search = std::find_if(x2b0_inactiveCameraHints.begin(), x2b0_inactiveCameraHints.end(), const auto search = std::find_if(x2b0_inactiveCameraHints.cbegin(), x2b0_inactiveCameraHints.cend(),
[id](TUniqueId tid) { return tid == id; }); [id](TUniqueId tid) { return tid == id; });
if (search != x2b0_inactiveCameraHints.end()) { if (search != x2b0_inactiveCameraHints.cend()) {
return; return;
} }
@ -687,9 +687,9 @@ void CCameraManager::DeleteCameraHint(TUniqueId id, CStateManager& mgr) {
void CCameraManager::AddInactiveCameraHint(TUniqueId id, CStateManager& mgr) { void CCameraManager::AddInactiveCameraHint(TUniqueId id, CStateManager& mgr) {
if (const TCastToConstPtr<CScriptCameraHint> hint = mgr.ObjectById(id)) { if (const TCastToConstPtr<CScriptCameraHint> hint = mgr.ObjectById(id)) {
const auto search = std::find_if(x2b0_inactiveCameraHints.begin(), x2b0_inactiveCameraHints.end(), const auto search = std::find_if(x2b0_inactiveCameraHints.cbegin(), x2b0_inactiveCameraHints.cend(),
[id](TUniqueId tid) { return tid == id; }); [id](TUniqueId tid) { return tid == id; });
if (search == x2b0_inactiveCameraHints.end() && x2b0_inactiveCameraHints.size() != 64) { if (search == x2b0_inactiveCameraHints.cend() && x2b0_inactiveCameraHints.size() != 64) {
x2b0_inactiveCameraHints.push_back(id); x2b0_inactiveCameraHints.push_back(id);
} }
} }
@ -697,9 +697,9 @@ void CCameraManager::AddInactiveCameraHint(TUniqueId id, CStateManager& mgr) {
void CCameraManager::AddActiveCameraHint(TUniqueId id, CStateManager& mgr) { void CCameraManager::AddActiveCameraHint(TUniqueId id, CStateManager& mgr) {
if (const TCastToConstPtr<CScriptCameraHint> hint = mgr.ObjectById(id)) { if (const TCastToConstPtr<CScriptCameraHint> hint = mgr.ObjectById(id)) {
const auto search = std::find_if(x334_activeCameraHints.begin(), x334_activeCameraHints.end(), const auto search = std::find_if(x334_activeCameraHints.cbegin(), x334_activeCameraHints.cend(),
[id](TUniqueId tid) { return tid == id; }); [id](TUniqueId tid) { return tid == id; });
if (search == x334_activeCameraHints.end() && xac_cameraHints.size() != 64 && x334_activeCameraHints.size() != 64) { if (search == x334_activeCameraHints.cend() && xac_cameraHints.size() != 64 && x334_activeCameraHints.size() != 64) {
x334_activeCameraHints.push_back(id); x334_activeCameraHints.push_back(id);
} }
} }

14
Runtime/Camera/CCameraSpline.cpp
View File

@ -18,13 +18,13 @@ void CCameraSpline::CalculateKnots(TUniqueId cameraId, const std::vector<SConnec
} }
if (lastConn) { if (lastConn) {
TCastToPtr<CScriptCameraWaypoint> waypoint = mgr.ObjectById(mgr.GetIdForScript(lastConn->x8_objId)); TCastToConstPtr<CScriptCameraWaypoint> waypoint = mgr.ObjectById(mgr.GetIdForScript(lastConn->x8_objId));
x14_wpTracker.clear(); x14_wpTracker.clear();
x14_wpTracker.reserve(4); x14_wpTracker.reserve(4);
while (waypoint) { while (waypoint) {
auto search = std::find_if(x14_wpTracker.begin(), x14_wpTracker.end(), const auto search = std::find_if(x14_wpTracker.cbegin(), x14_wpTracker.cend(),
[&waypoint](const auto& a) { return a == waypoint->GetUniqueId(); }); [&waypoint](const auto& a) { return a == waypoint->GetUniqueId(); });
if (search == x14_wpTracker.end()) { if (search == x14_wpTracker.cend()) {
x14_wpTracker.push_back(waypoint->GetUniqueId()); x14_wpTracker.push_back(waypoint->GetUniqueId());
waypoint = mgr.ObjectById(waypoint->GetRandomNextWaypointId(mgr)); waypoint = mgr.ObjectById(waypoint->GetRandomNextWaypointId(mgr));
} }
@ -34,9 +34,9 @@ void CCameraSpline::CalculateKnots(TUniqueId cameraId, const std::vector<SConnec
waypoint = mgr.ObjectById(mgr.GetIdForScript(lastConn->x8_objId)); waypoint = mgr.ObjectById(mgr.GetIdForScript(lastConn->x8_objId));
while (waypoint) { while (waypoint) {
auto search = std::find_if(x14_wpTracker.begin(), x14_wpTracker.end(), const auto search = std::find_if(x14_wpTracker.cbegin(), x14_wpTracker.cend(),
[&waypoint](const auto& a) { return a == waypoint->GetUniqueId(); }); [&waypoint](const auto& a) { return a == waypoint->GetUniqueId(); });
if (search == x14_wpTracker.end()) { if (search == x14_wpTracker.cend()) {
x14_wpTracker.push_back(waypoint->GetUniqueId()); x14_wpTracker.push_back(waypoint->GetUniqueId());
AddKnot(waypoint->GetTranslation(), waypoint->GetTransform().basis[1]); AddKnot(waypoint->GetTranslation(), waypoint->GetTransform().basis[1]);
waypoint = mgr.ObjectById(waypoint->GetRandomNextWaypointId(mgr)); waypoint = mgr.ObjectById(waypoint->GetRandomNextWaypointId(mgr));