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=3fba14a23eaa1598ecb9c95319c1cbccff1aeb5b;hb=0031ca8312dba666109e4f7fbb62a3a5e288b7c2;hpb=4c85a797e24c20bfb1670c079e5f66a9a5d6fa0e

diff --git a/plugins/dali-script-v8/src/animation/animation-api.cpp b/plugins/dali-script-v8/src/animation/animation-api.cpp
index 3fba14a..e3fc2d7 100644
--- a/plugins/dali-script-v8/src/animation/animation-api.cpp
+++ b/plugins/dali-script-v8/src/animation/animation-api.cpp
@@ -19,12 +19,15 @@
 #include "animation-api.h"
 #include "path-wrapper.h"
 
+// EXTERNAL INCLUDES
+#include <cstring> // for strcmp
+#include <dali/integration-api/debug.h>
+
+
 // INTERNAL INCLUDES
 #include <v8-utils.h>
-#include <dali/integration-api/debug.h>
 #include <animation/animation-wrapper.h>
 #include <object/property-value-wrapper.h>
-#include <dali/public-api/common/map-wrapper.h>
 
 namespace Dali
 {
@@ -43,42 +46,33 @@ struct AlphaFuncStruct
 };
 /**
  * Contains a list of alpha functions that can be used.
- * We use a stl map as lookup to map a string name to the function
  */
 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;
 
 
 
@@ -96,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 )
@@ -109,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;
     }
@@ -253,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)
 
@@ -279,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;
@@ -1036,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
  * </br >
- *  <img src="../assets/img/keyframe-animation.png">
+ *  <img src="../assets/img/animation/keyframe-animation.png">
  *
  *
  *     var keyframes = [