MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

implement Gui::getMousePos and Gui::getDepthAt

develop
Myk Taylor 2022-12-28 16:00:10 -08:00
parent e8e3a61668
commit 07f8fad787
No known key found for this signature in database
GPG Key ID: 8A39CA0FA0C16E78
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
library/modules/Gui.cpp
Unescape Escape View File

@ -61,6 +61,7 @@ using namespace DFHack;
#include "df/general_ref.h" #include "df/general_ref.h"
#include "df/global_objects.h" #include "df/global_objects.h"
#include "df/graphic.h" #include "df/graphic.h"
#include "df/graphic_viewportst.h"
#include "df/historical_figure.h" #include "df/historical_figure.h"
#include "df/interfacest.h" #include "df/interfacest.h"
#include "df/item_corpsepiecest.h" #include "df/item_corpsepiecest.h"
@ -2151,16 +2152,24 @@ df::coord Gui::getMousePos()
df::coord pos; df::coord pos;
if (gps && gps->precise_mouse_x > -1) { if (gps && gps->precise_mouse_x > -1) {
pos = getViewportPos(); pos = getViewportPos();
/* TODO: understand how this changes for v50 int32_t map_tile_pixels = gps->viewport_zoom_factor >> 2;
pos.x += gps->mouse_x_pixel / tile_width; pos.x += gps->precise_mouse_x / map_tile_pixels;
pos.y += gps->mouse_y_pixel / tile_height; pos.y += gps->precise_mouse_y / map_tile_pixels;
*/
} }
return pos; return pos;
} }
int getDepthAt_default (int32_t x, int32_t y) int getDepthAt_default (int32_t x, int32_t y)
{ {
auto &main_vp = gps->main_viewport;
if (x < 0 || x >= main_vp->dim_x || y < 0 || y >= main_vp->dim_y)
return 0;
const size_t num_viewports = gps->viewport.size();
const size_t index = (x * main_vp->dim_y) + y;
for (int depth = 0; depth < num_viewports; ++depth) {
if (gps->viewport[depth]->screentexpos_background[index])
return depth;
}
return 0; return 0;
} }