ryujinx-backup/Opentk
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #4 from Nihlus/fix-division-rounding

Browse source 
Fixed rounding error in division operations.
This commit is contained in:
varon 2017-06-03 20:12:46 +02:00 committed by GitHub
commit ecdd0cdc0d
6 changed files with 44 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/OpenTK/Math/Vector2.cs
View file

@ -623,7 +623,8 @@ namespace OpenTK
/// <param name="result">Result of the operation.</param>
public static void Divide(ref Vector2 vector, float scale, out Vector2 result)
{
Multiply(ref vector, 1 / scale, out result);
result.X = vector.X / scale;
result.Y = vector.Y / scale;
}
/// <summary>
@ -1143,9 +1144,8 @@ namespace OpenTK
/// <returns>Result of the division.</returns>
public static Vector2 operator /(Vector2 vec, float scale)
{
float mult = 1.0f / scale;
vec.X *= mult;
vec.Y *= mult;
vec.X /= scale;
vec.Y /= scale;
return vec;
}

8
src/OpenTK/Math/Vector2d.cs
View file

@ -541,7 +541,8 @@ namespace OpenTK
/// <param name="result">Result of the operation.</param>
public static void Divide(ref Vector2d vector, double scale, out Vector2d result)
{
Multiply(ref vector, 1 / scale, out result);
result.X = vector.X / scale;
result.Y = vector.Y / scale;
}
/// <summary>
@ -1065,9 +1066,8 @@ namespace OpenTK
/// <returns>The result of the operation.</returns>
public static Vector2d operator /(Vector2d vec, double f)
{
double mult = 1.0 / f;
vec.X *= mult;
vec.Y *= mult;
vec.X /= f;
vec.Y /= f;
return vec;
}

11
src/OpenTK/Math/Vector3.cs
View file

@ -629,7 +629,9 @@ namespace OpenTK
/// <param name="result">Result of the operation.</param>
public static void Divide(ref Vector3 vector, float scale, out Vector3 result)
{
Multiply(ref vector, 1 / scale, out result);
result.X = vector.X / scale;
result.Y = vector.Y / scale;
result.Z = vector.Z / scale;
}
/// <summary>
@ -1634,10 +1636,9 @@ namespace OpenTK
/// <returns>The result of the calculation.</returns>
public static Vector3 operator /(Vector3 vec, float scale)
{
float mult = 1.0f / scale;
vec.X *= mult;
vec.Y *= mult;
vec.Z *= mult;
vec.X /= scale;
vec.Y /= scale;
vec.Z /= scale;
return vec;
}

11
src/OpenTK/Math/Vector3d.cs
View file

@ -627,7 +627,9 @@ namespace OpenTK
/// <param name="result">Result of the operation.</param>
public static void Divide(ref Vector3d vector, double scale, out Vector3d result)
{
Multiply(ref vector, 1 / scale, out result);
result.X = vector.X / scale;
result.Y = vector.Y / scale;
result.Z = vector.Z / scale;
}
/// <summary>
@ -1451,10 +1453,9 @@ namespace OpenTK
/// <returns>The result of the calculation.</returns>
public static Vector3d operator /(Vector3d vec, double scale)
{
double mult = 1 / scale;
vec.X *= mult;
vec.Y *= mult;
vec.Z *= mult;
vec.X /= scale;
vec.Y /= scale;
vec.Z /= scale;
return vec;
}

32
src/OpenTK/Math/Vector4.cs
View file

@ -514,11 +514,10 @@ namespace OpenTK
/// <returns>Result of the division</returns>
public static Vector4 Div(Vector4 a, float f)
{
float mult = 1.0f / f;
a.X *= mult;
a.Y *= mult;
a.Z *= mult;
a.W *= mult;
a.X /= f;
a.Y /= f;
a.Z /= f;
a.W /= f;
return a;
}
@ -530,11 +529,10 @@ namespace OpenTK
/// <param name="result">Result of the division</param>
public static void Div(ref Vector4 a, float f, out Vector4 result)
{
float mult = 1.0f / f;
result.X = a.X * mult;
result.Y = a.Y * mult;
result.Z = a.Z * mult;
result.W = a.W * mult;
result.X = a.X / f;
result.Y = a.Y / f;
result.Z = a.Z / f;
result.W = a.W / f;
}
#endregion
@ -667,7 +665,10 @@ namespace OpenTK
/// <param name="result">Result of the operation.</param>
public static void Divide(ref Vector4 vector, float scale, out Vector4 result)
{
Multiply(ref vector, 1 / scale, out result);
result.X = vector.X / scale;
result.Y = vector.Y / scale;
result.Z = vector.Z / scale;
result.W = vector.W / scale;
}
/// <summary>
@ -1705,11 +1706,10 @@ namespace OpenTK
/// <returns>The result of the calculation.</returns>
public static Vector4 operator /(Vector4 vec, float scale)
{
float mult = 1.0f / scale;
vec.X *= mult;
vec.Y *= mult;
vec.Z *= mult;
vec.W *= mult;
vec.X /= scale;
vec.Y /= scale;
vec.Z /= scale;
vec.W /= scale;
return vec;
}

14
src/OpenTK/Math/Vector4d.cs
View file

@ -669,7 +669,10 @@ namespace OpenTK
/// <param name="result">Result of the operation.</param>
public static void Divide(ref Vector4d vector, double scale, out Vector4d result)
{
Multiply(ref vector, 1 / scale, out result);
result.X = vector.X / scale;
result.Y = vector.Y / scale;
result.Z = vector.Z / scale;
result.W = vector.W / scale;
}
/// <summary>
@ -1641,11 +1644,10 @@ namespace OpenTK
/// <returns>The result of the calculation.</returns>
public static Vector4d operator /(Vector4d vec, double scale)
{
double mult = 1 / scale;
vec.X *= mult;
vec.Y *= mult;
vec.Z *= mult;
vec.W *= mult;
vec.X /= scale;
vec.Y /= scale;
vec.Z /= scale;
vec.W /= scale;
return vec;
}