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

Improved start positions:

Browse Source 
- Karts will now start forwards_distance after the lap counting line,
  meaning they will start behind the 'checkers' line.
- Every 2nd row is now moved 0.5*sidewards_distance to the right,
  meaning that there is much more space ahead of the kart for
  quick starts (i.e. the kart can drive between the karts in
  the row ahead of it).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@6285 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
hikerstk 2010-10-14 00:56:25 +00:00
parent b900230305
commit 50cd88e562
2 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/tracks/graph_node.hpp
View File

@ -127,6 +127,10 @@ public:
// ------------------------------------------------------------------------
/** Returns the center point of the upper edge of this graph node. */
const Vec3& getUpperCenter() const {return m_upper_center;}
// ------------------------------------------------------------------------
/** Returns the length of the quad of this node. */
float getNodeLength() const
{return (m_lower_center-m_upper_center).length();}
}; // GraphNode
#endif

24
src/tracks/quad_graph.cpp
View File

@ -207,26 +207,27 @@ void QuadGraph::setDefaultStartPositions(std::vector<btTransform>
{
// Node 0 is always the node on which the start line is.
int current_node = getPredecessor(0);
float distance_from_start = 0.1f;
float distance_from_start = 0.1f+forwards_distance;
// Maximum distance to left (or right) of centre line
const float max_x_dist = (karts_per_row-1)*0.5f*sidewards_distance;
const float max_x_dist = 0.5f*(karts_per_row-0.5f)*sidewards_distance;
// X position relative to the centre line
float x_pos = -max_x_dist;
float x_pos = -max_x_dist + sidewards_distance*0.5f;
unsigned int row_number = 0;
for(unsigned int i=0; i<start_transforms->size(); i++)
{
// First find on which segment we have to start
while(distance_from_start > getNode(current_node).getDistanceToSuccessor(0))
while(distance_from_start > getNode(current_node).getNodeLength())
{
distance_from_start -= getNode(current_node).getDistanceToSuccessor(0);
distance_from_start -= getNode(current_node).getNodeLength();
current_node = getPredecessor(current_node);
}
const GraphNode &gn = getNode(current_node);
Vec3 center_line = gn.getLowerCenter() - gn.getUpperCenter();
center_line.normalize();
Vec3 horizontal_line = gn[3] - gn[2];
Vec3 horizontal_line = gn[2] - gn[3];
horizontal_line.normalize();
Vec3 start = gn.getUpperCenter()
@ -238,9 +239,16 @@ void QuadGraph::setDefaultStartPositions(std::vector<btTransform>
(*start_transforms)[i].setRotation(
btQuaternion(btVector3(0, 1, 0),
gn.getAngleToSuccessor(0)));
if(fabsf(x_pos - max_x_dist)<0.1f)
if(x_pos >= max_x_dist-sidewards_distance*0.5f)
{
x_pos = -max_x_dist;
// Every 2nd row will be pushed sideways by half the distance
// between karts, so that a kart can drive between the karts in
// the row ahead of it.
row_number ++;
if(row_number % 2 == 0)
x_pos += sidewards_distance*0.5f;
}
else
x_pos += sidewards_distance;
distance_from_start += forwards_distance;