mirror/Aquaria
1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2025-08-07 22:59:50 +00:00
Code Issues Releases Wiki Activity

fix far off minimap symbols. broke in ce7239056

Browse source
This commit is contained in:
fgenesis 2016-04-08 23:58:48 +02:00
parent 486541b1d7
commit 83ce096119
1 changed files with 12 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Aquaria/MiniMapRender.cpp
View file

@ -769,14 +769,12 @@ void MiniMapRender::renderIcon(MinimapIcon *ico, const Vector& pos)
return; return;
Vector d = pos - dsq->game->avatar->position; Vector d = pos - dsq->game->avatar->position;
const float len = d.getLength2D(); const float len = d.getLength2D();
float iconScale; float iconScale = 1;
if (len < iconMaxOffset || !ico->scaleWithDistance) if (len >= iconMaxOffset)
{ {
iconScale = 1; d *= iconMaxOffset / len; // clamp to outer circle distance
} if(ico->scaleWithDistance)
else
{ {
d *= iconMaxOffset / len;
float k; float k;
if (len < iconMaxDistance) if (len < iconMaxDistance)
k = ((iconMaxDistance - len) / (iconMaxDistance - iconMaxOffset)); k = ((iconMaxDistance - len) / (iconMaxDistance - iconMaxOffset));
@ -784,6 +782,7 @@ void MiniMapRender::renderIcon(MinimapIcon *ico, const Vector& pos)
k = 0; k = 0;
iconScale = iconMinScale + k*(1-iconMinScale); iconScale = iconMinScale + k*(1-iconMinScale);
} }
}
ico->tex->apply(); ico->tex->apply();
const Vector c = ico->color; const Vector c = ico->color;