actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Changed RageBezier2D EvaluateYFromX to only loop 100 times instead of forever.

Browse Source
This commit is contained in:
Kyzentun
2015-01-23 10:41:39 -07:00
parent 1a62b6bd70
commit cd3dd03149
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/RageMath.cpp
+3 -1
View File
@@ -705,7 +705,8 @@ float RageBezier2D::EvaluateYFromX( float fX ) const
* http://www.tinaja.com/text/bezmath.html). This usually finds T within an * http://www.tinaja.com/text/bezmath.html). This usually finds T within an
* acceptable error margin in a few steps. */ * acceptable error margin in a few steps. */
float fT = SCALE( fX, m_X.GetBezierStart(), m_X.GetBezierEnd(), 0, 1 ); float fT = SCALE( fX, m_X.GetBezierStart(), m_X.GetBezierEnd(), 0, 1 );
while(1) // Don't try more than 100 times, the curve might be a bit nonsensical. -Kyz
for(int i= 0; i < 100; ++i)
{ {
float fGuessedX = m_X.Evaluate( fT ); float fGuessedX = m_X.Evaluate( fT );
float fError = fX-fGuessedX; float fError = fX-fGuessedX;
@@ -717,6 +718,7 @@ float RageBezier2D::EvaluateYFromX( float fX ) const
float fSlope = m_X.GetSlope( fT ); float fSlope = m_X.GetSlope( fT );
fT += fError/fSlope; fT += fError/fSlope;
} }
return m_Y.Evaluate( fT );
} }
void RageBezier2D::SetFromBezier( void RageBezier2D::SetFromBezier(