Arrow should now correctly track the next point no matter when you join the game
This commit is contained in:
@@ -101,6 +101,7 @@ void CapturePointArrowHUDSystem::Update(double dt)
|
|||||||
continue;
|
continue;
|
||||||
} else {
|
} else {
|
||||||
m_RedTeamCurrentTarget = got->second;
|
m_RedTeamCurrentTarget = got->second;
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else if ((int)homeRed["CapturePoint"]["CapturePointNumber"] == firstCP) {
|
} else if ((int)homeRed["CapturePoint"]["CapturePointNumber"] == firstCP) {
|
||||||
@@ -112,6 +113,7 @@ void CapturePointArrowHUDSystem::Update(double dt)
|
|||||||
continue;
|
continue;
|
||||||
} else {
|
} else {
|
||||||
m_RedTeamCurrentTarget = got->second;
|
m_RedTeamCurrentTarget = got->second;
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -125,6 +127,7 @@ void CapturePointArrowHUDSystem::Update(double dt)
|
|||||||
continue;
|
continue;
|
||||||
} else {
|
} else {
|
||||||
m_BlueTeamCurrentTarget = got->second;
|
m_BlueTeamCurrentTarget = got->second;
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else if ((int)homeBlue["CapturePoint"]["CapturePointNumber"] == firstCP) {
|
} else if ((int)homeBlue["CapturePoint"]["CapturePointNumber"] == firstCP) {
|
||||||
@@ -136,6 +139,7 @@ void CapturePointArrowHUDSystem::Update(double dt)
|
|||||||
continue;
|
continue;
|
||||||
} else {
|
} else {
|
||||||
m_BlueTeamCurrentTarget = got->second;
|
m_BlueTeamCurrentTarget = got->second;
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -151,7 +155,7 @@ void CapturePointArrowHUDSystem::Update(double dt)
|
|||||||
pos = m_BlueTeamCurrentTarget;
|
pos = m_BlueTeamCurrentTarget;
|
||||||
}
|
}
|
||||||
|
|
||||||
pos = currentTeam == redTeam ? m_RedTeamCurrentTarget : currentTeam == blueTeam ? m_BlueTeamCurrentTarget : glm::vec3(0.f);
|
//pos = currentTeam == redTeam ? m_RedTeamCurrentTarget : currentTeam == blueTeam ? m_BlueTeamCurrentTarget : glm::vec3(0.f);
|
||||||
|
|
||||||
glm::vec3& arrowOri = arrowEntity["Transform"]["Orientation"];
|
glm::vec3& arrowOri = arrowEntity["Transform"]["Orientation"];
|
||||||
glm::vec3 lookVector = glm::normalize(Transform::AbsolutePosition(arrowEntity) - pos); //Maybe should be player instead
|
glm::vec3 lookVector = glm::normalize(Transform::AbsolutePosition(arrowEntity) - pos); //Maybe should be player instead
|
||||||
|
|||||||
Reference in New Issue
Block a user