KlemenPl/PixelDefense
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix path smoothing bug

Browse Source
This commit is contained in:
Klemen Plestenjak
2023-11-23 19:23:06 +01:00
parent 3885e911a3
commit a17450dd81
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
game/pathfinding.c
View File

@@ -19,8 +19,8 @@ static i32 dst(TilePosition a, TilePosition b) {
static PathData *pushPathWaypoint(PathData *pathData, Position waypoint, BzObjectPool *pathPool) {
if (pathData->numWaypoints + 1 > PATH_DATA_SIZE) {
PathData *newPathData = bzObjectPool(pathPool);
bzMemSet(newPathData, 0, sizeof(*newPathData));
BZ_ASSERT(newPathData);
bzMemSet(newPathData, 0, sizeof(*newPathData));
newPathData->numWaypoints = 0;
newPathData->next = pathData;
pathData = newPathData;
@@ -68,10 +68,14 @@ static void smoothPath(BzTileMap *map, PathData *pathData, BzObjectPool *pool) {
size_t prevIdx = 1;
PathData *nextPath = pathData;
size_t nextIdx = 2;
Position lastPos;
Position lastPos = {INFINITY, INFINITY};
// Needed, because we overwrite numWaypoints
size_t currPathLen = prevPath->numWaypoints;
size_t nextPathLen = nextPath->numWaypoints;
if (prevPath->next) {
currPathLen = PATH_DATA_SIZE;
nextPathLen = PATH_DATA_SIZE;
}
outPath->numWaypoints = 1;
while (nextPath && nextIdx < nextPathLen) {
Position currPos = prevPath->waypoints[prevIdx];
@@ -80,6 +84,7 @@ static void smoothPath(BzTileMap *map, PathData *pathData, BzObjectPool *pool) {
prevIdx++;
nextIdx++;
bzLogInfo("%llu,%llu", prevIdx, nextIdx);
if (prevIdx >= currPathLen) {
prevPath = prevPath->next;
@@ -103,6 +108,7 @@ static void smoothPath(BzTileMap *map, PathData *pathData, BzObjectPool *pool) {
}
}
BZ_ASSERT(lastPos.x != INFINITY && lastPos.y != INFINITY);
outPath->waypoints[outIdx++] = lastPos;
outPath->numWaypoints = outIdx;
@@ -197,6 +203,7 @@ bool findPath(const PathfindingDesc *desc) {
out->curWaypoint = 0;
BZ_ASSERT(desc->pool);
PathData *pathData = bzObjectPool(desc->pool);
BZ_ASSERT(pathData);
bzMemSet(pathData, 0, sizeof(*pathData));
pathData = pushPathWaypoint(pathData, desc->target, desc->pool);