mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Try to keep the current tile under the mouse cursor. 

This still doesn't work as well as I'd like yet, most notably when zooming out.
This commit is contained in:
Aaron van Geffen 2016-07-22 01:01:24 +02:00
parent 17cbdf795e
commit f035bfdecd
2 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/interface/window.c
View File

@ -1452,6 +1452,24 @@ void window_viewport_get_map_coords_by_cursor(rct_window *w, sint16 *map_x, sint
get_map_coordinates_from_pos(mouse_x, mouse_y, VIEWPORT_INTERACTION_MASK_NONE, map_x, map_y, NULL, NULL, NULL);
}
void window_viewport_centre_tile_around_cursor(rct_window *w, sint16 map_x, sint16 map_y)
{
// Get viewport coordinates centring around the tile.
int dest_x, dest_y;
center_2d_coordinates(map_x, map_y, 14, &dest_x, &dest_y, w->viewport);
// Get mouse position to offset against.
int mouse_x, mouse_y;
platform_get_cursor_position(&mouse_x, &mouse_y);
// Rebase mouse position onto centre of window.
int rebased_x = (w->width >> 1) - mouse_x,
rebased_y = (w->height >> 1) - mouse_y;
w->saved_view_x = dest_x + rebased_x;
w->saved_view_y = dest_y + rebased_y;
}
void window_zoom_set(rct_window *w, int zoomLevel)
{
rct_viewport* v = w->viewport;
@ -1486,11 +1504,7 @@ void window_zoom_set(rct_window *w, int zoomLevel)
// Zooming to cursor? Centre around the tile we were hovering over just now.
if (gConfigGeneral.zoom_to_cursor) {
int dest_x, dest_y;
center_2d_coordinates(saved_map_x, saved_map_y, 14, &dest_x, &dest_y, v);
w->saved_view_x = dest_x;
w->saved_view_y = dest_y;
window_viewport_centre_tile_around_cursor(w, saved_map_x, saved_map_y);
}
// HACK: Prevents the redraw from failing when there is

1
src/interface/window.h
View File

@ -575,6 +575,7 @@ void window_scroll_to_viewport(rct_window *w);
void window_scroll_to_location(rct_window *w, int x, int y, int z);
void window_rotate_camera(rct_window *w, int direction);
void window_viewport_get_map_coords_by_cursor(rct_window *w, sint16 *map_x, sint16 *map_y);
void window_viewport_centre_tile_around_cursor(rct_window *w, sint16 map_x, sint16 map_y);
void window_zoom_set(rct_window *w, int zoomLevel);
void window_zoom_in(rct_window *w);
void window_zoom_out(rct_window *w);