From 0cc276cf527fec3032e5b02f631466105ec7827b Mon Sep 17 00:00:00 2001 From: "huiyu.eun" Date: Wed, 19 Feb 2020 13:45:43 +0900 Subject: [PATCH] Move constants string to visual-string-constants file Change-Id: I3ec0ca86f1d44ed8efaee7fc97374fcea531c5c4 Signed-off-by: huiyu.eun --- .../animated-gradient/animated-gradient-visual.cpp | 31 ------- .../internal/visuals/border/border-visual.cpp | 4 - .../internal/visuals/gradient/gradient-visual.cpp | 13 --- .../internal/visuals/image/image-visual.cpp | 9 -- dali-toolkit/internal/visuals/mesh/mesh-visual.cpp | 8 -- .../internal/visuals/npatch/npatch-visual.cpp | 6 -- .../visuals/primitive/primitive-visual.cpp | 13 --- dali-toolkit/internal/visuals/svg/svg-visual.cpp | 4 - dali-toolkit/internal/visuals/text/text-visual.cpp | 15 ---- .../internal/visuals/visual-string-constants.cpp | 97 ++++++++++++++++++++++ .../internal/visuals/visual-string-constants.h | 96 +++++++++++++++++++++ 11 files changed, 193 insertions(+), 103 deletions(-) diff --git a/dali-toolkit/internal/visuals/animated-gradient/animated-gradient-visual.cpp b/dali-toolkit/internal/visuals/animated-gradient/animated-gradient-visual.cpp index 1a624c4..d4e2f6e 100755 --- a/dali-toolkit/internal/visuals/animated-gradient/animated-gradient-visual.cpp +++ b/dali-toolkit/internal/visuals/animated-gradient/animated-gradient-visual.cpp @@ -37,37 +37,6 @@ namespace Internal namespace { -// non-animated property -const char* const GRADIENT_TYPE_NAME("gradientType"); -const char* const UNIT_TYPE_NAME("unitType"); -const char* const SPREAD_TYPE_NAME("spreadType"); -// animated property -const char* const START_POSITION_NAME("startPosition"); -const char* const START_COLOR_NAME("startColor"); -const char* const END_POSITION_NAME("endPosition"); -const char* const END_COLOR_NAME("endColor"); -const char* const ROTATE_CENTER_NAME("rotateCenter"); -const char* const ROTATE_AMOUNT_NAME("rotateAmount"); -const char* const OFFSET_NAME("offset"); -// animation parameter property -const char* const START_VALUE_NAME("startValue"); -const char* const TARGET_VALUE_NAME("targetValue"); -const char* const DIRECTION_TYPE_NAME("directionType"); -const char* const DURATION_NAME("duration"); -const char* const DELAY_NAME("delay"); -const char* const REPEAT_NAME("repeat"); -const char* const REPEAT_DELAY_NAME("repeatDelay"); -const char* const MOTION_TYPE_NAME("motionType"); -const char* const EASING_TYPE_NAME("easingType"); -// common shader property -const char* const UNIFORM_START_POINT_NAME("start_point"); -const char* const UNIFORM_START_COLOR_NAME("start_color"); -const char* const UNIFORM_END_POINT_NAME("end_point"); -const char* const UNIFORM_END_COLOR_NAME("end_color"); -const char* const UNIFORM_ROTATE_CENTER_NAME("rotate_center"); -const char* const UNIFORM_ROTATE_ANGLE_NAME("rotate_angle"); -const char* const UNIFORM_OFFSET_NAME("gradient_offset"); - DALI_ENUM_TO_STRING_TABLE_BEGIN( GRADIENT_TYPE ) DALI_ENUM_TO_STRING_WITH_SCOPE( Toolkit::DevelAnimatedGradientVisual::GradientType, LINEAR ) DALI_ENUM_TO_STRING_WITH_SCOPE( Toolkit::DevelAnimatedGradientVisual::GradientType, RADIAL ) diff --git a/dali-toolkit/internal/visuals/border/border-visual.cpp b/dali-toolkit/internal/visuals/border/border-visual.cpp index d1c3280..a64b48d 100644 --- a/dali-toolkit/internal/visuals/border/border-visual.cpp +++ b/dali-toolkit/internal/visuals/border/border-visual.cpp @@ -41,10 +41,6 @@ namespace Internal namespace { -const char * const COLOR_NAME("borderColor"); -const char * const SIZE_NAME("borderSize"); -const char * const ANTI_ALIASING("antiAliasing"); - const char * const POSITION_ATTRIBUTE_NAME("aPosition"); const char * const DRIFT_ATTRIBUTE_NAME("aDrift"); const char * const INDEX_NAME("indices"); diff --git a/dali-toolkit/internal/visuals/gradient/gradient-visual.cpp b/dali-toolkit/internal/visuals/gradient/gradient-visual.cpp index 27c12dd..53ea041 100644 --- a/dali-toolkit/internal/visuals/gradient/gradient-visual.cpp +++ b/dali-toolkit/internal/visuals/gradient/gradient-visual.cpp @@ -48,19 +48,6 @@ namespace Internal namespace { -// properties: linear gradient -const char * const START_POSITION_NAME("startPosition"); // Property::VECTOR2 -const char * const END_POSITION_NAME("endPosition"); // Property::VECTOR2 - -// properties: radial gradient -const char * const CENTER_NAME("center"); // Property::VECTOR2 -const char * const RADIUS_NAME("radius"); // Property::FLOAT - -// properties: linear&radial gradient -const char * const STOP_OFFSET_NAME("stopOffset"); // Property::Array FLOAT -const char * const STOP_COLOR_NAME("stopColor"); // Property::Array VECTOR4 -const char * const UNITS_NAME("units"); // Property::String "userSpaceOnUse | objectBoundingBox" -const char * const SPREAD_METHOD_NAME("spreadMethod"); // Property::String "pad | reflect | repeat" DALI_ENUM_TO_STRING_TABLE_BEGIN( UNITS ) DALI_ENUM_TO_STRING_WITH_SCOPE( Toolkit::GradientVisual::Units, OBJECT_BOUNDING_BOX ) diff --git a/dali-toolkit/internal/visuals/image/image-visual.cpp b/dali-toolkit/internal/visuals/image/image-visual.cpp index 5142a50..e79edd7 100644 --- a/dali-toolkit/internal/visuals/image/image-visual.cpp +++ b/dali-toolkit/internal/visuals/image/image-visual.cpp @@ -56,15 +56,6 @@ namespace Internal namespace { -// property names -const char * const IMAGE_FITTING_MODE( "fittingMode" ); -const char * const IMAGE_SAMPLING_MODE( "samplingMode" ); -const char * const IMAGE_DESIRED_WIDTH( "desiredWidth" ); -const char * const IMAGE_DESIRED_HEIGHT( "desiredHeight" ); -const char * const SYNCHRONOUS_LOADING( "synchronousLoading" ); -const char * const IMAGE_ATLASING("atlasing"); -const char * const ALPHA_MASK_URL("alphaMaskUrl"); - // fitting modes DALI_ENUM_TO_STRING_TABLE_BEGIN( FITTING_MODE ) DALI_ENUM_TO_STRING_WITH_SCOPE( Dali::FittingMode, SHRINK_TO_FIT ) diff --git a/dali-toolkit/internal/visuals/mesh/mesh-visual.cpp b/dali-toolkit/internal/visuals/mesh/mesh-visual.cpp index 19357f5..7fbb28e 100644 --- a/dali-toolkit/internal/visuals/mesh/mesh-visual.cpp +++ b/dali-toolkit/internal/visuals/mesh/mesh-visual.cpp @@ -82,14 +82,6 @@ enum TextureIndex GLOSS_INDEX = 2u }; -//Property names -const char * const OBJECT_URL_NAME( "objectUrl" ); -const char * const MATERIAL_URL_NAME( "materialUrl" ); -const char * const TEXTURES_PATH_NAME( "texturesPath" ); -const char * const SHADING_MODE_NAME( "shadingMode" ); -const char * const USE_MIPMAPPING_NAME( "useMipmapping" ); -const char * const USE_SOFT_NORMALS_NAME( "useSoftNormals" ); -const char * const LIGHT_POSITION_NAME( "lightPosition" ); //Shading mode DALI_ENUM_TO_STRING_TABLE_BEGIN( SHADING_MODE ) diff --git a/dali-toolkit/internal/visuals/npatch/npatch-visual.cpp b/dali-toolkit/internal/visuals/npatch/npatch-visual.cpp index af09393..4780153 100755 --- a/dali-toolkit/internal/visuals/npatch/npatch-visual.cpp +++ b/dali-toolkit/internal/visuals/npatch/npatch-visual.cpp @@ -48,12 +48,6 @@ namespace Internal namespace { -const char * const BORDER_ONLY( "borderOnly" ); -const char * const BORDER( "border" ); -const char * const AUXILIARY_IMAGE_NAME( "auxiliaryImage" ); -const char * const AUXILIARY_IMAGE_ALPHA_NAME( "auxiliaryImageAlpha" ); -const char * const SYNCHRONOUS_LOADING( "synchronousLoading" ); - const char* VERTEX_SHADER = DALI_COMPOSE_SHADER( attribute mediump vec2 aPosition;\n varying mediump vec2 vTexCoord;\n diff --git a/dali-toolkit/internal/visuals/primitive/primitive-visual.cpp b/dali-toolkit/internal/visuals/primitive/primitive-visual.cpp index 103529b..8b2346c 100644 --- a/dali-toolkit/internal/visuals/primitive/primitive-visual.cpp +++ b/dali-toolkit/internal/visuals/primitive/primitive-visual.cpp @@ -55,19 +55,6 @@ DALI_ENUM_TO_STRING_WITH_SCOPE( Toolkit::PrimitiveVisual::Shape, BEVELLED_CUBE ) DALI_ENUM_TO_STRING_WITH_SCOPE( Toolkit::PrimitiveVisual::Shape, CONICAL_FRUSTUM ) DALI_ENUM_TO_STRING_TABLE_END( SHAPE_TYPE ) -//Property names -const char * const PRIMITIVE_SHAPE( "shape" ); -const char * const SLICES( "slices" ); -const char * const STACKS( "stacks" ); -const char * const SCALE_TOP_RADIUS( "scaleTopRadius" ); -const char * const SCALE_BOTTOM_RADIUS( "scaleBottomRadius" ); -const char * const SCALE_HEIGHT( "scaleHeight" ); -const char * const SCALE_RADIUS( "scaleRadius" ); -const char * const SCALE_DIMENSIONS( "scaleDimensions" ); -const char * const BEVEL_PERCENTAGE( "bevelPercentage" ); -const char * const BEVEL_SMOOTHNESS( "bevelSmoothness" ); -const char * const LIGHT_POSITION_UNIFORM_NAME( "lightPosition" ); - //Primitive property defaults const int DEFAULT_SLICES = 128; ///< For spheres and conics const int DEFAULT_STACKS = 128; ///< For spheres and conics diff --git a/dali-toolkit/internal/visuals/svg/svg-visual.cpp b/dali-toolkit/internal/visuals/svg/svg-visual.cpp index cc61c12..9330bdb 100644 --- a/dali-toolkit/internal/visuals/svg/svg-visual.cpp +++ b/dali-toolkit/internal/visuals/svg/svg-visual.cpp @@ -46,10 +46,6 @@ namespace // property name const char * const UNITS("px"); -const char * const IMAGE_ATLASING( "atlasing" ); - -const char * const SYNCHRONOUS_LOADING( "synchronousLoading" ); - const Dali::Vector4 FULL_TEXTURE_RECT(0.f, 0.f, 1.f, 1.f); } diff --git a/dali-toolkit/internal/visuals/text/text-visual.cpp b/dali-toolkit/internal/visuals/text/text-visual.cpp index 1171033..e0b16e9 100755 --- a/dali-toolkit/internal/visuals/text/text-visual.cpp +++ b/dali-toolkit/internal/visuals/text/text-visual.cpp @@ -49,21 +49,6 @@ namespace Internal namespace { - -// Property names - common properties defined in visual-string-constants.h/cpp -const char * const FONT_FAMILY_PROPERTY( "fontFamily" ); -const char * const FONT_STYLE_PROPERTY( "fontStyle" ); -const char * const POINT_SIZE_PROPERTY( "pointSize" ); -const char * const MULTI_LINE_PROPERTY( "multiLine" ); -const char * const HORIZONTAL_ALIGNMENT_PROPERTY( "horizontalAlignment" ); -const char * const VERTICAL_ALIGNMENT_PROPERTY( "verticalAlignment" ); -const char * const TEXT_COLOR_PROPERTY( "textColor" ); -const char * const ENABLE_MARKUP_PROPERTY( "enableMarkup" ); -const char * const SHADOW_PROPERTY( "shadow" ); -const char * const UNDERLINE_PROPERTY( "underline" ); -const char * const OUTLINE_PROPERTY( "outline" ); -const char * const BACKGROUND_PROPERTY( "textBackground" ); - const Vector4 FULL_TEXTURE_RECT( 0.f, 0.f, 1.f, 1.f ); const char* VERTEX_SHADER = DALI_COMPOSE_SHADER( diff --git a/dali-toolkit/internal/visuals/visual-string-constants.cpp b/dali-toolkit/internal/visuals/visual-string-constants.cpp index 64b6f84..79f6163 100644 --- a/dali-toolkit/internal/visuals/visual-string-constants.cpp +++ b/dali-toolkit/internal/visuals/visual-string-constants.cpp @@ -109,9 +109,106 @@ const char * const CURRENT_FRAME_NUMBER_NAME( "currentFrameNumber" ); const char * const TOTAL_FRAME_NUMBER_NAME( "totalFrameNumber" ); const char * const STOP_BEHAVIOR_NAME( "stopBehavior" ); const char * const LOOPING_MODE_NAME( "loopingMode" ); +const char * const IMAGE_ATLASING( "atlasing" ); +const char * const SYNCHRONOUS_LOADING( "synchronousLoading" ); +const char * const IMAGE_FITTING_MODE( "fittingMode" ); +const char * const IMAGE_SAMPLING_MODE( "samplingMode" ); +const char * const IMAGE_DESIRED_WIDTH( "desiredWidth" ); +const char * const IMAGE_DESIRED_HEIGHT( "desiredHeight" ); +const char * const ALPHA_MASK_URL("alphaMaskUrl"); // Text visual const char * const TEXT_PROPERTY( "text" ); +const char * const FONT_FAMILY_PROPERTY( "fontFamily" ); +const char * const FONT_STYLE_PROPERTY( "fontStyle" ); +const char * const POINT_SIZE_PROPERTY( "pointSize" ); +const char * const MULTI_LINE_PROPERTY( "multiLine" ); +const char * const HORIZONTAL_ALIGNMENT_PROPERTY( "horizontalAlignment" ); +const char * const VERTICAL_ALIGNMENT_PROPERTY( "verticalAlignment" ); +const char * const TEXT_COLOR_PROPERTY( "textColor" ); +const char * const ENABLE_MARKUP_PROPERTY( "enableMarkup" ); +const char * const SHADOW_PROPERTY( "shadow" ); +const char * const UNDERLINE_PROPERTY( "underline" ); +const char * const OUTLINE_PROPERTY( "outline" ); +const char * const BACKGROUND_PROPERTY( "textBackground" ); + + +//NPatch visual +const char * const BORDER_ONLY( "borderOnly" ); +const char * const BORDER( "border" ); + +// non-animated property +const char* const GRADIENT_TYPE_NAME("gradientType"); +const char* const UNIT_TYPE_NAME("unitType"); +const char* const SPREAD_TYPE_NAME("spreadType"); + +// animated property +const char* const START_POSITION_NAME("startPosition"); +const char* const START_COLOR_NAME("startColor"); +const char* const END_POSITION_NAME("endPosition"); +const char* const END_COLOR_NAME("endColor"); +const char* const ROTATE_CENTER_NAME("rotateCenter"); +const char* const ROTATE_AMOUNT_NAME("rotateAmount"); +const char* const OFFSET_NAME("offset"); + +// animation parameter property +const char* const START_VALUE_NAME("startValue"); +const char* const TARGET_VALUE_NAME("targetValue"); +const char* const DIRECTION_TYPE_NAME("directionType"); +const char* const DURATION_NAME("duration"); +const char* const DELAY_NAME("delay"); +const char* const REPEAT_NAME("repeat"); +const char* const REPEAT_DELAY_NAME("repeatDelay"); +const char* const MOTION_TYPE_NAME("motionType"); +const char* const EASING_TYPE_NAME("easingType"); + +// common shader property +const char* const UNIFORM_START_POINT_NAME("start_point"); +const char* const UNIFORM_START_COLOR_NAME("start_color"); +const char* const UNIFORM_END_POINT_NAME("end_point"); +const char* const UNIFORM_END_COLOR_NAME("end_color"); +const char* const UNIFORM_ROTATE_CENTER_NAME("rotate_center"); +const char* const UNIFORM_ROTATE_ANGLE_NAME("rotate_angle"); +const char* const UNIFORM_OFFSET_NAME("gradient_offset"); + +// Border visual +const char * const COLOR_NAME("borderColor"); +const char * const SIZE_NAME("borderSize"); +const char * const ANTI_ALIASING("antiAliasing"); + +// properties: radial gradient +const char * const CENTER_NAME("center"); // Property::VECTOR2 +const char * const RADIUS_NAME("radius"); // Property::FLOAT + +// properties: linear&radial gradient +const char * const STOP_OFFSET_NAME("stopOffset"); // Property::Array FLOAT +const char * const STOP_COLOR_NAME("stopColor"); // Property::Array VECTOR4 +const char * const UNITS_NAME("units"); // Property::String "userSpaceOnUse | objectBoundingBox" +const char * const SPREAD_METHOD_NAME("spreadMethod"); // Property::String "pad | reflect | repeat" + +//mesh visual +const char * const OBJECT_URL_NAME( "objectUrl" ); +const char * const MATERIAL_URL_NAME( "materialUrl" ); +const char * const TEXTURES_PATH_NAME( "texturesPath" ); +const char * const SHADING_MODE_NAME( "shadingMode" ); +const char * const USE_MIPMAPPING_NAME( "useMipmapping" ); +const char * const USE_SOFT_NORMALS_NAME( "useSoftNormals" ); +const char * const LIGHT_POSITION_NAME( "lightPosition" ); + + +//Primitive properties +const char * const PRIMITIVE_SHAPE( "shape" ); +const char * const SLICES( "slices" ); +const char * const STACKS( "stacks" ); +const char * const SCALE_TOP_RADIUS( "scaleTopRadius" ); +const char * const SCALE_BOTTOM_RADIUS( "scaleBottomRadius" ); +const char * const SCALE_HEIGHT( "scaleHeight" ); +const char * const SCALE_RADIUS( "scaleRadius" ); +const char * const SCALE_DIMENSIONS( "scaleDimensions" ); +const char * const BEVEL_PERCENTAGE( "bevelPercentage" ); +const char * const BEVEL_SMOOTHNESS( "bevelSmoothness" ); +const char * const LIGHT_POSITION_UNIFORM_NAME( "lightPosition" ); + } // namespace Internal diff --git a/dali-toolkit/internal/visuals/visual-string-constants.h b/dali-toolkit/internal/visuals/visual-string-constants.h index c8311f9..8415819 100644 --- a/dali-toolkit/internal/visuals/visual-string-constants.h +++ b/dali-toolkit/internal/visuals/visual-string-constants.h @@ -94,9 +94,105 @@ extern const char * const CURRENT_FRAME_NUMBER_NAME; extern const char * const TOTAL_FRAME_NUMBER_NAME; extern const char * const STOP_BEHAVIOR_NAME; extern const char * const LOOPING_MODE_NAME; +extern const char * const IMAGE_ATLASING; +extern const char * const SYNCHRONOUS_LOADING; +extern const char * const IMAGE_FITTING_MODE; +extern const char * const IMAGE_SAMPLING_MODE; +extern const char * const IMAGE_DESIRED_WIDTH; +extern const char * const IMAGE_DESIRED_HEIGHT; +extern const char * const ALPHA_MASK_URL; // Text visual extern const char * const TEXT_PROPERTY; +extern const char * const FONT_FAMILY_PROPERTY; +extern const char * const FONT_STYLE_PROPERTY; +extern const char * const POINT_SIZE_PROPERTY; +extern const char * const MULTI_LINE_PROPERTY; +extern const char * const HORIZONTAL_ALIGNMENT_PROPERTY; +extern const char * const VERTICAL_ALIGNMENT_PROPERTY; +extern const char * const TEXT_COLOR_PROPERTY; +extern const char * const ENABLE_MARKUP_PROPERTY; +extern const char * const SHADOW_PROPERTY; +extern const char * const UNDERLINE_PROPERTY; +extern const char * const OUTLINE_PROPERTY; +extern const char * const BACKGROUND_PROPERTY; + +//NPatch visual +extern const char * const BORDER_ONLY; +extern const char * const BORDER; +extern const char * const AUXILIARY_IMAGE_NAME; +extern const char * const AUXILIARY_IMAGE_ALPHA_NAME; + +// non-animated property +extern const char* const GRADIENT_TYPE_NAME; +extern const char* const UNIT_TYPE_NAME; +extern const char* const SPREAD_TYPE_NAME; + +// animated property +extern const char* const START_POSITION_NAME; +extern const char* const START_COLOR_NAME; +extern const char* const END_POSITION_NAME; +extern const char* const END_COLOR_NAME; +extern const char* const ROTATE_CENTER_NAME; +extern const char* const ROTATE_AMOUNT_NAME; +extern const char* const OFFSET_NAME; + +// animation parameter property +extern const char* const START_VALUE_NAME; +extern const char* const TARGET_VALUE_NAME; +extern const char* const DIRECTION_TYPE_NAME; +extern const char* const DURATION_NAME; +extern const char* const DELAY_NAME; +extern const char* const REPEAT_NAME; +extern const char* const REPEAT_DELAY_NAME; +extern const char* const MOTION_TYPE_NAME; +extern const char* const EASING_TYPE_NAME; + +// common shader property +extern const char* const UNIFORM_START_POINT_NAME; +extern const char* const UNIFORM_START_COLOR_NAME; +extern const char* const UNIFORM_END_POINT_NAME; +extern const char* const UNIFORM_END_COLOR_NAME; +extern const char* const UNIFORM_ROTATE_CENTER_NAME; +extern const char* const UNIFORM_ROTATE_ANGLE_NAME; +extern const char* const UNIFORM_OFFSET_NAME; + +// Border visual +extern const char * const COLOR_NAME; +extern const char * const SIZE_NAME; +extern const char * const ANTI_ALIASING; + +// properties: radial gradient +extern const char * const CENTER_NAME; // Property::VECTOR2 +extern const char * const RADIUS_NAME; // Property::FLOAT + +// properties: linear&radial gradient +extern const char * const STOP_OFFSET_NAME; // Property::Array FLOAT +extern const char * const STOP_COLOR_NAME; // Property::Array VECTOR4 +extern const char * const UNITS_NAME; // Property::String "userSpaceOnUse | objectBoundingBox" +extern const char * const SPREAD_METHOD_NAME; // Property::String "pad | reflect | repeat" + +//mesh visual +extern const char * const OBJECT_URL_NAME; +extern const char * const MATERIAL_URL_NAME; +extern const char * const TEXTURES_PATH_NAME; +extern const char * const SHADING_MODE_NAME; +extern const char * const USE_MIPMAPPING_NAME; +extern const char * const USE_SOFT_NORMALS_NAME; +extern const char * const LIGHT_POSITION_NAME; + +//Primitive properties +extern const char * const PRIMITIVE_SHAPE; +extern const char * const SLICES; +extern const char * const STACKS; +extern const char * const SCALE_TOP_RADIUS; +extern const char * const SCALE_BOTTOM_RADIUS; +extern const char * const SCALE_HEIGHT; +extern const char * const SCALE_RADIUS; +extern const char * const SCALE_DIMENSIONS; +extern const char * const BEVEL_PERCENTAGE; +extern const char * const BEVEL_SMOOTHNESS; +extern const char * const LIGHT_POSITION_UNIFORM_NAME; } // namespace Internal -- 2.7.4