From 8992f9057164705eda05a3d6af92e4aa048ccb78 Mon Sep 17 00:00:00 2001 From: the_fiddler Date: Tue, 6 Oct 2009 09:51:13 +0000 Subject: [PATCH] Replaced calls to obsolete methods. Fixed parameters in double versions of BaryCentric() (should be double instead of float). --- Source/OpenTK/Math/Vector2.cs | 12 ++++++------ Source/OpenTK/Math/Vector2d.cs | 14 +++++++------- Source/OpenTK/Math/Vector3.cs | 12 ++++++------ Source/OpenTK/Math/Vector3d.cs | 14 +++++++------- Source/OpenTK/Math/Vector4.cs | 12 ++++++------ Source/OpenTK/Math/Vector4d.cs | 14 +++++++------- 6 files changed, 39 insertions(+), 39 deletions(-) diff --git a/Source/OpenTK/Math/Vector2.cs b/Source/OpenTK/Math/Vector2.cs index 396c5166..ebfc8101 100644 --- a/Source/OpenTK/Math/Vector2.cs +++ b/Source/OpenTK/Math/Vector2.cs @@ -873,14 +873,14 @@ namespace OpenTK result = a; // copy Vector2 temp = b; // copy - temp.Sub(ref a); - temp.Mult(u); - result.Add(ref temp); + Subtract(ref temp, ref a, out temp); + Multiply(ref temp, u, out temp); + Add(ref result, ref temp, out result); temp = c; // copy - temp.Sub(ref a); - temp.Mult(v); - result.Add(ref temp); + Subtract(ref temp, ref a, out temp); + Multiply(ref temp, v, out temp); + Add(ref result, ref temp, out result); } #endregion diff --git a/Source/OpenTK/Math/Vector2d.cs b/Source/OpenTK/Math/Vector2d.cs index 1e48dfe6..48794668 100644 --- a/Source/OpenTK/Math/Vector2d.cs +++ b/Source/OpenTK/Math/Vector2d.cs @@ -756,19 +756,19 @@ namespace OpenTK /// First Barycentric Coordinate. /// Second Barycentric Coordinate. /// Output Vector. a when u=v=0, b when u=1,v=0, c when u=0,v=1, and a linear combination of a,b,c otherwise - public static void BaryCentric(ref Vector2d a, ref Vector2d b, ref Vector2d c, float u, float v, out Vector2d result) + public static void BaryCentric(ref Vector2d a, ref Vector2d b, ref Vector2d c, double u, double v, out Vector2d result) { result = a; // copy Vector2d temp = b; // copy - temp.Sub(ref a); - temp.Mult(u); - result.Add(ref temp); + Subtract(ref temp, ref a, out temp); + Multiply(ref temp, u, out temp); + Add(ref result, ref temp, out result); temp = c; // copy - temp.Sub(ref a); - temp.Mult(v); - result.Add(ref temp); + Subtract(ref temp, ref a, out temp); + Multiply(ref temp, v, out temp); + Add(ref result, ref temp, out result); } #endregion diff --git a/Source/OpenTK/Math/Vector3.cs b/Source/OpenTK/Math/Vector3.cs index be0f4842..0eece2c2 100644 --- a/Source/OpenTK/Math/Vector3.cs +++ b/Source/OpenTK/Math/Vector3.cs @@ -919,14 +919,14 @@ namespace OpenTK result = a; // copy Vector3 temp = b; // copy - temp.Sub(ref a); - temp.Mult(u); - result.Add(ref temp); + Subtract(ref temp, ref a, out temp); + Multiply(ref temp, u, out temp); + Add(ref result, ref temp, out result); temp = c; // copy - temp.Sub(ref a); - temp.Mult(v); - result.Add(ref temp); + Subtract(ref temp, ref a, out temp); + Multiply(ref temp, v, out temp); + Add(ref result, ref temp, out result); } #endregion diff --git a/Source/OpenTK/Math/Vector3d.cs b/Source/OpenTK/Math/Vector3d.cs index 86232371..2f44bfcf 100644 --- a/Source/OpenTK/Math/Vector3d.cs +++ b/Source/OpenTK/Math/Vector3d.cs @@ -913,19 +913,19 @@ namespace OpenTK /// First Barycentric Coordinate. /// Second Barycentric Coordinate. /// Output Vector. a when u=v=0, b when u=1,v=0, c when u=0,v=1, and a linear combination of a,b,c otherwise - public static void BaryCentric(ref Vector3d a, ref Vector3d b, ref Vector3d c, float u, float v, out Vector3d result) + public static void BaryCentric(ref Vector3d a, ref Vector3d b, ref Vector3d c, double u, double v, out Vector3d result) { result = a; // copy Vector3d temp = b; // copy - temp.Sub(ref a); - temp.Mult(u); - result.Add(ref temp); + Subtract(ref temp, ref a, out temp); + Multiply(ref temp, u, out temp); + Add(ref result, ref temp, out result); temp = c; // copy - temp.Sub(ref a); - temp.Mult(v); - result.Add(ref temp); + Subtract(ref temp, ref a, out temp); + Multiply(ref temp, v, out temp); + Add(ref result, ref temp, out result); } #endregion diff --git a/Source/OpenTK/Math/Vector4.cs b/Source/OpenTK/Math/Vector4.cs index a8295b4e..59f13236 100644 --- a/Source/OpenTK/Math/Vector4.cs +++ b/Source/OpenTK/Math/Vector4.cs @@ -904,14 +904,14 @@ namespace OpenTK result = a; // copy Vector4 temp = b; // copy - temp.Sub(ref a); - temp.Mult(u); - result.Add(ref temp); + Subtract(ref temp, ref a, out temp); + Multiply(ref temp, u, out temp); + Add(ref result, ref temp, out result); temp = c; // copy - temp.Sub(ref a); - temp.Mult(v); - result.Add(ref temp); + Subtract(ref temp, ref a, out temp); + Multiply(ref temp, v, out temp); + Add(ref result, ref temp, out result); } #endregion diff --git a/Source/OpenTK/Math/Vector4d.cs b/Source/OpenTK/Math/Vector4d.cs index 5264844f..d98fc2d2 100644 --- a/Source/OpenTK/Math/Vector4d.cs +++ b/Source/OpenTK/Math/Vector4d.cs @@ -902,19 +902,19 @@ namespace OpenTK /// First Barycentric Coordinate. /// Second Barycentric Coordinate. /// Output Vector. a when u=v=0, b when u=1,v=0, c when u=0,v=1, and a linear combination of a,b,c otherwise - public static void BaryCentric(ref Vector4d a, ref Vector4d b, ref Vector4d c, float u, float v, out Vector4d result) + public static void BaryCentric(ref Vector4d a, ref Vector4d b, ref Vector4d c, double u, double v, out Vector4d result) { result = a; // copy Vector4d temp = b; // copy - temp.Sub(ref a); - temp.Mult(u); - result.Add(ref temp); + Subtract(ref temp, ref a, out temp); + Multiply(ref temp, u, out temp); + Add(ref result, ref temp, out result); temp = c; // copy - temp.Sub(ref a); - temp.Mult(v); - result.Add(ref temp); + Subtract(ref temp, ref a, out temp); + Multiply(ref temp, v, out temp); + Add(ref result, ref temp, out result); } #endregion