Skip to content

internal_2d_sweep() expected position class to have .x and .y members #16

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

internal_2d_sweep() expected position class to have .x and .y members #16

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
6 changes: 3 additions & 3 deletions rltk/visibility.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ namespace visibility_private {
* Benchmark results from example 6 (on my desktop):
* - Using line_func, it averages 0.3625 uS per line.
* - Using line_func_cancellable, it averages 0.25 uS per line.
* - Using a naieve float based slope, it averages 0.2 uS per line.
* - Using a naive float based slope, it averages 0.2 uS per line.
*/

template<class location_t_, class navigator_t>
Expand All @@ -30,9 +30,9 @@ void internal_2d_sweep(const location_t_ &position, const int &range, std::funct
const int end_x = start_x + offset.first;
const int end_y = start_y + offset.second;

line_func_cancellable(start_x, start_y, end_x, end_y, [&blocked, &is_opaque, &set_visible, &range, &position] (int X, int Y) {
line_func_cancellable(start_x, start_y, end_x, end_y, [&blocked, &is_opaque, &set_visible, &range, &start_x, &start_y] (int X, int Y) {
if (blocked) return false;
float distance = distance2d(static_cast<int>(position.x), static_cast<int>(position.y), X, Y);
float distance = distance2d(static_cast<int>(start_x), static_cast<int>(start_y), X, Y);
if (distance <= range) {
location_t_ pos = navigator_t::get_xy(X,Y);
if (!blocked) set_visible(pos);
Expand Down