Skip to content

Improve World Map #28

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

Draft
Allstreamer wants to merge 1 commit into
base: develop
Choose a base branch
from
Draft

Improve World Map #28

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 9 additions & 1 deletion trader/src/windows/world_explorer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,14 @@ impl ControlWindow for WorldExplorerData {

let render_text = plot_ui.plot_bounds().width() < TEXT_RENDER_LEVEL;

// HashMap::with_capacity(20) is here to prevent doing ~3 allocations
// this assumes that every system will have 20 or less waypoints
// this is also outside of the loop it's meant for so don't forget to
// waypoint_record.clear() (this was also done to avoid reallocations)
// (this map will actually have a capacity of 28 since that is the next
// bigest available size to 20)
let mut waypoint_record: HashMap<(i32, i32), u32> = HashMap::with_capacity(20);

for system in universe_list {
if (plot_ui.plot_bounds().min()[0] - SYSTEM_CULL_LENIENCY > system.x as f64)
|| ((system.x as f64)
Expand Down Expand Up @@ -85,7 +93,6 @@ impl ControlWindow for WorldExplorerData {
}

if render_text {
let mut waypoint_record: HashMap<(i32, i32), u32> = HashMap::new();
for waypoint in &system.waypoints {
let waypoint_entry = waypoint_record
.entry((waypoint.x, waypoint.y))
Expand Down Expand Up @@ -133,6 +140,7 @@ impl ControlWindow for WorldExplorerData {
.shape(MarkerShape::Diamond);
plot_ui.points(points);
}
waypoint_record.clear();
}
}
}
Expand Down