Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2025-08-06 10:44:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Working built in reverse for movementAI

Browse Source
This commit is contained in:
David Markowitz
2023-08-06 23:40:30 -07:00
parent 3e12dd782b
commit 6a5ff30a32
4 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
dGame/dComponents/MovementAIComponent.cpp
View File

@@ -143,10 +143,10 @@ nextAction:
bool MovementAIComponent::AdvancePathWaypointIndex() {
m_CurrentPathWaypointIndex = m_NextPathWaypointIndex;
if (m_IsInReverse) {
if (m_CurrentPathWaypointIndex > 0) m_NextPathWaypointIndex--;
return m_NextPathWaypointIndex >= 0;
if (m_CurrentPathWaypointIndex >= 0) m_NextPathWaypointIndex--;
return m_CurrentPathWaypointIndex >= 0;
} else {
if (m_CurrentPathWaypointIndex < m_CurrentPath.size()) m_NextPathWaypointIndex++;
if (m_CurrentPathWaypointIndex <= m_CurrentPath.size()) m_NextPathWaypointIndex++;
return m_CurrentPathWaypointIndex < m_CurrentPath.size();
}
}
@@ -237,6 +237,13 @@ void MovementAIComponent::PullToPoint(const NiPoint3& point) {
m_PullPoint = point;
}
const NiPoint3& MovementAIComponent::GetCurrentPathWaypoint() const {
if (m_CurrentPathWaypointIndex >= m_CurrentPath.size() || m_CurrentPathWaypointIndex < 0) {
return m_Parent->GetPosition();
}
return m_CurrentPath.at(m_CurrentPathWaypointIndex);
}
void MovementAIComponent::SetPath(std::vector<NiPoint3> path, bool startInReverse) {
if (path.empty()) return;
m_CurrentPath = path;
@@ -247,7 +254,7 @@ void MovementAIComponent::SetPath(std::vector<NiPoint3> path, bool startInRevers
m_CurrentPathWaypointIndex = m_IsInReverse ? m_CurrentPath.size() - 1 : 0;
m_NextPathWaypointIndex = m_IsInReverse ? m_CurrentPath.size() - 1 : 0;
AdvancePathWaypointIndex();
SetDestination(m_CurrentPath.front());
SetDestination(GetCurrentPathWaypoint());
}
float MovementAIComponent::GetBaseSpeed(LOT lot) {

9
dGame/dComponents/MovementAIComponent.h
View File

@@ -194,7 +194,7 @@ public:
// Advance the path waypoint index and return if there is a next waypoint
bool AdvancePathWaypointIndex();
const NiPoint3& GetCurrentPathWaypoint() const { return m_CurrentPathWaypointIndex < m_CurrentPath.size() ? m_CurrentPath.at(m_CurrentPathWaypointIndex) : m_Parent->GetPosition(); }
const NiPoint3& GetCurrentPathWaypoint() const;
/**
* Returns the base speed from the DB for a given LOT
@@ -311,13 +311,16 @@ private:
/**
* The index of the current waypoint in the path
*/
uint32_t m_CurrentPathWaypointIndex;
int32_t m_CurrentPathWaypointIndex;
/**
* The index of the current waypoint in the path
*/
uint32_t m_NextPathWaypointIndex;
int32_t m_NextPathWaypointIndex;
/**
* Whether or not the path is being read in reverse
*/
bool m_IsInReverse;
};