metin-server/m2dev-client-src
3
0
Fork 1
Code Issues 1 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #64 from savisxss/main

Browse Source
This commit is contained in:
rtw1x1
2026-01-02 14:25:06 +00:00
committed by GitHub
parent 9f6348ad8c 5fce64f978
commit 6d0fe59d50
1 changed files with 26 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/UserInterface/PythonMiniMap.cpp
View File

@@ -222,7 +222,9 @@ void CPythonMiniMap::Update(float fCenterX, float fCenterY)
} }
} }
const float c_fMiniMapWindowRadius = 55.0f; // Calculate dynamic radius based on actual minimap window size
// Subtract border width (approx 9 pixels) to keep markers inside visible area
const float c_fMiniMapWindowRadius = (m_fWidth < m_fHeight ? m_fWidth : m_fHeight) / 2.0f - 9.0f;
float fDistanceFromCenterX = (rAtlasMarkInfo.m_fX - m_fCenterX) * fooCellScale * m_fScale; float fDistanceFromCenterX = (rAtlasMarkInfo.m_fX - m_fCenterX) * fooCellScale * m_fScale;
float fDistanceFromCenterY = (rAtlasMarkInfo.m_fY - m_fCenterY) * fooCellScale * m_fScale; float fDistanceFromCenterY = (rAtlasMarkInfo.m_fY - m_fCenterY) * fooCellScale * m_fScale;
@@ -230,12 +232,11 @@ void CPythonMiniMap::Update(float fCenterX, float fCenterY)
if (fDistanceFromCenter >= c_fMiniMapWindowRadius) if (fDistanceFromCenter >= c_fMiniMapWindowRadius)
{ {
float fRadianX = acosf(fDistanceFromCenterX / fDistanceFromCenter); float fRadian = atan2f(fDistanceFromCenterY, fDistanceFromCenterX);
float fRadianY = asinf(fDistanceFromCenterY / fDistanceFromCenter); fDistanceFromCenterX = c_fMiniMapWindowRadius * cosf(fRadian);
fDistanceFromCenterX = 55.0f * cosf(fRadianX); fDistanceFromCenterY = c_fMiniMapWindowRadius * sinf(fRadian);
fDistanceFromCenterY = 55.0f * sinf(fRadianY); rAtlasMarkInfo.m_fMiniMapX = ( m_fWidth - (float)m_WhiteMark.GetWidth() ) / 2.0f + fDistanceFromCenterX + m_fScreenX;
rAtlasMarkInfo.m_fMiniMapX = ( m_fWidth - (float)m_WhiteMark.GetWidth() ) / 2.0f + fDistanceFromCenterX + m_fScreenX + 2.0f; rAtlasMarkInfo.m_fMiniMapY = ( m_fHeight - (float)m_WhiteMark.GetHeight() ) / 2.0f + fDistanceFromCenterY + m_fScreenY;
rAtlasMarkInfo.m_fMiniMapY = ( m_fHeight - (float)m_WhiteMark.GetHeight() ) / 2.0f + fDistanceFromCenterY + m_fScreenY + 2.0f;
} }
else else
{ {
@@ -465,7 +466,10 @@ void CPythonMiniMap::Render(float fScreenX, float fScreenY)
if (rAtlasMarkInfo.m_fMiniMapY <= 0.0f) if (rAtlasMarkInfo.m_fMiniMapY <= 0.0f)
continue; continue;
__RenderTargetMark(rAtlasMarkInfo.m_fMiniMapX, rAtlasMarkInfo.m_fMiniMapY); __RenderTargetMark(
rAtlasMarkInfo.m_fMiniMapX + m_WhiteMark.GetWidth() / 2,
rAtlasMarkInfo.m_fMiniMapY + m_WhiteMark.GetHeight() / 2
);
} }
} }
@@ -665,7 +669,10 @@ bool CPythonMiniMap::Create()
void CPythonMiniMap::__SetPosition() void CPythonMiniMap::__SetPosition()
{ {
m_fMiniMapRadius = fMIN(6400.0f / ((float) CTerrainImpl::CELLSCALE) * m_fScale, 64.0f); // Calculate dynamic radius - use smaller dimension to ensure circular clipping
// Subtract border width (approx 9 pixels) to keep markers inside visible area
float fWindowRadius = (m_fWidth < m_fHeight ? m_fWidth : m_fHeight) / 2.0f - 9.0f;
m_fMiniMapRadius = fMIN(6400.0f / ((float) CTerrainImpl::CELLSCALE) * m_fScale, fWindowRadius);
m_matWorld._11 = m_fWidth * m_fScale; m_matWorld._11 = m_fWidth * m_fScale;
m_matWorld._22 = m_fHeight * m_fScale; m_matWorld._22 = m_fHeight * m_fScale;
@@ -1022,11 +1029,19 @@ void CPythonMiniMap::RenderAtlas(float fScreenX, float fScreenY)
if (TYPE_TARGET == rAtlasMarkInfo.m_byType) if (TYPE_TARGET == rAtlasMarkInfo.m_byType)
{ {
__RenderMiniWayPointMark(rAtlasMarkInfo.m_fScreenX, rAtlasMarkInfo.m_fScreenY); // Convert from WhiteMark-centered to actual center for rendering
__RenderMiniWayPointMark(
rAtlasMarkInfo.m_fScreenX + m_WhiteMark.GetWidth() / 2,
rAtlasMarkInfo.m_fScreenY + m_WhiteMark.GetHeight() / 2
);
} }
else else
{ {
__RenderWayPointMark(rAtlasMarkInfo.m_fScreenX, rAtlasMarkInfo.m_fScreenY); // Convert from WhiteMark-centered to actual center for rendering
__RenderWayPointMark(
rAtlasMarkInfo.m_fScreenX + m_WhiteMark.GetWidth() / 2,
rAtlasMarkInfo.m_fScreenY + m_WhiteMark.GetHeight() / 2
);
} }
} }