nullworks/cathook
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

WIP: Pathfinding Nr. 7

Browse Source
This commit is contained in:
TotallyNotElite 2018-08-17 15:06:42 +02:00
parent 0e78958bcc
commit 59c16357c2
2 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/navparser.hpp
View File

@ -5,8 +5,9 @@
namespace nav namespace nav
{ {
extern bool init; extern bool init;
extern bool pathfinding; extern std::vector<CNavArea> areas;
std::vector<Vector> findPath(Vector loc, Vector dest); std::vector<Vector> findPath(Vector loc, Vector dest);
bool NavTo(Vector dest);
bool Prepare(); bool Prepare();
void CreateMove(); void CreateMove();
} }

16
src/navparser.cpp
View File

@ -5,14 +5,12 @@
namespace nav namespace nav
{ {
static CNavFile navfile(nullptr); static CNavFile navfile(nullptr);
// Todo: CNavArea* to navfile std::vector<CNavArea> areas;
static std::vector<CNavArea> areas;
// std::vector<CNavArea> SniperAreas; // std::vector<CNavArea> SniperAreas;
bool init = false; bool init = false;
bool pathfinding = true; bool pathfinding = true;
static settings::Bool enabled{ "misc.pathing", "true" }; static settings::Bool enabled{ "misc.pathing", "true" };
// Todo fix // Todo fix
int FindInVector(int id) int FindInVector(int id)
{ {
@ -131,14 +129,16 @@ void Init()
else else
{ {
int size = navfile.m_areas.size(); int size = navfile.m_areas.size();
logging::Info(format("Pathing: Number of areas to index:", size).c_str()); logging::Info(
format("Pathing: Number of areas to index:", size).c_str());
areas.reserve(size); areas.reserve(size);
for (auto i : navfile.m_areas) for (auto i : navfile.m_areas)
areas.push_back(i); areas.push_back(i);
if (size > 7000) if (size > 7000)
size = 7000; size = 7000;
TF2MAP = std::make_unique<MAP>(); TF2MAP = std::make_unique<MAP>();
pather = std::make_unique<micropather::MicroPather>(TF2MAP.get(), size, 6, true); pather = std::make_unique<micropather::MicroPather>(TF2MAP.get(), size,
6, true);
} }
pathfinding = true; pathfinding = true;
} }
@ -165,6 +165,7 @@ int findClosestNavSquare(Vector vec)
if (areas.at(i).Contains(vec)) if (areas.at(i).Contains(vec))
return i; return i;
} }
return -1;
} }
std::vector<Vector> findPath(Vector loc, Vector dest) std::vector<Vector> findPath(Vector loc, Vector dest)
@ -182,9 +183,9 @@ std::vector<Vector> findPath(Vector loc, Vector dest)
int result = pather->Solve(static_cast<void *>(&areas.at(id_loc)), int result = pather->Solve(static_cast<void *>(&areas.at(id_loc)),
static_cast<void *>(&areas.at(id_dest)), static_cast<void *>(&areas.at(id_dest)),
&pathNodes, &cost); &pathNodes, &cost);
logging::Info(format(result).c_str());
if (result) if (result)
return std::vector<Vector>(0); return std::vector<Vector>(0);
logging::Info(format(result).c_str());
std::vector<Vector> path; std::vector<Vector> path;
for (int i = 0; i < pathNodes.size(); i++) for (int i = 0; i < pathNodes.size(); i++)
{ {
@ -218,7 +219,8 @@ void CreateMove()
return; return;
if (CE_BAD(LOCAL_E)) if (CE_BAD(LOCAL_E))
return; return;
if (!crumbs.empty() && g_pLocalPlayer->v_Origin.DistTo(crumbs.at(0)) < 20.0f) if (!crumbs.empty() &&
g_pLocalPlayer->v_Origin.DistTo(crumbs.at(0)) < 20.0f)
{ {
crumbs.erase(crumbs.begin()); crumbs.erase(crumbs.begin());
inactivity.update(); inactivity.update();