Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor astar pt3 #3650

Open
wants to merge 17 commits into
base: master
Choose a base branch
from
Open

Refactor astar pt3 #3650

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
063b53d
Refactored AStar implementation Pt.1
dkargin Jun 11, 2023
050a52a
Reusing same predicate for path query
dkargin Jun 12, 2023
83a046e
Removed nearestCoord field from PathfindContext
dkargin Jun 12, 2023
9c3091d
AStar uses direct poitner to blocking map during search
dkargin Jun 12, 2023
32d6c5a
Batch job processing in PF thread
dkargin Jul 20, 2023
27c27e6
Refactor A* core
dkargin Jul 20, 2023
927d15b
Eliminated some reliance of AStar on global geometry of the map
dkargin Jul 25, 2023
0f33195
Astar: workaround for the case when starting position is blocked
dkargin Jul 29, 2023
bfe1713
Added more profiling sections all over the code
dkargin Jul 29, 2023
0d33c1f
Added polyline renderer
dkargin Jul 29, 2023
9b49a25
Added debug renderer for pathfinding system
dkargin Jul 29, 2023
b915f6c
Added toggles to draw debug info for path system
dkargin Aug 6, 2023
8549f29
Restored threaded pathfinding
dkargin Aug 7, 2023
e7b880e
Refactored generation of PF continents
dkargin Sep 20, 2023
d93405f
Exposed new command line option to enable PF debug
dkargin Oct 22, 2023
0d41be2
Updated condition for debug rendering of paths
dkargin Oct 22, 2023
f7c9d8a
Added a fallback forward PF search for intercontinental queries
dkargin Oct 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions lib/ivis_opengl/pieblitfunc.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,26 @@ void iV_Lines(const std::vector<glm::ivec4> &lines, PIELIGHT colour)
gfx_api::LinePSO::get().unbind_vertex_buffers(pie_internal::rectBuffer);
}

void iV_PolyLine(const std::vector<Vector3i> &points, const glm::mat4 &mvp, PIELIGHT colour)
{
std::vector<glm::ivec4> lines;
Vector2i result;
Vector2i lastPoint(0, 0);

for(auto i = 0; i < points.size(); i++){
Vector3i source = points[i];
pie_RotateProjectWithPerspective(&source, mvp, &result);

if(i > 0){
lines.push_back({ lastPoint.x, lastPoint.y, result.x, result.y });
}

lastPoint = result;
}

iV_Lines(lines, colour);
}

/**
* Assumes render mode set up externally, draws filled rectangle.
*/
Expand Down
2 changes: 2 additions & 0 deletions lib/ivis_opengl/pieblitfunc.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,8 @@ glm::mat4 defaultProjectionMatrix();
void iV_ShadowBox(int x0, int y0, int x1, int y1, int pad, PIELIGHT first, PIELIGHT second, PIELIGHT fill);
void iV_Line(int x0, int y0, int x1, int y1, PIELIGHT colour);
void iV_Lines(const std::vector<glm::ivec4> &lines, PIELIGHT colour);
/// Draws connected polyline.
void iV_PolyLine(const std::vector<Vector3i> &points, const glm::mat4 &mvp, PIELIGHT colour);
void iV_Box2(int x0, int y0, int x1, int y1, PIELIGHT first, PIELIGHT second);
static inline void iV_Box(int x0, int y0, int x1, int y1, PIELIGHT first)
{
Expand Down
Loading