diff --git a/Source/Contents/Map/FlyingShipRouteInfo.cpp b/Source/Contents/Map/FlyingShipRouteInfo.cpp index 5d66d0b7b..664a7ebde 100644 --- a/Source/Contents/Map/FlyingShipRouteInfo.cpp +++ b/Source/Contents/Map/FlyingShipRouteInfo.cpp @@ -34,7 +34,7 @@ void CFlyingShipRouteInfo::Draw(UIRoMapWnd* wnd) { targets.insert(std::pair(entry.name, entry)); DrawScreenLine( - from.screenPosition[0], from.screenPosition[1], entry.screenPosition[0], entry.screenPosition[1], 2, + ScreenPoint{from.screenPosition[0], from.screenPosition[1]}, ScreenPoint{entry.screenPosition[0], entry.screenPosition[1]}, 2, g_texMgr.Load(this->lineTextureName.c_str(), 0, true, true, false), static_cast(this->lineColor) ); } diff --git a/Source/Render/Projection/ScreenGeometry.cpp b/Source/Render/Projection/ScreenGeometry.cpp index cdcc50530..f2fda5f26 100644 --- a/Source/Render/Projection/ScreenGeometry.cpp +++ b/Source/Render/Projection/ScreenGeometry.cpp @@ -10,13 +10,13 @@ // OFFSET: 0x0054E2B0 // FUNCTION: fn_01951 -void DrawScreenLine(float startX, float startY, float endX, float endY, int thickness, CTexture* texture, std::uint32_t color) { - if (SquareRoot((endY - startY) * (endY - startY) + (endX - startX) * (endX - startX)) == 0.0f) { +void DrawScreenLine(ScreenPoint start, ScreenPoint end, int thickness, CTexture* texture, std::uint32_t color) { + if (SquareRoot((end.y - start.y) * (end.y - start.y) + (end.x - start.x) * (end.x - start.x)) == 0.0f) { return; } - const float deltaX = endX - startX; - const float deltaY = endY - startY; + const float deltaX = end.x - start.x; + const float deltaY = end.y - start.y; const float inverseLength = 1.0f / SquareRoot(deltaY * deltaY + deltaX * deltaX); float angle = static_cast(std::acos(static_cast(inverseLength * deltaX))); if (inverseLength * deltaY < 0.0f) { @@ -28,7 +28,7 @@ void DrawScreenLine(float startX, float startY, float endX, float endY, int thic const float offsetY = ClientSin(angle) * width; const float offsetX = ClientCos(angle) * width; DrawScreenQuad( - startX - offsetX, startY - offsetY, startX + offsetX, startY + offsetY, endX - offsetX, endY - offsetY, endX + offsetX, endY + offsetY, texture, color + start.x - offsetX, start.y - offsetY, start.x + offsetX, start.y + offsetY, end.x - offsetX, end.y - offsetY, end.x + offsetX, end.y + offsetY, texture, color ); } diff --git a/Source/Render/Projection/ScreenGeometry.h b/Source/Render/Projection/ScreenGeometry.h index 30ba57ec9..40a3c608f 100644 --- a/Source/Render/Projection/ScreenGeometry.h +++ b/Source/Render/Projection/ScreenGeometry.h @@ -15,7 +15,7 @@ struct ScreenPoint { __declspec(noinline) void DrawScreenQuad( float x0, float y0, float x1, float y1, float x2, float y2, float x3, float y3, CTexture* texture, std::uint32_t color ); -void DrawScreenLine(float startX, float startY, float endX, float endY, int thickness, CTexture* texture, std::uint32_t color); +void DrawScreenLine(ScreenPoint start, ScreenPoint end, int thickness, CTexture* texture, std::uint32_t color); void DrawScreenQuad(ScreenPoint p0, ScreenPoint p1, ScreenPoint p2, ScreenPoint p3, CTexture* texture, std::uint32_t color); #endif diff --git a/Source/UI/Navigation/UIRoMapWnd.cpp b/Source/UI/Navigation/UIRoMapWnd.cpp index 176bca24a..171d212ab 100644 --- a/Source/UI/Navigation/UIRoMapWnd.cpp +++ b/Source/UI/Navigation/UIRoMapWnd.cpp @@ -337,9 +337,9 @@ void UIRoMapWnd::DrawDungeonLinks() { const float endY = static_cast(mapHeight) * g_depthAverageHalf + static_cast(map->top) + 1.0f; CTexture* const lineTexture = g_texMgr.Default(); if (isSelected) { - DrawScreenLine(startX, startY, endX, endY, 1, lineTexture, (selectColor & 0xFFFFFF) - 0x1000000); + DrawScreenLine(ScreenPoint{startX, startY}, ScreenPoint{endX, endY}, 1, lineTexture, (selectColor & 0xFFFFFF) - 0x1000000); } else { - DrawScreenLine(startX, startY, endX, endY, 1, lineTexture, lineColor); + DrawScreenLine(ScreenPoint{startX, startY}, ScreenPoint{endX, endY}, 1, lineTexture, lineColor); } DrawTexturedRectangle(map->left, map->top, mapWidth, mapHeight, isSelected ? 0xFFFFFFFF : rectColor, positionTexture); @@ -380,7 +380,7 @@ void UIRoMapWnd::DrawMarks() { const float startY = static_cast(previous[3] - previous[1]) * g_depthAverageHalf + static_cast(previous[1]); const float endX = static_cast(area[2] - area[0]) * g_depthAverageHalf + static_cast(area[0]); const float endY = static_cast(area[3] - area[1]) * g_depthAverageHalf + static_cast(area[1]); - DrawScreenLine(startX, startY, endX, endY, 5, g_texMgr.Load("유저인터페이스\\worldview_interface\\wv_Airf2.bmp", 0, false, true, false), 0x99FFFFFF); + DrawScreenLine(ScreenPoint{startX, startY}, ScreenPoint{endX, endY}, 5, g_texMgr.Load("유저인터페이스\\worldview_interface\\wv_Airf2.bmp", 0, false, true, false), 0x99FFFFFF); } }