summaryrefslogtreecommitdiffhomepage
path: root/main
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2022-10-18 05:23:48 +0200
committerStanislaw Halik <sthalik@misaki.pl>2022-10-18 05:23:48 +0200
commit40510b6e50ae9dd027c55e52c91433807ddf5c39 (patch)
tree997d5100539bfd7e5cf11290e0bf8447204575c0 /main
parentcf14af7dc7b6ffa3ef899a57079bafc5a8d63c68 (diff)
a
Diffstat (limited to 'main')
-rw-r--r--main/app.cpp4
-rw-r--r--main/camera.cpp23
2 files changed, 6 insertions, 21 deletions
diff --git a/main/app.cpp b/main/app.cpp
index 9fd9664d..f60b1287 100644
--- a/main/app.cpp
+++ b/main/app.cpp
@@ -81,7 +81,7 @@ void app::mouseReleaseEvent(Platform::Sdl2Application::MouseEvent& event)
void app::mouseMoveEvent(Platform::Sdl2Application::MouseMoveEvent& event)
{
- if (_imgui.handleMouseMoveEvent(event))
+ if (_imgui.handleMouseMoveEvent(event) && false)
return _cursor_tile = std::nullopt, event.setAccepted();
_cursor_pos = event.position();
@@ -114,7 +114,7 @@ void app::anyEvent(SDL_Event& event)
case SDL_WINDOWEVENT_ENTER:
return event_mouse_enter();
default:
- printf(""); break; // put breakpoint here
+ std::fputs("", stdout); break; // put breakpoint here
}
}
diff --git a/main/camera.cpp b/main/camera.cpp
index aa4cad00..7086b562 100644
--- a/main/camera.cpp
+++ b/main/camera.cpp
@@ -33,8 +33,11 @@ void app::do_camera(float dt_)
void app::reset_camera_offset()
{
- //_shader.set_camera_offset(tile_shader::project({TILE_MAX_DIM*.25*dTILE_SIZE[0], TILE_MAX_DIM*.25*dTILE_SIZE[1], 0}));
+#if 1
+ _shader.set_camera_offset(tile_shader::project({TILE_MAX_DIM*-.5*dTILE_SIZE[0], TILE_MAX_DIM*-.5*dTILE_SIZE[1], 0}));
+#else
_shader.set_camera_offset({});
+#endif
recalc_cursor_tile();
}
@@ -59,24 +62,6 @@ global_coords app::pixel_to_tile(Vector2d position) const
return { x, y };
}
-namespace sqrt_detail
-{
-constexpr double sqrt_Newton_Raphson(double x, double curr, double prev)
-{
- constexpr auto abs = [](double x) constexpr { return x < 0 ? -x : x; };
- while (abs(curr - prev) > 1e-16)
- {
- prev = curr;
- curr = .5 * (curr + x/curr);
- }
- return curr;
-}
-} // namespace sqrt_detail
-constexpr double ce_sqrt(double x)
-{
- return sqrt_detail::sqrt_Newton_Raphson(x, x, 0);
-}
-
std::array<std::int16_t, 4> app::get_draw_bounds() const noexcept
{
const auto center = pixel_to_tile(Vector2d(windowSize()/2)).chunk();