ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

First try to fix #253 - it might have some performance

Browse Source 
impact since now all quads are checked if a kart is off road.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@8716 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
hikerstk 2011-05-26 06:02:10 +00:00
parent 2518b771cb
commit a8008d38d7
1 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/tracks/quad_graph.cpp
View File

@ -587,9 +587,23 @@ int QuadGraph::findOutOfRoadSector(const Vec3& xyz,
int current_sector = 0;
if(curr_sector != UNKNOWN_SECTOR && !all_sectors)
{
const int LIMIT = 10; //The limit prevents shortcuts
count = 2*LIMIT;
current_sector = curr_sector - LIMIT;
// We have to test all nodes here: reason is that on track with
// shortcuts the n quads of the main drivelines is followed by
// the quads of the shortcuts. So after quad n-1 (the last one
// before the lap counting line) quad n will not be 0 (the first
// quad after the lap counting line), but one of the quads on a
// shortcut. If we only tested a limited number of quads to
// improve the performance the crossing of a lap might not be
// detected (because quad 0 is not tested, only quads on the
// shortcuts are tested). If this should become a performance
// bottleneck, we need to set up a graph of 'next' quads for each
// quad (similar to what the AI does), and only test the quads
// in this graph.
const int LIMIT = getNumNodes();
count = LIMIT;
// Start 10 quads before the current quad, so the quads closest
// to the current position are tested first.
current_sector = curr_sector -10;
if(current_sector<0) current_sector += getNumNodes();
}
@ -601,7 +615,9 @@ int QuadGraph::findOutOfRoadSector(const Vec3& xyz,
if(all_sectors)
next_sector = (*all_sectors)[j];
else
next_sector = current_sector+1 == (int)getNumNodes() ? 0 : current_sector+1;
next_sector = current_sector+1 == (int)getNumNodes()
? 0
: current_sector+1;
// A first simple test uses the 2d distance to the center of the quad.
float dist_2 = m_all_nodes[next_sector]->getDistance2FromPoint(xyz);