epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

used clamp instead of Math.Min/Math.Max construct

Browse Source 
clarified naming
restored comments
removed blank line
This commit is contained in:
UnknownProgrammer
2016-09-03 15:27:04 +02:00
committed by GitHub
parent 333e8bae42
commit 65fe88daef
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
OpenRA.Game/WPos.cs
View File

@@ -63,11 +63,12 @@ namespace OpenRA
if (pitch.Angle == 0) if (pitch.Angle == 0)
return ret; return ret;
var tempoffset = (decimal)(b - a).Length * pitch.Tan() * mul * (div - mul) / (1024 * div * div); // Add an additional quadratic variation to height
// Uses decimal to avoid integer overflow
var offset = (decimal)(b - a).Length * pitch.Tan() * mul * (div - mul) / (1024 * div * div);
var clampedOffset = (int)(offset + (decimal)ret.Z).Clamp<decimal>((decimal)int.MinValue, (decimal)int.MaxValue);
var offset = (int)Math.Min(Math.Max((decimal)int.MinValue, tempoffset + (decimal)ret.Z), (decimal)int.MaxValue); return new WPos(ret.X, ret.Y, clampedOffset);
return new WPos(ret.X, ret.Y, offset);
} }
public override int GetHashCode() { return X.GetHashCode() ^ Y.GetHashCode() ^ Z.GetHashCode(); } public override int GetHashCode() { return X.GetHashCode() ^ Y.GetHashCode() ^ Z.GetHashCode(); }