From: Kimmo Hoikka Date: Fri, 27 Feb 2015 18:45:11 +0000 (+0000) Subject: Removing unnecessary constants and unnecessary exports from built in types X-Git-Tag: dali_1.0.32~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F70%2F36070%2F3;p=platform%2Fcore%2Fuifw%2Fdali-core.git Removing unnecessary constants and unnecessary exports from built in types Change-Id: I25a60b0e4866d95035500c0df4e0f48c0db72857 --- diff --git a/automated-tests/src/dali/utc-Dali-Scripting.cpp b/automated-tests/src/dali/utc-Dali-Scripting.cpp index 4c11e21..f223874 100644 --- a/automated-tests/src/dali/utc-Dali-Scripting.cpp +++ b/automated-tests/src/dali/utc-Dali-Scripting.cpp @@ -224,15 +224,6 @@ 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 ); @@ -242,15 +233,6 @@ 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 { @@ -694,8 +676,8 @@ int UtcDaliScriptingNewActorProperties(void) } // Check Anchor point and parent origin STRINGS - map[ "parent-origin" ] = "BACK_TOP_LEFT"; - map[ "anchor-point" ] = "FRONT_CENTER_LEFT"; + map[ "parent-origin" ] = "TOP_LEFT"; + map[ "anchor-point" ] = "CENTER_LEFT"; { Actor handle = NewActor( map ); DALI_TEST_CHECK( handle ); @@ -704,8 +686,8 @@ int UtcDaliScriptingNewActorProperties(void) application.SendNotification(); application.Render(); - DALI_TEST_EQUALS( handle.GetCurrentParentOrigin(), ParentOrigin::BACK_TOP_LEFT, TEST_LOCATION ); - DALI_TEST_EQUALS( handle.GetCurrentAnchorPoint(), AnchorPoint::FRONT_CENTER_LEFT, TEST_LOCATION ); + DALI_TEST_EQUALS( handle.GetCurrentParentOrigin(), ParentOrigin::TOP_LEFT, TEST_LOCATION ); + DALI_TEST_EQUALS( handle.GetCurrentAnchorPoint(), AnchorPoint::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 73a9527..2023811 100644 --- a/dali/public-api/common/constants.cpp +++ b/dali/public-api/common/constants.cpp @@ -28,22 +28,6 @@ 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); @@ -54,34 +38,8 @@ 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); @@ -92,16 +50,6 @@ 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 ); diff --git a/dali/public-api/common/constants.h b/dali/public-api/common/constants.h index ec7d8ee..2f98174 100644 --- a/dali/public-api/common/constants.h +++ b/dali/public-api/common/constants.h @@ -26,7 +26,7 @@ #include #include -namespace Dali DALI_IMPORT_API +namespace Dali { /** @@ -37,42 +37,21 @@ namespace Dali DALI_IMPORT_API namespace ParentOrigin { 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 +static const float TOP = 0.0f; +static const float BOTTOM = 1.0f; +static const float LEFT = 0.0f; +static const float RIGHT = 1.0f; +static const float MIDDLE = 0.5f; + +DALI_IMPORT_API extern const Vector3 TOP_LEFT; ///< 0.0f, 0.0f, 0.5f +DALI_IMPORT_API extern const Vector3 TOP_CENTER; ///< 0.5f, 0.0f, 0.5f +DALI_IMPORT_API extern const Vector3 TOP_RIGHT; ///< 1.0f, 0.0f, 0.5f +DALI_IMPORT_API extern const Vector3 CENTER_LEFT; ///< 0.0f, 0.5f, 0.5f +DALI_IMPORT_API extern const Vector3 CENTER; ///< 0.5f, 0.5f, 0.5f +DALI_IMPORT_API extern const Vector3 CENTER_RIGHT; ///< 1.0f, 0.5f, 0.5f +DALI_IMPORT_API extern const Vector3 BOTTOM_LEFT; ///< 0.0f, 1.0f, 0.5f +DALI_IMPORT_API extern const Vector3 BOTTOM_CENTER; ///< 0.5f, 1.0f, 0.5f +DALI_IMPORT_API extern const Vector3 BOTTOM_RIGHT; ///< 1.0f, 1.0f, 0.5f } @@ -83,43 +62,23 @@ extern const Vector3 FRONT_BOTTOM_RIGHT; ///< 1.0f, 1.0f, 1.0f */ namespace AnchorPoint { -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 +static const float TOP = 0.0f; +static const float BOTTOM = 1.0f; +static const float LEFT = 0.0f; +static const float RIGHT = 1.0f; +static const float MIDDLE = 0.5f; extern const Vector3 DEFAULT; ///< CENTER +DALI_IMPORT_API extern const Vector3 TOP_LEFT; ///< 0.0f, 0.0f, 0.5f +DALI_IMPORT_API extern const Vector3 TOP_CENTER; ///< 0.5f, 0.0f, 0.5f +DALI_IMPORT_API extern const Vector3 TOP_RIGHT; ///< 1.0f, 0.0f, 0.5f +DALI_IMPORT_API extern const Vector3 CENTER_LEFT; ///< 0.0f, 0.5f, 0.5f +DALI_IMPORT_API extern const Vector3 CENTER; ///< 0.5f, 0.5f, 0.5f +DALI_IMPORT_API extern const Vector3 CENTER_RIGHT; ///< 1.0f, 0.5f, 0.5f +DALI_IMPORT_API extern const Vector3 BOTTOM_LEFT; ///< 0.0f, 1.0f, 0.5f +DALI_IMPORT_API extern const Vector3 BOTTOM_CENTER; ///< 0.5f, 1.0f, 0.5f +DALI_IMPORT_API extern const Vector3 BOTTOM_RIGHT; ///< 1.0f, 1.0f, 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 } @@ -130,18 +89,18 @@ extern const Vector3 FRONT_BOTTOM_RIGHT; ///< 1.0f, 1.0f, 1.0f */ namespace Color { -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); +DALI_IMPORT_API extern const Vector4 BLACK; ///< Pure black (0.0f, 0.0f, 0.0f, 1.0f); +DALI_IMPORT_API extern const Vector4 WHITE; ///< Pure white (1.0f, 1.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); +DALI_IMPORT_API extern const Vector4 RED; ///< Pure red (1.0f, 0.0f, 0.0f, 1.0f); +DALI_IMPORT_API extern const Vector4 GREEN; ///< Pure green (0.0f, 1.0f, 0.0f, 1.0f); +DALI_IMPORT_API extern const Vector4 BLUE; ///< Pure blue (0.0f, 0.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); +DALI_IMPORT_API extern const Vector4 YELLOW; ///< Pure yellow (1.0f, 1.0f, 0.0f, 1.0f); +DALI_IMPORT_API extern const Vector4 MAGENTA; ///< Pure magenta (1.0f, 0.0f, 1.0f, 1.0f); +DALI_IMPORT_API extern const Vector4 CYAN; ///< Pure cyan (0.0f, 1.0f, 1.0f, 1.0f); -extern const Vector4 TRANSPARENT; ///< Black transparent (0.0f, 0.0f, 0.0f, 0.0f); +DALI_IMPORT_API extern const Vector4 TRANSPARENT; ///< Black transparent (0.0f, 0.0f, 0.0f, 0.0f); } // namespace Color @@ -150,17 +109,17 @@ extern const Vector4 TRANSPARENT; ///< Black transparent (0.0f, 0.0f, 0.0f, 0.0f */ namespace Math { -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 +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 // float is preferred to double for performance on ARM targets -const float PI = static_cast(M_PI); ///< Constant representing PI -const float PI_2 = static_cast(M_PI_2); ///< Constant representing PI/2 -const float PI_4 = static_cast(M_PI_4); ///< Constant representing PI/4 +static const float PI = static_cast(M_PI); ///< Constant representing PI +static const float PI_2 = static_cast(M_PI_2); ///< Constant representing PI/2 +static const float PI_4 = static_cast(M_PI_4); ///< Constant representing PI/4 } // namespace Math diff --git a/dali/public-api/scripting/scripting.cpp b/dali/public-api/scripting/scripting.cpp index 448b802..fa83af7 100644 --- a/dali/public-api/scripting/scripting.cpp +++ b/dali/public-api/scripting/scripting.cpp @@ -67,15 +67,6 @@ 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 }, @@ -85,15 +76,6 @@ 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] );