From b9ded571eaeb657f4cfebd585b753e2ae8dd89cb Mon Sep 17 00:00:00 2001 From: huiyueun <35286162+huiyueun@users.noreply.github.com> Date: Wed, 20 Nov 2019 10:48:25 +0900 Subject: [PATCH] [NUI] Remove ValueCheck function (#1132) Signed-off-by: huiyu.eun --- src/Tizen.NUI/src/public/RelativeVector2.cs | 60 ++++---------------- src/Tizen.NUI/src/public/RelativeVector3.cs | 72 ++++-------------------- src/Tizen.NUI/src/public/RelativeVector4.cs | 86 +++++------------------------ 3 files changed, 34 insertions(+), 184 deletions(-) diff --git a/src/Tizen.NUI/src/public/RelativeVector2.cs b/src/Tizen.NUI/src/public/RelativeVector2.cs index d4d68af..ef2ff25 100755 --- a/src/Tizen.NUI/src/public/RelativeVector2.cs +++ b/src/Tizen.NUI/src/public/RelativeVector2.cs @@ -50,7 +50,7 @@ namespace Tizen.NUI /// The x component. /// The y component. /// 3 - public RelativeVector2(float x, float y) : this(Interop.Vector2.new_Vector2__SWIG_1(ValueCheck(x), ValueCheck(y)), true) + public RelativeVector2(float x, float y) : this(Interop.Vector2.new_Vector2__SWIG_1(x, y), true) { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } @@ -89,7 +89,7 @@ namespace Tizen.NUI { set { - Interop.Vector2.Vector2_X_set(swigCPtr, ValueCheck(value)); + Interop.Vector2.Vector2_X_set(swigCPtr, value); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } get @@ -108,7 +108,7 @@ namespace Tizen.NUI { set { - Interop.Vector2.Vector2_Y_set(swigCPtr, ValueCheck(value)); + Interop.Vector2.Vector2_Y_set(swigCPtr, value); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } get @@ -134,7 +134,7 @@ namespace Tizen.NUI public static RelativeVector2 operator +(RelativeVector2 arg1, RelativeVector2 arg2) { RelativeVector2 result = arg1.Add(arg2); - return ValueCheck(result); + return result; } /// @@ -147,7 +147,7 @@ namespace Tizen.NUI public static RelativeVector2 operator -(RelativeVector2 arg1, RelativeVector2 arg2) { RelativeVector2 result = arg1.Subtract(arg2); - return ValueCheck(result); + return result; } /// @@ -160,7 +160,7 @@ namespace Tizen.NUI public static RelativeVector2 operator *(RelativeVector2 arg1, RelativeVector2 arg2) { RelativeVector2 result = arg1.Multiply(arg2); - return ValueCheck(result); + return result; } /// @@ -173,7 +173,7 @@ namespace Tizen.NUI public static RelativeVector2 operator *(RelativeVector2 arg1, float arg2) { RelativeVector2 result = arg1.Multiply(arg2); - return ValueCheck(result); + return result; } /// @@ -186,7 +186,7 @@ namespace Tizen.NUI public static RelativeVector2 operator /(RelativeVector2 arg1, RelativeVector2 arg2) { RelativeVector2 result = arg1.Divide(arg2); - return ValueCheck(result); + return result; } /// @@ -199,7 +199,7 @@ namespace Tizen.NUI public static RelativeVector2 operator /(RelativeVector2 arg1, float arg2) { RelativeVector2 result = arg1.Divide(arg2); - return ValueCheck(result); + return result; } /// @@ -215,7 +215,7 @@ namespace Tizen.NUI /// 3 public static implicit operator RelativeVector2(Vector2 vec) { - return new RelativeVector2(ValueCheck(vec.X), ValueCheck(vec.Y)); + return new RelativeVector2(vec.X, vec.Y); } /// @@ -293,46 +293,6 @@ namespace Tizen.NUI return ret; } - internal static RelativeVector2 ValueCheck(RelativeVector2 relativeVector2) - { - if (relativeVector2.X < 0.0f) - { - relativeVector2.X = 0.0f; - NUILog.Error("The value of Result is invalid! Should be between [0, 1]."); - } - else if (relativeVector2.X > 1.0f) - { - relativeVector2.X = 1.0f; - NUILog.Error("The value of Result is invalid! Should be between [0, 1]."); - } - if (relativeVector2.Y < 0.0f) - { - relativeVector2.Y = 0.0f; - NUILog.Error("The value of Result is invalid! Should be between [0, 1]."); - } - else if (relativeVector2.Y > 1.0f) - { - relativeVector2.Y = 1.0f; - NUILog.Error("The value of Result is invalid! Should be between [0, 1]."); - } - return relativeVector2; - } - - internal static float ValueCheck(float value) - { - if (value < 0.0f) - { - value = 0.0f; - NUILog.Error("The value of Parameters is invalid! Should be between [0, 1]."); - } - else if (value > 1.0f) - { - value = 1.0f; - NUILog.Error("The value of Parameters is invalid! Should be between [0, 1]."); - } - return value; - } - /// /// Dispose. /// diff --git a/src/Tizen.NUI/src/public/RelativeVector3.cs b/src/Tizen.NUI/src/public/RelativeVector3.cs index 66e52ae..46fd63c 100755 --- a/src/Tizen.NUI/src/public/RelativeVector3.cs +++ b/src/Tizen.NUI/src/public/RelativeVector3.cs @@ -52,7 +52,7 @@ namespace Tizen.NUI /// The y component. /// The z component. /// 3 - public RelativeVector3(float x, float y, float z) : this(Interop.Vector3.new_Vector3__SWIG_1(ValueCheck(x), ValueCheck(y), ValueCheck(z)), true) + public RelativeVector3(float x, float y, float z) : this(Interop.Vector3.new_Vector3__SWIG_1(x, y, z), true) { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } @@ -85,7 +85,7 @@ namespace Tizen.NUI { set { - Interop.Vector3.Vector3_X_set(swigCPtr, ValueCheck(value)); + Interop.Vector3.Vector3_X_set(swigCPtr, value); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } get @@ -104,7 +104,7 @@ namespace Tizen.NUI { set { - Interop.Vector3.Vector3_Y_set(swigCPtr, ValueCheck(value)); + Interop.Vector3.Vector3_Y_set(swigCPtr, value); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } get @@ -123,7 +123,7 @@ namespace Tizen.NUI { set { - Interop.Vector3.Vector3_Z_set(swigCPtr, ValueCheck(value)); + Interop.Vector3.Vector3_Z_set(swigCPtr, value); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } get @@ -144,7 +144,7 @@ namespace Tizen.NUI public static RelativeVector3 operator +(RelativeVector3 arg1, RelativeVector3 arg2) { RelativeVector3 result = arg1.Add(arg2); - return ValueCheck(result); + return result; } /// @@ -157,7 +157,7 @@ namespace Tizen.NUI public static RelativeVector3 operator -(RelativeVector3 arg1, RelativeVector3 arg2) { RelativeVector3 result = arg1.Subtract(arg2); - return ValueCheck(result); + return result; } /// @@ -170,7 +170,7 @@ namespace Tizen.NUI public static RelativeVector3 operator *(RelativeVector3 arg1, RelativeVector3 arg2) { RelativeVector3 result = arg1.Multiply(arg2); - return ValueCheck(result); + return result; } /// @@ -183,7 +183,7 @@ namespace Tizen.NUI public static RelativeVector3 operator *(RelativeVector3 arg1, float arg2) { RelativeVector3 result = arg1.Multiply(arg2); - return ValueCheck(result); + return result; } /// @@ -196,7 +196,7 @@ namespace Tizen.NUI public static RelativeVector3 operator /(RelativeVector3 arg1, RelativeVector3 arg2) { RelativeVector3 result = arg1.Divide(arg2); - return ValueCheck(result); + return result; } /// @@ -209,7 +209,7 @@ namespace Tizen.NUI public static RelativeVector3 operator /(RelativeVector3 arg1, float arg2) { RelativeVector3 result = arg1.Divide(arg2); - return ValueCheck(result); + return result; } /// @@ -225,7 +225,7 @@ namespace Tizen.NUI /// 3 public static implicit operator RelativeVector3(Vector3 vec) { - return new RelativeVector3(ValueCheck(vec.X), ValueCheck(vec.Y), ValueCheck(vec.Z)); + return new RelativeVector3(vec.X, vec.Y, vec.Z); } /// @@ -294,56 +294,6 @@ namespace Tizen.NUI return ret; } - internal static RelativeVector3 ValueCheck(RelativeVector3 relativeVector3) - { - if (relativeVector3.X < 0.0f) - { - relativeVector3.X = 0.0f; - NUILog.Error("The value of Result is invalid! Should be between [0, 1]."); - } - else if (relativeVector3.X > 1.0f) - { - relativeVector3.X = 1.0f; - NUILog.Error("The value of Result is invalid! Should be between [0, 1]."); - } - if (relativeVector3.Y < 0.0f) - { - relativeVector3.Y = 0.0f; - NUILog.Error("The value of Result is invalid! Should be between [0, 1]."); - } - else if (relativeVector3.Y > 1.0f) - { - relativeVector3.Y = 1.0f; - NUILog.Error("The value of Result is invalid! Should be between [0, 1]."); - } - if (relativeVector3.Z < 0.0f) - { - relativeVector3.Z = 0.0f; - NUILog.Error("The value of Result is invalid! Should be between [0, 1]."); - } - else if (relativeVector3.Z > 1.0f) - { - relativeVector3.Z = 1.0f; - NUILog.Error("The value of Result is invalid! Should be between [0, 1]."); - } - return relativeVector3; - } - - internal static float ValueCheck(float value) - { - if (value < 0.0f) - { - value = 0.0f; - NUILog.Error("The value of Parameters is invalid! Should be between [0, 1]."); - } - else if (value > 1.0f) - { - value = 1.0f; - NUILog.Error("The value of Parameters is invalid! Should be between [0, 1]."); - } - return value; - } - /// /// internal static RelativeVector3 GetRelativeVector3FromPtr(global::System.IntPtr cPtr) diff --git a/src/Tizen.NUI/src/public/RelativeVector4.cs b/src/Tizen.NUI/src/public/RelativeVector4.cs index 0c4dead..0f1f777 100755 --- a/src/Tizen.NUI/src/public/RelativeVector4.cs +++ b/src/Tizen.NUI/src/public/RelativeVector4.cs @@ -52,7 +52,7 @@ namespace Tizen.NUI /// The z component. /// The w component. /// 3 - public RelativeVector4(float x, float y, float z, float w) : this(Interop.Vector4.new_Vector4__SWIG_1(ValueCheck(x), ValueCheck(y), ValueCheck(z), ValueCheck(w)), true) + public RelativeVector4(float x, float y, float z, float w) : this(Interop.Vector4.new_Vector4__SWIG_1(x, y, z, w), true) { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } @@ -77,7 +77,7 @@ namespace Tizen.NUI if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - internal RelativeVector4(RelativeVector4ChangedCallback cb, float x, float y, float z, float w) : this(Interop.Vector4.new_Vector4__SWIG_1(ValueCheck(x), ValueCheck(y), ValueCheck(z), ValueCheck(w)), true) + internal RelativeVector4(RelativeVector4ChangedCallback cb, float x, float y, float z, float w) : this(Interop.Vector4.new_Vector4__SWIG_1(x, y, z, w), true) { callback = cb; if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); @@ -93,7 +93,7 @@ namespace Tizen.NUI { set { - Interop.Vector4.Vector4_X_set(swigCPtr, ValueCheck(value)); + Interop.Vector4.Vector4_X_set(swigCPtr, value); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); callback?.Invoke(X, Y, Z, W); @@ -114,7 +114,7 @@ namespace Tizen.NUI { set { - Interop.Vector4.Vector4_Y_set(swigCPtr, ValueCheck(value)); + Interop.Vector4.Vector4_Y_set(swigCPtr, value); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); callback?.Invoke(X, Y, Z, W); @@ -135,7 +135,7 @@ namespace Tizen.NUI { set { - Interop.Vector4.Vector4_Z_set(swigCPtr, ValueCheck(value)); + Interop.Vector4.Vector4_Z_set(swigCPtr, value); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); callback?.Invoke(X, Y, Z, W); @@ -156,7 +156,7 @@ namespace Tizen.NUI { set { - Interop.Vector4.Vector4_W_set(swigCPtr, ValueCheck(value)); + Interop.Vector4.Vector4_W_set(swigCPtr, value); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); callback?.Invoke(X, Y, Z, W); @@ -179,7 +179,7 @@ namespace Tizen.NUI public static RelativeVector4 operator +(RelativeVector4 arg1, RelativeVector4 arg2) { RelativeVector4 result = arg1.Add(arg2); - return ValueCheck(result); + return result; } /// @@ -192,7 +192,7 @@ namespace Tizen.NUI public static RelativeVector4 operator -(RelativeVector4 arg1, RelativeVector4 arg2) { RelativeVector4 result = arg1.Subtract(arg2); - return ValueCheck(result); + return result; } /// @@ -205,7 +205,7 @@ namespace Tizen.NUI public static RelativeVector4 operator *(RelativeVector4 arg1, RelativeVector4 arg2) { RelativeVector4 result = arg1.Multiply(arg2); - return ValueCheck(result); + return result; } /// @@ -218,7 +218,7 @@ namespace Tizen.NUI public static RelativeVector4 operator *(RelativeVector4 arg1, float arg2) { RelativeVector4 result = arg1.Multiply(arg2); - return ValueCheck(result); + return result; } /// @@ -231,7 +231,7 @@ namespace Tizen.NUI public static RelativeVector4 operator /(RelativeVector4 arg1, RelativeVector4 arg2) { RelativeVector4 result = arg1.Divide(arg2); - return ValueCheck(result); + return result; } /// @@ -244,7 +244,7 @@ namespace Tizen.NUI public static RelativeVector4 operator /(RelativeVector4 arg1, float arg2) { RelativeVector4 result = arg1.Divide(arg2); - return ValueCheck(result); + return result; } /// @@ -260,7 +260,7 @@ namespace Tizen.NUI /// 3 public static implicit operator RelativeVector4(Vector4 vec) { - return new RelativeVector4(ValueCheck(vec.X), ValueCheck(vec.Y), ValueCheck(vec.Z), ValueCheck(vec.W)); + return new RelativeVector4(vec.X, vec.Y, vec.Z, vec.W); } /// @@ -338,66 +338,6 @@ namespace Tizen.NUI return ret; } - internal static RelativeVector4 ValueCheck(RelativeVector4 relativeVector4) - { - if (relativeVector4.X < 0.0f) - { - relativeVector4.X = 0.0f; - NUILog.Error("The value of Result is invalid! Should be between [0, 1]."); - } - else if (relativeVector4.X > 1.0f) - { - relativeVector4.X = 1.0f; - NUILog.Error("The value of Result is invalid! Should be between [0, 1]."); - } - if (relativeVector4.Y < 0.0f) - { - relativeVector4.Y = 0.0f; - NUILog.Error("The value of Result is invalid! Should be between [0, 1]."); - } - else if (relativeVector4.Y > 1.0f) - { - relativeVector4.Y = 1.0f; - NUILog.Error("The value of Result is invalid! Should be between [0, 1]."); - } - if (relativeVector4.Z < 0.0f) - { - relativeVector4.Z = 0.0f; - NUILog.Error("The value of Result is invalid! Should be between [0, 1]."); - } - else if (relativeVector4.Z > 1.0f) - { - relativeVector4.Z = 1.0f; - NUILog.Error("The value of Result is invalid! Should be between [0, 1]."); - } - if (relativeVector4.W < 0.0f) - { - relativeVector4.W = 0.0f; - NUILog.Error("The value of Result is invalid! Should be between [0, 1]."); - } - else if (relativeVector4.W > 1.0f) - { - relativeVector4.W = 1.0f; - NUILog.Error("The value of Result is invalid! Should be between [0, 1]."); - } - return relativeVector4; - } - - internal static float ValueCheck(float value) - { - if (value < 0.0f) - { - value = 0.0f; - NUILog.Error("The value of Parameters is invalid! Should be between [0, 1]."); - } - else if (value > 1.0f) - { - value = 1.0f; - NUILog.Error("The value of Parameters is invalid! Should be between [0, 1]."); - } - return value; - } - internal static global::System.Runtime.InteropServices.HandleRef getCPtr(RelativeVector4 obj) { return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr; -- 2.7.4