Add temporary hack to prevent division on zero errors in interpolation code.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10071 4a71c877-e1ca-e34f-864e-861f7616d084master
parent
412cfdb983
commit
210f9cc3a3
|
@ -28,6 +28,7 @@
|
|||
static inline float interpolateFloat(float v1, float v2, uint32_t t1, uint32_t t2, uint32_t t)
|
||||
{
|
||||
int32_t numer = t - t1, denom = t2 - t1;
|
||||
if (denom == 0) return v2; // TEMPORARY HACK
|
||||
return v1 + (v2 - v1) * numer/denom;
|
||||
}
|
||||
|
||||
|
@ -35,6 +36,7 @@ static inline uint16_t interpolateDegree(uint16_t v1, uint16_t v2, uint32_t t1,
|
|||
{
|
||||
uint16_t numer = t - t1, denom = t2 - t1;
|
||||
int16_t diff = v2 - v1;
|
||||
if (denom == 0) return v2; // TEMPORARY HACK
|
||||
return v1 + diff * numer / denom;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue