From 51610859ec69bca8bd1839e93a504c8d0f9b0487 Mon Sep 17 00:00:00 2001 From: Kimmo Hoikka Date: Fri, 27 Feb 2015 10:24:29 -0800 Subject: [PATCH] Revert "Remove unused constants, don't export constant that have fixed values" This reverts commit 3ad766215d2e3e4666c42ff6846a56519187e034. Change-Id: I863c8fff25fea8304457d1803bf96fcf151f81c4 --- automated-tests/src/dali/utc-Dali-Scripting.cpp | 26 ++++- dali/public-api/common/constants.cpp | 89 +++++++++++++++ dali/public-api/common/constants.h | 141 +++++++++++++++--------- dali/public-api/scripting/scripting.cpp | 18 +++ 4 files changed, 220 insertions(+), 54 deletions(-) diff --git a/automated-tests/src/dali/utc-Dali-Scripting.cpp b/automated-tests/src/dali/utc-Dali-Scripting.cpp index f223874..4c11e21 100644 --- a/automated-tests/src/dali/utc-Dali-Scripting.cpp +++ b/automated-tests/src/dali/utc-Dali-Scripting.cpp @@ -224,6 +224,15 @@ int UtcDaliScriptingGetAnchorConstant(void) { TestApplication application; + DALI_TEST_EQUALS( Dali::ParentOrigin::BACK_TOP_LEFT, GetAnchorConstant( "BACK_TOP_LEFT" ), TEST_LOCATION ); + DALI_TEST_EQUALS( Dali::ParentOrigin::BACK_TOP_CENTER, GetAnchorConstant( "BACK_TOP_CENTER" ), TEST_LOCATION ); + DALI_TEST_EQUALS( Dali::ParentOrigin::BACK_TOP_RIGHT, GetAnchorConstant( "BACK_TOP_RIGHT" ), TEST_LOCATION ); + DALI_TEST_EQUALS( Dali::ParentOrigin::BACK_CENTER_LEFT, GetAnchorConstant( "BACK_CENTER_LEFT" ), TEST_LOCATION ); + DALI_TEST_EQUALS( Dali::ParentOrigin::BACK_CENTER, GetAnchorConstant( "BACK_CENTER" ), TEST_LOCATION ); + DALI_TEST_EQUALS( Dali::ParentOrigin::BACK_CENTER_RIGHT, GetAnchorConstant( "BACK_CENTER_RIGHT" ), TEST_LOCATION ); + DALI_TEST_EQUALS( Dali::ParentOrigin::BACK_BOTTOM_LEFT, GetAnchorConstant( "BACK_BOTTOM_LEFT" ), TEST_LOCATION ); + DALI_TEST_EQUALS( Dali::ParentOrigin::BACK_BOTTOM_CENTER, GetAnchorConstant( "BACK_BOTTOM_CENTER" ), TEST_LOCATION ); + DALI_TEST_EQUALS( Dali::ParentOrigin::BACK_BOTTOM_RIGHT, GetAnchorConstant( "BACK_BOTTOM_RIGHT" ), TEST_LOCATION ); DALI_TEST_EQUALS( Dali::ParentOrigin::TOP_LEFT, GetAnchorConstant( "TOP_LEFT" ), TEST_LOCATION ); DALI_TEST_EQUALS( Dali::ParentOrigin::TOP_CENTER, GetAnchorConstant( "TOP_CENTER" ), TEST_LOCATION ); DALI_TEST_EQUALS( Dali::ParentOrigin::TOP_RIGHT, GetAnchorConstant( "TOP_RIGHT" ), TEST_LOCATION ); @@ -233,6 +242,15 @@ int UtcDaliScriptingGetAnchorConstant(void) DALI_TEST_EQUALS( Dali::ParentOrigin::BOTTOM_LEFT, GetAnchorConstant( "BOTTOM_LEFT" ), TEST_LOCATION ); DALI_TEST_EQUALS( Dali::ParentOrigin::BOTTOM_CENTER, GetAnchorConstant( "BOTTOM_CENTER" ), TEST_LOCATION ); DALI_TEST_EQUALS( Dali::ParentOrigin::BOTTOM_RIGHT, GetAnchorConstant( "BOTTOM_RIGHT" ), TEST_LOCATION ); + DALI_TEST_EQUALS( Dali::ParentOrigin::FRONT_TOP_LEFT, GetAnchorConstant( "FRONT_TOP_LEFT" ), TEST_LOCATION ); + DALI_TEST_EQUALS( Dali::ParentOrigin::FRONT_TOP_CENTER, GetAnchorConstant( "FRONT_TOP_CENTER" ), TEST_LOCATION ); + DALI_TEST_EQUALS( Dali::ParentOrigin::FRONT_TOP_RIGHT, GetAnchorConstant( "FRONT_TOP_RIGHT" ), TEST_LOCATION ); + DALI_TEST_EQUALS( Dali::ParentOrigin::FRONT_CENTER_LEFT, GetAnchorConstant( "FRONT_CENTER_LEFT" ), TEST_LOCATION ); + DALI_TEST_EQUALS( Dali::ParentOrigin::FRONT_CENTER, GetAnchorConstant( "FRONT_CENTER" ), TEST_LOCATION ); + DALI_TEST_EQUALS( Dali::ParentOrigin::FRONT_CENTER_RIGHT, GetAnchorConstant( "FRONT_CENTER_RIGHT" ), TEST_LOCATION ); + DALI_TEST_EQUALS( Dali::ParentOrigin::FRONT_BOTTOM_LEFT, GetAnchorConstant( "FRONT_BOTTOM_LEFT" ), TEST_LOCATION ); + DALI_TEST_EQUALS( Dali::ParentOrigin::FRONT_BOTTOM_CENTER, GetAnchorConstant( "FRONT_BOTTOM_CENTER" ), TEST_LOCATION ); + DALI_TEST_EQUALS( Dali::ParentOrigin::FRONT_BOTTOM_RIGHT, GetAnchorConstant( "FRONT_BOTTOM_RIGHT" ), TEST_LOCATION ); try { @@ -676,8 +694,8 @@ int UtcDaliScriptingNewActorProperties(void) } // Check Anchor point and parent origin STRINGS - map[ "parent-origin" ] = "TOP_LEFT"; - map[ "anchor-point" ] = "CENTER_LEFT"; + map[ "parent-origin" ] = "BACK_TOP_LEFT"; + map[ "anchor-point" ] = "FRONT_CENTER_LEFT"; { Actor handle = NewActor( map ); DALI_TEST_CHECK( handle ); @@ -686,8 +704,8 @@ int UtcDaliScriptingNewActorProperties(void) application.SendNotification(); application.Render(); - DALI_TEST_EQUALS( handle.GetCurrentParentOrigin(), ParentOrigin::TOP_LEFT, TEST_LOCATION ); - DALI_TEST_EQUALS( handle.GetCurrentAnchorPoint(), AnchorPoint::CENTER_LEFT, TEST_LOCATION ); + DALI_TEST_EQUALS( handle.GetCurrentParentOrigin(), ParentOrigin::BACK_TOP_LEFT, TEST_LOCATION ); + DALI_TEST_EQUALS( handle.GetCurrentAnchorPoint(), AnchorPoint::FRONT_CENTER_LEFT, TEST_LOCATION ); Stage::GetCurrent().Remove( handle ); } diff --git a/dali/public-api/common/constants.cpp b/dali/public-api/common/constants.cpp index 089d2f8..73a9527 100644 --- a/dali/public-api/common/constants.cpp +++ b/dali/public-api/common/constants.cpp @@ -28,6 +28,95 @@ namespace Dali { +const float ParentOrigin::TOP = 0.0f; +const float ParentOrigin::BOTTOM = 1.0f; +const float ParentOrigin::LEFT = 0.0f; +const float ParentOrigin::RIGHT = 1.0f; +const float ParentOrigin::MIDDLE = 0.5f; + +const Vector3 ParentOrigin::BACK_TOP_LEFT (0.0f, 0.0f, 0.0f); +const Vector3 ParentOrigin::BACK_TOP_CENTER (0.5f, 0.0f, 0.0f); +const Vector3 ParentOrigin::BACK_TOP_RIGHT (1.0f, 0.0f, 0.0f); +const Vector3 ParentOrigin::BACK_CENTER_LEFT (0.0f, 0.5f, 0.0f); +const Vector3 ParentOrigin::BACK_CENTER (0.5f, 0.5f, 0.0f); +const Vector3 ParentOrigin::BACK_CENTER_RIGHT (1.0f, 0.5f, 0.0f); +const Vector3 ParentOrigin::BACK_BOTTOM_LEFT (0.0f, 1.0f, 0.0f); +const Vector3 ParentOrigin::BACK_BOTTOM_CENTER(0.5f, 1.0f, 0.0f); +const Vector3 ParentOrigin::BACK_BOTTOM_RIGHT (1.0f, 1.0f, 0.0f); + +const Vector3 ParentOrigin::TOP_LEFT (0.0f, 0.0f, 0.5f); +const Vector3 ParentOrigin::TOP_CENTER (0.5f, 0.0f, 0.5f); +const Vector3 ParentOrigin::TOP_RIGHT (1.0f, 0.0f, 0.5f); +const Vector3 ParentOrigin::CENTER_LEFT (0.0f, 0.5f, 0.5f); +const Vector3 ParentOrigin::CENTER (0.5f, 0.5f, 0.5f); +const Vector3 ParentOrigin::CENTER_RIGHT (1.0f, 0.5f, 0.5f); +const Vector3 ParentOrigin::BOTTOM_LEFT (0.0f, 1.0f, 0.5f); +const Vector3 ParentOrigin::BOTTOM_CENTER(0.5f, 1.0f, 0.5f); +const Vector3 ParentOrigin::BOTTOM_RIGHT (1.0f, 1.0f, 0.5f); + +const Vector3 ParentOrigin::FRONT_TOP_LEFT (0.0f, 0.0f, 1.0f); +const Vector3 ParentOrigin::FRONT_TOP_CENTER (0.5f, 0.0f, 1.0f); +const Vector3 ParentOrigin::FRONT_TOP_RIGHT (1.0f, 0.0f, 1.0f); +const Vector3 ParentOrigin::FRONT_CENTER_LEFT (0.0f, 0.5f, 1.0f); +const Vector3 ParentOrigin::FRONT_CENTER (0.5f, 0.5f, 1.0f); +const Vector3 ParentOrigin::FRONT_CENTER_RIGHT (1.0f, 0.5f, 1.0f); +const Vector3 ParentOrigin::FRONT_BOTTOM_LEFT (0.0f, 1.0f, 1.0f); +const Vector3 ParentOrigin::FRONT_BOTTOM_CENTER(0.5f, 1.0f, 1.0f); +const Vector3 ParentOrigin::FRONT_BOTTOM_RIGHT (1.0f, 1.0f, 1.0f); + +const Vector3 ParentOrigin::DEFAULT( ParentOrigin::TOP_LEFT ); + +const float AnchorPoint::TOP = 0.0f; +const float AnchorPoint::BOTTOM = 1.0f; +const float AnchorPoint::LEFT = 0.0f; +const float AnchorPoint::RIGHT = 1.0f; +const float AnchorPoint::MIDDLE = 0.5f; + +const Vector3 AnchorPoint::BACK_TOP_LEFT (0.0f, 0.0f, 0.0f); +const Vector3 AnchorPoint::BACK_TOP_CENTER (0.5f, 0.0f, 0.0f); +const Vector3 AnchorPoint::BACK_TOP_RIGHT (1.0f, 0.0f, 0.0f); +const Vector3 AnchorPoint::BACK_CENTER_LEFT (0.0f, 0.5f, 0.0f); +const Vector3 AnchorPoint::BACK_CENTER (0.5f, 0.5f, 0.0f); +const Vector3 AnchorPoint::BACK_CENTER_RIGHT (1.0f, 0.5f, 0.0f); +const Vector3 AnchorPoint::BACK_BOTTOM_LEFT (0.0f, 1.0f, 0.0f); +const Vector3 AnchorPoint::BACK_BOTTOM_CENTER(0.5f, 1.0f, 0.0f); +const Vector3 AnchorPoint::BACK_BOTTOM_RIGHT (1.0f, 1.0f, 0.0f); + +const Vector3 AnchorPoint::TOP_LEFT (0.0f, 0.0f, 0.5f); +const Vector3 AnchorPoint::TOP_CENTER (0.5f, 0.0f, 0.5f); +const Vector3 AnchorPoint::TOP_RIGHT (1.0f, 0.0f, 0.5f); +const Vector3 AnchorPoint::CENTER_LEFT (0.0f, 0.5f, 0.5f); +const Vector3 AnchorPoint::CENTER (0.5f, 0.5f, 0.5f); +const Vector3 AnchorPoint::CENTER_RIGHT (1.0f, 0.5f, 0.5f); +const Vector3 AnchorPoint::BOTTOM_LEFT (0.0f, 1.0f, 0.5f); +const Vector3 AnchorPoint::BOTTOM_CENTER(0.5f, 1.0f, 0.5f); +const Vector3 AnchorPoint::BOTTOM_RIGHT (1.0f, 1.0f, 0.5f); + +const Vector3 AnchorPoint::FRONT_TOP_LEFT (0.0f, 0.0f, 1.0f); +const Vector3 AnchorPoint::FRONT_TOP_CENTER (0.5f, 0.0f, 1.0f); +const Vector3 AnchorPoint::FRONT_TOP_RIGHT (1.0f, 0.0f, 1.0f); +const Vector3 AnchorPoint::FRONT_CENTER_LEFT (0.0f, 0.5f, 1.0f); +const Vector3 AnchorPoint::FRONT_CENTER (0.5f, 0.5f, 1.0f); +const Vector3 AnchorPoint::FRONT_CENTER_RIGHT (1.0f, 0.5f, 1.0f); +const Vector3 AnchorPoint::FRONT_BOTTOM_LEFT (0.0f, 1.0f, 1.0f); +const Vector3 AnchorPoint::FRONT_BOTTOM_CENTER(0.5f, 1.0f, 1.0f); +const Vector3 AnchorPoint::FRONT_BOTTOM_RIGHT (1.0f, 1.0f, 1.0f); + +const Vector3 AnchorPoint::DEFAULT( AnchorPoint::CENTER ); + +const Vector4 Color::BLACK( 0.0f, 0.0f, 0.0f, 1.0f ); +const Vector4 Color::WHITE( 1.0f, 1.0f, 1.0f, 1.0f ); + +const Vector4 Color::RED( 1.0f, 0.0f, 0.0f, 1.0f ); +const Vector4 Color::GREEN( 0.0f, 1.0f, 0.0f, 1.0f ); +const Vector4 Color::BLUE( 0.0f, 0.0f, 1.0f, 1.0f ); + +const Vector4 Color::YELLOW( 1.0f, 1.0f, 0.0f, 1.0f ); +const Vector4 Color::MAGENTA( 1.0f, 0.0f, 1.0f, 1.0f ); +const Vector4 Color::CYAN( 0.0f, 1.0f, 1.0f, 1.0f ); + +const Vector4 Color::TRANSPARENT( 0.0f, 0.0f, 0.0f, 0.0f ); + // epsilon constants const float Math::MACHINE_EPSILON_0 = Epsilon<0>::value; const float Math::MACHINE_EPSILON_1 = Epsilon<1>::value; diff --git a/dali/public-api/common/constants.h b/dali/public-api/common/constants.h index 28b0bb1..ec7d8ee 100644 --- a/dali/public-api/common/constants.h +++ b/dali/public-api/common/constants.h @@ -26,7 +26,7 @@ #include #include -namespace Dali +namespace Dali DALI_IMPORT_API { /** @@ -36,23 +36,44 @@ namespace Dali */ namespace ParentOrigin { -const float TOP = 0.0f; -const float BOTTOM = 1.0f; -const float LEFT = 0.0f; -const float RIGHT = 1.0f; -const float MIDDLE = 0.5f; - -const Vector3 TOP_LEFT( 0.0f, 0.0f, 0.5f ); -const Vector3 TOP_CENTER( 0.5f, 0.0f, 0.5f ); -const Vector3 TOP_RIGHT( 1.0f, 0.0f, 0.5f ); -const Vector3 CENTER_LEFT( 0.0f, 0.5f, 0.5f ); -const Vector3 CENTER( 0.5f, 0.5f, 0.5f ); -const Vector3 CENTER_RIGHT( 1.0f, 0.5f, 0.5f ); -const Vector3 BOTTOM_LEFT( 0.0f, 1.0f, 0.5f ); -const Vector3 BOTTOM_CENTER( 0.5f, 1.0f, 0.5f ); -const Vector3 BOTTOM_RIGHT( 1.0f, 1.0f, 0.5f ); - -const Vector3 DEFAULT( TOP_LEFT ); +extern const Vector3 DEFAULT; ///< TOP_LEFT + +extern const float TOP; ///< 0.0f +extern const float BOTTOM; ///< 1.0f +extern const float LEFT; ///< 0.0f +extern const float RIGHT; ///< 1.0f +extern const float MIDDLE; ///< 0.5f + +extern const Vector3 BACK_TOP_LEFT; ///< 0.0f, 0.0f, 0.0f +extern const Vector3 BACK_TOP_CENTER; ///< 0.5f, 0.0f, 0.0f +extern const Vector3 BACK_TOP_RIGHT; ///< 1.0f, 0.0f, 0.0f +extern const Vector3 BACK_CENTER_LEFT; ///< 0.0f, 0.5f, 0.0f +extern const Vector3 BACK_CENTER; ///< 0.5f, 0.5f, 0.0f +extern const Vector3 BACK_CENTER_RIGHT; ///< 1.0f, 0.5f, 0.0f +extern const Vector3 BACK_BOTTOM_LEFT; ///< 0.0f, 1.0f, 0.0f +extern const Vector3 BACK_BOTTOM_CENTER; ///< 0.5f, 1.0f, 0.0f +extern const Vector3 BACK_BOTTOM_RIGHT; ///< 1.0f, 1.0f, 0.0f + +extern const Vector3 TOP_LEFT; ///< 0.0f, 0.0f, 0.5f +extern const Vector3 TOP_CENTER; ///< 0.5f, 0.0f, 0.5f +extern const Vector3 TOP_RIGHT; ///< 1.0f, 0.0f, 0.5f +extern const Vector3 CENTER_LEFT; ///< 0.0f, 0.5f, 0.5f +extern const Vector3 CENTER; ///< 0.5f, 0.5f, 0.5f +extern const Vector3 CENTER_RIGHT; ///< 1.0f, 0.5f, 0.5f +extern const Vector3 BOTTOM_LEFT; ///< 0.0f, 1.0f, 0.5f +extern const Vector3 BOTTOM_CENTER; ///< 0.5f, 1.0f, 0.5f +extern const Vector3 BOTTOM_RIGHT; ///< 1.0f, 1.0f, 0.5f + +extern const Vector3 FRONT_TOP_LEFT; ///< 0.0f, 0.0f, 1.0f +extern const Vector3 FRONT_TOP_CENTER; ///< 0.5f, 0.0f, 1.0f +extern const Vector3 FRONT_TOP_RIGHT; ///< 1.0f, 0.0f, 1.0f +extern const Vector3 FRONT_CENTER_LEFT; ///< 0.0f, 0.5f, 1.0f +extern const Vector3 FRONT_CENTER; ///< 0.5f, 0.5f, 1.0f +extern const Vector3 FRONT_CENTER_RIGHT; ///< 1.0f, 0.5f, 1.0f +extern const Vector3 FRONT_BOTTOM_LEFT; ///< 0.0f, 1.0f, 1.0f +extern const Vector3 FRONT_BOTTOM_CENTER;///< 0.5f, 1.0f, 1.0f +extern const Vector3 FRONT_BOTTOM_RIGHT; ///< 1.0f, 1.0f, 1.0f + } /** @@ -62,23 +83,43 @@ const Vector3 DEFAULT( TOP_LEFT ); */ namespace AnchorPoint { -const float TOP = 0.0f; -const float BOTTOM = 1.0f; -const float LEFT = 0.0f; -const float RIGHT = 1.0f; -const float MIDDLE = 0.5f; - -const Vector3 TOP_LEFT( 0.0f, 0.0f, 0.5f ); -const Vector3 TOP_CENTER( 0.5f, 0.0f, 0.5f ); -const Vector3 TOP_RIGHT( 1.0f, 0.0f, 0.5f ); -const Vector3 CENTER_LEFT( 0.0f, 0.5f, 0.5f ); -const Vector3 CENTER( 0.5f, 0.5f, 0.5f ); -const Vector3 CENTER_RIGHT( 1.0f, 0.5f, 0.5f ); -const Vector3 BOTTOM_LEFT( 0.0f, 1.0f, 0.5f ); -const Vector3 BOTTOM_CENTER( 0.5f, 1.0f, 0.5f ); -const Vector3 BOTTOM_RIGHT( 1.0f, 1.0f, 0.5f ); - -const Vector3 DEFAULT( CENTER ); +extern const float TOP; ///< 0.0f +extern const float BOTTOM; ///< 1.0f +extern const float LEFT; ///< 0.0f +extern const float RIGHT; ///< 1.0f +extern const float MIDDLE; ///< 0.5f + +extern const Vector3 DEFAULT; ///< CENTER + +extern const Vector3 BACK_TOP_LEFT; ///< 0.0f, 0.0f, 0.0f +extern const Vector3 BACK_TOP_CENTER; ///< 0.5f, 0.0f, 0.0f +extern const Vector3 BACK_TOP_RIGHT; ///< 1.0f, 0.0f, 0.0f +extern const Vector3 BACK_CENTER_LEFT; ///< 0.0f, 0.5f, 0.0f +extern const Vector3 BACK_CENTER; ///< 0.5f, 0.5f, 0.0f +extern const Vector3 BACK_CENTER_RIGHT; ///< 1.0f, 0.5f, 0.0f +extern const Vector3 BACK_BOTTOM_LEFT; ///< 0.0f, 1.0f, 0.0f +extern const Vector3 BACK_BOTTOM_CENTER; ///< 0.5f, 1.0f, 0.0f +extern const Vector3 BACK_BOTTOM_RIGHT; ///< 1.0f, 1.0f, 0.0f + +extern const Vector3 TOP_LEFT; ///< 0.0f, 0.0f, 0.5f +extern const Vector3 TOP_CENTER; ///< 0.5f, 0.0f, 0.5f +extern const Vector3 TOP_RIGHT; ///< 1.0f, 0.0f, 0.5f +extern const Vector3 CENTER_LEFT; ///< 0.0f, 0.5f, 0.5f +extern const Vector3 CENTER; ///< 0.5f, 0.5f, 0.5f +extern const Vector3 CENTER_RIGHT; ///< 1.0f, 0.5f, 0.5f +extern const Vector3 BOTTOM_LEFT; ///< 0.0f, 1.0f, 0.5f +extern const Vector3 BOTTOM_CENTER; ///< 0.5f, 1.0f, 0.5f +extern const Vector3 BOTTOM_RIGHT; ///< 1.0f, 1.0f, 0.5f + +extern const Vector3 FRONT_TOP_LEFT; ///< 0.0f, 0.0f, 1.0f +extern const Vector3 FRONT_TOP_CENTER; ///< 0.5f, 0.0f, 1.0f +extern const Vector3 FRONT_TOP_RIGHT; ///< 1.0f, 0.0f, 1.0f +extern const Vector3 FRONT_CENTER_LEFT; ///< 0.0f, 0.5f, 1.0f +extern const Vector3 FRONT_CENTER; ///< 0.5f, 0.5f, 1.0f +extern const Vector3 FRONT_CENTER_RIGHT; ///< 1.0f, 0.5f, 1.0f +extern const Vector3 FRONT_BOTTOM_LEFT; ///< 0.0f, 1.0f, 1.0f +extern const Vector3 FRONT_BOTTOM_CENTER;///< 0.5f, 1.0f, 1.0f +extern const Vector3 FRONT_BOTTOM_RIGHT; ///< 1.0f, 1.0f, 1.0f } @@ -89,18 +130,18 @@ const Vector3 DEFAULT( CENTER ); */ namespace Color { -const Vector4 BLACK(0.0f, 0.0f, 0.0f, 1.0f); -const Vector4 WHITE(1.0f, 1.0f, 1.0f, 1.0f); +extern const Vector4 BLACK; ///< Pure black (0.0f, 0.0f, 0.0f, 1.0f); +extern const Vector4 WHITE; ///< Pure white (1.0f, 1.0f, 1.0f, 1.0f); -const Vector4 RED(1.0f, 0.0f, 0.0f, 1.0f); -const Vector4 GREEN(0.0f, 1.0f, 0.0f, 1.0f); -const Vector4 BLUE(0.0f, 0.0f, 1.0f, 1.0f); +extern const Vector4 RED; ///< Pure red (1.0f, 0.0f, 0.0f, 1.0f); +extern const Vector4 GREEN; ///< Pure green (0.0f, 1.0f, 0.0f, 1.0f); +extern const Vector4 BLUE; ///< Pure blue (0.0f, 0.0f, 1.0f, 1.0f); -const Vector4 YELLOW(1.0f, 1.0f, 0.0f, 1.0f); -const Vector4 MAGENTA(1.0f, 0.0f, 1.0f, 1.0f); -const Vector4 CYAN(0.0f, 1.0f, 1.0f, 1.0f); +extern const Vector4 YELLOW; ///< Pure yellow (1.0f, 1.0f, 0.0f, 1.0f); +extern const Vector4 MAGENTA; ///< Pure magenta (1.0f, 0.0f, 1.0f, 1.0f); +extern const Vector4 CYAN; ///< Pure cyan (0.0f, 1.0f, 1.0f, 1.0f); -const Vector4 TRANSPARENT(0.0f, 0.0f, 0.0f, 0.0f); +extern const Vector4 TRANSPARENT; ///< Black transparent (0.0f, 0.0f, 0.0f, 0.0f); } // namespace Color @@ -109,12 +150,12 @@ const Vector4 TRANSPARENT(0.0f, 0.0f, 0.0f, 0.0f); */ namespace Math { -DALI_IMPORT_API extern const float MACHINE_EPSILON_0; ///< Epsilon for values near zero -DALI_IMPORT_API extern const float MACHINE_EPSILON_1; ///< Epsilon for values near 1 -DALI_IMPORT_API extern const float MACHINE_EPSILON_10; ///< Epsilon for values near 10 -DALI_IMPORT_API extern const float MACHINE_EPSILON_100; ///< Epsilon for values near 100 -DALI_IMPORT_API extern const float MACHINE_EPSILON_1000; ///< Epsilon for values near 1000 -DALI_IMPORT_API extern const float MACHINE_EPSILON_10000; ///< Epsilon for values near 10000 +extern const float MACHINE_EPSILON_0; ///< Epsilon for values near zero +extern const float MACHINE_EPSILON_1; ///< Epsilon for values near 1 +extern const float MACHINE_EPSILON_10; ///< Epsilon for values near 10 +extern const float MACHINE_EPSILON_100; ///< Epsilon for values near 100 +extern const float MACHINE_EPSILON_1000; ///< Epsilon for values near 1000 +extern const float MACHINE_EPSILON_10000; ///< Epsilon for values near 10000 // float is preferred to double for performance on ARM targets const float PI = static_cast(M_PI); ///< Constant representing PI diff --git a/dali/public-api/scripting/scripting.cpp b/dali/public-api/scripting/scripting.cpp index fa83af7..448b802 100644 --- a/dali/public-api/scripting/scripting.cpp +++ b/dali/public-api/scripting/scripting.cpp @@ -67,6 +67,15 @@ const unsigned int DRAW_MODE_TABLE_COUNT = sizeof( DRAW_MODE_TABLE ) / sizeof( D const StringEnum< Vector3 > ANCHOR_CONSTANT_TABLE[] = { + { "BACK_TOP_LEFT", ParentOrigin::BACK_TOP_LEFT }, + { "BACK_TOP_CENTER", ParentOrigin::BACK_TOP_CENTER }, + { "BACK_TOP_RIGHT", ParentOrigin::BACK_TOP_RIGHT }, + { "BACK_CENTER_LEFT", ParentOrigin::BACK_CENTER_LEFT }, + { "BACK_CENTER", ParentOrigin::BACK_CENTER }, + { "BACK_CENTER_RIGHT", ParentOrigin::BACK_CENTER_RIGHT }, + { "BACK_BOTTOM_LEFT", ParentOrigin::BACK_BOTTOM_LEFT }, + { "BACK_BOTTOM_CENTER", ParentOrigin::BACK_BOTTOM_CENTER }, + { "BACK_BOTTOM_RIGHT", ParentOrigin::BACK_BOTTOM_RIGHT }, { "TOP_LEFT", ParentOrigin::TOP_LEFT }, { "TOP_CENTER", ParentOrigin::TOP_CENTER }, { "TOP_RIGHT", ParentOrigin::TOP_RIGHT }, @@ -76,6 +85,15 @@ const StringEnum< Vector3 > ANCHOR_CONSTANT_TABLE[] = { "BOTTOM_LEFT", ParentOrigin::BOTTOM_LEFT }, { "BOTTOM_CENTER", ParentOrigin::BOTTOM_CENTER }, { "BOTTOM_RIGHT", ParentOrigin::BOTTOM_RIGHT }, + { "FRONT_TOP_LEFT", ParentOrigin::FRONT_TOP_LEFT }, + { "FRONT_TOP_CENTER", ParentOrigin::FRONT_TOP_CENTER }, + { "FRONT_TOP_RIGHT", ParentOrigin::FRONT_TOP_RIGHT }, + { "FRONT_CENTER_LEFT", ParentOrigin::FRONT_CENTER_LEFT }, + { "FRONT_CENTER", ParentOrigin::FRONT_CENTER }, + { "FRONT_CENTER_RIGHT", ParentOrigin::FRONT_CENTER_RIGHT }, + { "FRONT_BOTTOM_LEFT", ParentOrigin::FRONT_BOTTOM_LEFT }, + { "FRONT_BOTTOM_CENTER", ParentOrigin::FRONT_BOTTOM_CENTER }, + { "FRONT_BOTTOM_RIGHT", ParentOrigin::FRONT_BOTTOM_RIGHT }, }; const unsigned int ANCHOR_CONSTANT_TABLE_COUNT = sizeof( ANCHOR_CONSTANT_TABLE ) / sizeof( ANCHOR_CONSTANT_TABLE[0] ); -- 2.7.4