markmental/yapb-noob-edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed UpdateLookAngles is not called at all since last commit :)

Browse source
This commit is contained in:
jeefo 2015-08-02 20:31:14 +03:00
commit a5c1c0dc7f
6 changed files with 35 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

28
source/waypoint.cpp
View file

@ -117,9 +117,9 @@ int Waypoint::FindNearest (const Vector &origin, float minDistance, int flags)
if (flags != -1 && !(m_paths[i]->flags & flags))
continue; // if flag not -1 and waypoint has no this flag, skip waypoint
float distance = (m_paths[i]->origin - origin).GetLength ();
float distance = (m_paths[i]->origin - origin).GetLengthSquared ();
if (distance < minDistance)
if (distance < GET_SQUARE (minDistance))
{
index = i;
minDistance = distance;
@ -128,32 +128,16 @@ int Waypoint::FindNearest (const Vector &origin, float minDistance, int flags)
return index;
}
void Waypoint::FindInRadius (const Vector &origin, float radius, int *holdTab, int *count)
void Waypoint::FindInRadius (Array <int> &radiusHolder, float radius, const Vector &origin, int maxCount)
{
// returns all waypoints within radius from position
int maxCount = *count;
*count = 0;
for (int i = 0; i < g_numWaypoints; i++)
{
if ((m_paths[i]->origin - origin).GetLength () < radius)
{
*holdTab++ = i;
*count += 1;
if (maxCount != -1 && radiusHolder.GetElementNumber () > maxCount)
break;
if (*count >= maxCount)
break;
}
}
*count -= 1;
}
void Waypoint::FindInRadius (Array <int> &radiusHolder, float radius, const Vector &origin)
{
for (int i = 0; i < g_numWaypoints; i++)
{
if ((m_paths[i]->origin - origin).GetLength () < radius)
if ((m_paths[i]->origin - origin).GetLengthSquared () < GET_SQUARE (radius))
radiusHolder.Push (i);
}
}