X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=plugins%2Fdali-script-v8%2Fsrc%2Fanimation%2Fanimation-api.cpp;h=e3fc2d7b3182cf5a158bc2bf93e1e2c48c5fa24d;hp=1a11440d719bccf1b84a41789355003ed483ccac;hb=f3da11c2818c6d17706fbb2417f21b602b3190f5;hpb=b46395d404c2b437c4679975e0ed2c073949ba61
diff --git a/plugins/dali-script-v8/src/animation/animation-api.cpp b/plugins/dali-script-v8/src/animation/animation-api.cpp
index 1a11440..e3fc2d7 100644
--- a/plugins/dali-script-v8/src/animation/animation-api.cpp
+++ b/plugins/dali-script-v8/src/animation/animation-api.cpp
@@ -49,38 +49,30 @@ struct AlphaFuncStruct
*/
const AlphaFuncStruct AlphaFunctionTable[]=
{
- {"default" , AlphaFunctions::Default },
- {"linear" , AlphaFunctions::Linear },
- {"square" , AlphaFunctions::Square },
- {"reverse" , AlphaFunctions::Reverse },
- {"easeIn" , AlphaFunctions::EaseIn },
- {"easeOut" , AlphaFunctions::EaseOut },
- {"easeInOut" , AlphaFunctions::EaseInOut },
- {"easeInSine" , AlphaFunctions::EaseInSine },
- {"easeOutSine" , AlphaFunctions::EaseOutSine },
- {"easeInOutSine" , AlphaFunctions::EaseInOutSine },
- {"easeInSine33" , AlphaFunctions::EaseInSine33 },
- {"easeOutSine33" , AlphaFunctions::EaseOutSine33 },
- {"easeInOutSine33" , AlphaFunctions::EaseInOutSine33 },
- {"easeInOutSine50" , AlphaFunctions::EaseInOutSine50 },
- {"easeInOutSine60" , AlphaFunctions::EaseInOutSine60 },
- {"easeInOutSine70" , AlphaFunctions::EaseInOutSine70 },
- {"easeInOutSine80" , AlphaFunctions::EaseInOutSine80 },
- {"easeInOutSine90" , AlphaFunctions::EaseInOutSine90 },
- {"doubleEaseInOutSine60" , AlphaFunctions::DoubleEaseInOutSine60},
- {"easeOutQuint50" , AlphaFunctions::EaseOutQuint50 },
- {"easeOutQuint80" , AlphaFunctions::EaseOutQuint80 },
- {"bounce" , AlphaFunctions::Bounce },
- {"bounceBack" , AlphaFunctions::BounceBack },
- {"easeInBack" , AlphaFunctions::EaseInBack },
- {"easeOutBack" , AlphaFunctions::EaseOutBack },
- {"easeInOutBack" , AlphaFunctions::EaseInOutBack },
- {"sin" , AlphaFunctions::Sin },
- {"sin2x" , AlphaFunctions::Sin2x }
+
+ {"default" , AlphaFunction::DEFAULT },
+ {"linear" , AlphaFunction::LINEAR },
+ {"reverse" , AlphaFunction::REVERSE },
+
+ {"easeInSquare" , AlphaFunction::EASE_IN_SQUARE },
+ {"easeOutSquare" , AlphaFunction::EASE_OUT_SQUARE },
+
+ {"easeIn" , AlphaFunction::EASE_IN },
+ {"easeOut" , AlphaFunction::EASE_OUT },
+ {"easeInOut" , AlphaFunction::EASE_IN_OUT },
+
+ {"easeInSine" , AlphaFunction::EASE_IN_SINE },
+ {"easeOutSine" , AlphaFunction::EASE_OUT_SINE },
+ {"easeInOutSine" , AlphaFunction::EASE_IN_OUT_SINE },
+
+ {"bounce" , AlphaFunction::BOUNCE },
+ {"sin" , AlphaFunction::SIN },
+ {"easeOutBack" , AlphaFunction::EASE_OUT_BACK },
+
};
const unsigned int AlphaFunctionTableCount = sizeof(AlphaFunctionTable)/sizeof(AlphaFunctionTable[0]);
const char* const DEFAULT_ALPHA_NAME = "default";
-static AlphaFunction DEFAULT_ALPHA_FUNCTION = AlphaFunctions::Default;
+static AlphaFunction DEFAULT_ALPHA_FUNCTION = AlphaFunction::DEFAULT;
@@ -98,7 +90,7 @@ AlphaFunction GetAlphaFunction( const std::string& alphaFuncName )
}
DALI_LOG_ERROR("Failed to find alpha func |%s| \n", alphaFuncName.c_str() );
- return AlphaFunctions::Default;
+ return DEFAULT_ALPHA_FUNCTION;
}
const char* const GetAlphaFunctionName( AlphaFunction alphaFunc )
@@ -111,7 +103,7 @@ const char* const GetAlphaFunctionName( AlphaFunction alphaFunc )
const AlphaFuncStruct& alphaStruct( AlphaFunctionTable[i] );
- if( alphaStruct.alphaFunc == alphaFunc )
+ if( alphaStruct.alphaFunc.GetBuiltinFunction() == alphaFunc.GetBuiltinFunction() )
{
return alphaStruct.name;
}
@@ -255,7 +247,7 @@ bool GetAnimationParameters( v8::Isolate* isolate,
{
// used for things like anim.AnimateBy( myImageActor, property-name, property-value (or Javascript number array));
// 1 extract property handle from param1.
- // 2 extract property name from param2 ( can be in the format "u-color" or "uColor"
+ // 2 extract property name from param2 ( in the format "uColor" )
// 3 extract PropertyValue from param3
// 4 extract animation options ( delay, duration, alpha func)
@@ -281,9 +273,7 @@ bool GetAnimationParameters( v8::Isolate* isolate,
if( index == Property::INVALID_INDEX )
{
- // convert the property name from "uColor" to "u-color"
- std::string convetedName = V8Utils::JavaScriptNameToPropertyName( propertyName );
- index = animParams.target.GetPropertyIndex( convetedName );
+ index = animParams.target.GetPropertyIndex( propertyName );
}
animParams.propertyIndex = index;
@@ -1038,7 +1028,7 @@ void AnimationApi::AnimateTo( const v8::FunctionCallbackInfo< v8::Value >& args
*
* create some keyframes to move an actor around a square, and return to the start
*
- *
+ *
*
*
* var keyframes = [