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

Fixed incorrect start positions in tracks that don't have checklines defined

Browse Source 
(removed old, temporary global variable and replaced it with correct
variable in class), added a warning message printed to stdout in case
that checkline are missing.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5977 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
hikerstk 2010-09-12 23:57:23 +00:00
parent a998641ae7
commit 7ee4faa950
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/tracks/track.cpp
View File

@ -57,8 +57,6 @@ using namespace irr;
const float Track::NOHIT = -99999.9f;
btTransform global_start;
// ----------------------------------------------------------------------------
Track::Track(std::string filename)
{
@ -189,8 +187,8 @@ void Track::setStartCoordinates(const core::line2df& line)
end.X - start.X);
core::vector2df mid = (start+end)*0.5f;
btQuaternion q(Vec3(0, 1, 0), m_start_angle);
global_start.setRotation(q);
global_start.setOrigin(Vec3(mid.X, 0, mid.Y));
m_start_transform.setRotation(q);
m_start_transform.setOrigin(Vec3(mid.X, 0, mid.Y));
} // setStartCoordinates
//-----------------------------------------------------------------------------
@ -217,7 +215,7 @@ btTransform Track::getStartTransform(unsigned int pos) const
orig = Vec3( X_DIST * (pos%2==0) ? 1.0f : -1.0f,
1.0f,
-Z_DIST*pos-Z_DIST_FROM_START);
orig = global_start(orig);
orig = m_start_transform(orig);
angle = m_start_angle;
}
@ -934,6 +932,13 @@ void Track::loadTrackModel(World* parent, unsigned int mode_id)
if(m_use_fog)
for(unsigned int i=0; i<m_all_nodes.size(); i++)
m_all_nodes[i]->setMaterialFlag(video::EMF_FOG_ENABLE, true);
if(!m_check_manager)
{
printf("WARNING: no check lines found in track '%s'.\n",
m_ident.c_str());
printf("Lap counting will not work, and start positions might be incorrect.\n");
}
} // loadTrackModel
//-----------------------------------------------------------------------------