From a23932ddf26cc3a3a72b33b7584ea2d6d8a386d5 Mon Sep 17 00:00:00 2001 From: "EverLEEst(SangHyeon Lee)" Date: Wed, 22 Nov 2023 14:08:37 +0900 Subject: [PATCH] Revert "[Tizen] Property Notify for orientation changes" This reverts commit 6dd55bb08194baf2c5dd606790f0395e1c13440b. --- .../update/common/property-condition-step-functions.cpp | 15 --------------- .../update/common/property-condition-step-functions.h | 9 --------- .../common/property-condition-variable-step-functions.cpp | 15 --------------- .../common/property-condition-variable-step-functions.h | 9 --------- dali/public-api/object/property-conditions.h | 2 -- 5 files changed, 50 deletions(-) diff --git a/dali/internal/update/common/property-condition-step-functions.cpp b/dali/internal/update/common/property-condition-step-functions.cpp index 8674b0b..9076a8a 100644 --- a/dali/internal/update/common/property-condition-step-functions.cpp +++ b/dali/internal/update/common/property-condition-step-functions.cpp @@ -20,7 +20,6 @@ #include #include #include -#include #include namespace Dali @@ -71,11 +70,6 @@ ConditionFunction Step::GetFunction(Property::Type valueType) function = EvalVector4; break; } - case Property::ROTATION: - { - function = EvalQuaternion; - break; - } default: { function = EvalDefault; @@ -167,15 +161,6 @@ bool Step::EvalVector4(const Dali::PropertyInput& value, PropertyNotification::R return Evaluate(propertyValue, arg); } -bool Step::EvalQuaternion(const Dali::PropertyInput& value, PropertyNotification::RawArgumentContainer& arg) -{ - Quaternion propertyValue = value.GetQuaternion(); - // TODO : Make some meaningfule calculation here - Vector4 v = propertyValue.EulerAngles(); - const float checkValue = v.LengthSquared(); - return Evaluate(checkValue, arg); -} - bool Step::EvalDefault(const Dali::PropertyInput& value, PropertyNotification::RawArgumentContainer& arg) { return false; diff --git a/dali/internal/update/common/property-condition-step-functions.h b/dali/internal/update/common/property-condition-step-functions.h index 7f5dc5d..57fe42c 100644 --- a/dali/internal/update/common/property-condition-step-functions.h +++ b/dali/internal/update/common/property-condition-step-functions.h @@ -39,7 +39,6 @@ namespace SceneGraph * Vector2 => 2 dimensional length of vector has stepped arg1 amount from arg0. * Vector3 => 3 dimensional length of vector has stepped arg1 amount from arg0. * Vector4 => 4 dimensional length of vector has stepped arg1 amount from arg0. - * Quaternion => sum of rotation angle and axis changes has stepped arg1 amount from arg0 * Default => return false. */ class Step @@ -114,14 +113,6 @@ private: static bool EvalVector4(const Dali::PropertyInput& value, PropertyNotification::RawArgumentContainer& arg); /** - * Checks if Quaternion is Outside - * @param[in] value The value being examined. - * @param[in] arg The supplied arguments for the condition. - * @return Condition result (true if condition met, false if not) - */ - static bool EvalQuaternion(const Dali::PropertyInput& value, PropertyNotification::RawArgumentContainer& arg); - - /** * Default check for other types. * @param[in] value The value being examined. * @param[in] arg The supplied arguments for the condition. diff --git a/dali/internal/update/common/property-condition-variable-step-functions.cpp b/dali/internal/update/common/property-condition-variable-step-functions.cpp index 8f61c7a..e194329 100644 --- a/dali/internal/update/common/property-condition-variable-step-functions.cpp +++ b/dali/internal/update/common/property-condition-variable-step-functions.cpp @@ -20,7 +20,6 @@ #include #include #include -#include #include namespace Dali @@ -68,11 +67,6 @@ ConditionFunction VariableStep::GetFunction(Property::Type valueType) function = EvalVector4; break; } - case Property::ROTATION: - { - function = EvalQuaternion; - break; - } default: { function = EvalDefault; @@ -178,15 +172,6 @@ bool VariableStep::EvalVector4(const Dali::PropertyInput& value, PropertyNotific return Evaluate(propertyValue, arg); } -bool VariableStep::EvalQuaternion(const Dali::PropertyInput& value, PropertyNotification::RawArgumentContainer& arg) -{ - Quaternion propertyValue = value.GetQuaternion(); - // TODO : Make some meaningfule calculation here - Vector4 v = propertyValue.EulerAngles(); - const float checkValue = v.LengthSquared(); - return Evaluate(checkValue, arg); -} - bool VariableStep::EvalDefault(const Dali::PropertyInput& value, PropertyNotification::RawArgumentContainer& arg) { return false; diff --git a/dali/internal/update/common/property-condition-variable-step-functions.h b/dali/internal/update/common/property-condition-variable-step-functions.h index d404e1b..16c7640 100644 --- a/dali/internal/update/common/property-condition-variable-step-functions.h +++ b/dali/internal/update/common/property-condition-variable-step-functions.h @@ -39,7 +39,6 @@ namespace SceneGraph * Vector2 => 2 dimensional length of vector has stepped arg1 amount from arg0. * Vector3 => 3 dimensional length of vector has stepped arg1 amount from arg0. * Vector4 => 4 dimensional length of vector has stepped arg1 amount from arg0. - * Quaternion => sum of rotation angle and axis changes has stepped arg1 amount from arg0 * Default => return false. */ class VariableStep @@ -100,14 +99,6 @@ private: static bool EvalVector4(const Dali::PropertyInput& value, PropertyNotification::RawArgumentContainer& arg); /** - * Checks if Quaternion is Outside - * @param[in] value The value being examined. - * @param[in] arg The supplied arguments for the condition. - * @return Condition result (true if condition met, false if not) - */ - static bool EvalQuaternion(const Dali::PropertyInput& value, PropertyNotification::RawArgumentContainer& arg); - - /** * Default check for other types. * @param[in] value The value being examined. * @param[in] arg The supplied arguments for the condition. diff --git a/dali/public-api/object/property-conditions.h b/dali/public-api/object/property-conditions.h index 99ec9b7..a3f39e9 100644 --- a/dali/public-api/object/property-conditions.h +++ b/dali/public-api/object/property-conditions.h @@ -178,7 +178,6 @@ DALI_CORE_API PropertyCondition OutsideCondition(float arg0, float arg1); * vector2 (the 2D length) * vector3 (the 3D length) * vector4 (the 4D length) - * quaternion (the radian of rotation and axis) * @SINCE_1_0.0 * @param[in] stepAmount The step size required to trigger condition * @param[in] initialValue The initial value to step from @@ -194,7 +193,6 @@ DALI_CORE_API PropertyCondition StepCondition(float stepAmount, float initialVal * vector2 (the 2D length) * vector3 (the 3D length) * vector4 (the 4D length) - * quaternion (the radian of rotation and axis) * @SINCE_1_0.0 * @param[in] steps List of values to receive notifications for as a property crosses them * @return A property condition function object -- 2.7.4