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

Revert enable sliding for upside down tracks.

Browse Source 
Actually !getMaterial()->highTireAdhesion() is always false for
upside down texture, so the below code was useless to test with
normal
This commit is contained in:
Benau
2016-09-10 14:32:55 +08:00
parent 7cfd9752d0
commit b3d5e58dd1
1 changed files with 4 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/karts/kart.cpp
View File

@@ -2423,21 +2423,10 @@ void Kart::updateSliding()
(!getMaterial() || !getMaterial()->highTireAdhesion()))
{
const btMatrix3x3 &m = m_vehicle->getChassisWorldTransform().getBasis();
float distanceFromUp;
if (QuadGraph::get())
{
int sector = ((LinearWorld*)World::getWorld())->getTrackSector(getWorldKartId()).getCurrentGraphNode();
Vec3 quadNormal = QuadGraph::get()->getNode(sector)->getNormal();
Vec3 kart_up = m.getColumn(1);
distanceFromUp = kart_up.dot(quadNormal);
}
else
{
// To get the angle between up=(0,1,0), we have to do:
// m*(0,1,0) to get the up vector of the kart, then the
// scalar product between this and (0,1,0) - which is m[1][1]:
distanceFromUp = m[1][1];
}
// To get the angle between up=(0,1,0), we have to do:
// m*(0,1,0) to get the up vector of the kart, then the
// scalar product between this and (0,1,0) - which is m[1][1]:
float distanceFromUp = m[1][1];
if (distanceFromUp < 0.85f)
{