Combine Internal::ProxyObject & Internal::Object

[platform/core/uifw/dali-core.git] / dali / internal / event / animation / animation-impl.cpp

diff --git a/dali/internal/event/animation/animation-impl.cpp b/dali/internal/event/animation/animation-impl.cpp
index 358b42e..6029980 100644 (file)
--- a/dali/internal/event/animation/animation-impl.cpp
+++ b/dali/internal/event/animation/animation-impl.cpp
@@ -288,7 +288,7 @@ void Animation::AnimateBy(Property& target, Property::Value& relativeValue, Time
 
 void Animation::AnimateBy(Property& target, Property::Value& relativeValue, AlphaFunction alpha, TimePeriod period)
 {
-  ProxyObject& proxy = dynamic_cast<ProxyObject&>( GetImplementation(target.object) );
+  Object& object = dynamic_cast<Object&>( GetImplementation(target.object) );
 
   ExtendDuration( period );
 
@@ -296,7 +296,7 @@ void Animation::AnimateBy(Property& target, Property::Value& relativeValue, Alph
   {
     case Property::BOOLEAN:
     {
-      AddAnimatorConnector( AnimatorConnector<bool>::New( proxy,
+      AddAnimatorConnector( AnimatorConnector<bool>::New( object,
                                                           target.propertyIndex,
                                                           target.componentIndex,
                                                           new AnimateByBoolean(relativeValue.Get<bool>()),
@@ -307,7 +307,7 @@ void Animation::AnimateBy(Property& target, Property::Value& relativeValue, Alph
 
     case Property::FLOAT:
     {
-      AddAnimatorConnector( AnimatorConnector<float>::New( proxy,
+      AddAnimatorConnector( AnimatorConnector<float>::New( object,
                                                            target.propertyIndex,
                                                            target.componentIndex,
                                                            new AnimateByFloat(relativeValue.Get<float>()),
@@ -318,7 +318,7 @@ void Animation::AnimateBy(Property& target, Property::Value& relativeValue, Alph
 
     case Property::INTEGER:
     {
-      AddAnimatorConnector( AnimatorConnector<int>::New( proxy,
+      AddAnimatorConnector( AnimatorConnector<int>::New( object,
                                                          target.propertyIndex,
                                                          target.componentIndex,
                                                          new AnimateByInteger(relativeValue.Get<int>()),
@@ -329,7 +329,7 @@ void Animation::AnimateBy(Property& target, Property::Value& relativeValue, Alph
 
     case Property::VECTOR2:
     {
-      AddAnimatorConnector( AnimatorConnector<Vector2>::New( proxy,
+      AddAnimatorConnector( AnimatorConnector<Vector2>::New( object,
                                                              target.propertyIndex,
                                                              target.componentIndex,
                                                              new AnimateByVector2(relativeValue.Get<Vector2>()),
@@ -340,7 +340,7 @@ void Animation::AnimateBy(Property& target, Property::Value& relativeValue, Alph
 
     case Property::VECTOR3:
     {
-      AddAnimatorConnector( AnimatorConnector<Vector3>::New( proxy,
+      AddAnimatorConnector( AnimatorConnector<Vector3>::New( object,
                                                              target.propertyIndex,
                                                              target.componentIndex,
                                                              new AnimateByVector3(relativeValue.Get<Vector3>()),
@@ -351,7 +351,7 @@ void Animation::AnimateBy(Property& target, Property::Value& relativeValue, Alph
 
     case Property::VECTOR4:
     {
-      AddAnimatorConnector( AnimatorConnector<Vector4>::New( proxy,
+      AddAnimatorConnector( AnimatorConnector<Vector4>::New( object,
                                                              target.propertyIndex,
                                                              target.componentIndex,
                                                              new AnimateByVector4(relativeValue.Get<Vector4>()),
@@ -364,7 +364,7 @@ void Animation::AnimateBy(Property& target, Property::Value& relativeValue, Alph
     {
       AngleAxis angleAxis = relativeValue.Get<AngleAxis>();
 
-      AddAnimatorConnector( AnimatorConnector<Quaternion>::New( proxy,
+      AddAnimatorConnector( AnimatorConnector<Quaternion>::New( object,
                                                                 target.propertyIndex,
                                                                 target.componentIndex,
                                                                 new RotateByAngleAxis(angleAxis.angle, angleAxis.axis),
@@ -396,12 +396,12 @@ void Animation::AnimateTo(Property& target, Property::Value& destinationValue, T
 
 void Animation::AnimateTo(Property& target, Property::Value& destinationValue, AlphaFunction alpha, TimePeriod period)
 {
-  ProxyObject& proxy = dynamic_cast<ProxyObject&>( GetImplementation(target.object) );
+  Object& object = dynamic_cast<Object&>( GetImplementation(target.object) );
 
-  AnimateTo( proxy, target.propertyIndex, target.componentIndex, destinationValue, alpha, period );
+  AnimateTo( object, target.propertyIndex, target.componentIndex, destinationValue, alpha, period );
 }
 
-void Animation::AnimateTo(ProxyObject& targetObject, Property::Index targetPropertyIndex, int componentIndex, Property::Value& destinationValue, AlphaFunction alpha, TimePeriod period)
+void Animation::AnimateTo(Object& targetObject, Property::Index targetPropertyIndex, int componentIndex, Property::Value& destinationValue, AlphaFunction alpha, TimePeriod period)
 {
   Property::Type type = targetObject.GetPropertyType(targetPropertyIndex);
   if(componentIndex != Property::INVALID_COMPONENT_INDEX)
@@ -550,7 +550,7 @@ void Animation::AnimateBetween(Property target, const KeyFrames& keyFrames, Alph
 
 void Animation::AnimateBetween(Property target, const KeyFrames& keyFrames, AlphaFunction alpha, TimePeriod period, Interpolation interpolation)
 {
-  ProxyObject& proxy = dynamic_cast<ProxyObject&>( GetImplementation(target.object) );
+  Object& object = dynamic_cast<Object&>( GetImplementation(target.object) );
 
   ExtendDuration( period );
 
@@ -561,7 +561,7 @@ void Animation::AnimateBetween(Property target, const KeyFrames& keyFrames, Alph
       const KeyFrameBoolean* kf;
       GetSpecialization(keyFrames, kf);
       KeyFrameBooleanPtr kfCopy = KeyFrameBoolean::Clone(*kf);
-      AddAnimatorConnector( AnimatorConnector<bool>::New( proxy,
+      AddAnimatorConnector( AnimatorConnector<bool>::New( object,
                                                           target.propertyIndex,
                                                           target.componentIndex,
                                                           new KeyFrameBooleanFunctor(kfCopy),
@@ -575,7 +575,7 @@ void Animation::AnimateBetween(Property target, const KeyFrames& keyFrames, Alph
       const KeyFrameNumber* kf;
       GetSpecialization(keyFrames, kf);
       KeyFrameNumberPtr kfCopy = KeyFrameNumber::Clone(*kf);
-      AddAnimatorConnector( AnimatorConnector<float>::New( proxy,
+      AddAnimatorConnector( AnimatorConnector<float>::New( object,
                                                            target.propertyIndex,
                                                            target.componentIndex,
                                                            new KeyFrameNumberFunctor(kfCopy,interpolation),
@@ -589,7 +589,7 @@ void Animation::AnimateBetween(Property target, const KeyFrames& keyFrames, Alph
       const KeyFrameInteger* kf;
       GetSpecialization(keyFrames, kf);
       KeyFrameIntegerPtr kfCopy = KeyFrameInteger::Clone(*kf);
-      AddAnimatorConnector( AnimatorConnector<int>::New( proxy,
+      AddAnimatorConnector( AnimatorConnector<int>::New( object,
                                                          target.propertyIndex,
                                                          target.componentIndex,
                                                          new KeyFrameIntegerFunctor(kfCopy,interpolation),
@@ -603,7 +603,7 @@ void Animation::AnimateBetween(Property target, const KeyFrames& keyFrames, Alph
       const KeyFrameVector2* kf;
       GetSpecialization(keyFrames, kf);
       KeyFrameVector2Ptr kfCopy = KeyFrameVector2::Clone(*kf);
-      AddAnimatorConnector( AnimatorConnector<Vector2>::New( proxy,
+      AddAnimatorConnector( AnimatorConnector<Vector2>::New( object,
                                                              target.propertyIndex,
                                                              target.componentIndex,
                                                              new KeyFrameVector2Functor(kfCopy,interpolation),
@@ -617,7 +617,7 @@ void Animation::AnimateBetween(Property target, const KeyFrames& keyFrames, Alph
       const KeyFrameVector3* kf;
       GetSpecialization(keyFrames, kf);
       KeyFrameVector3Ptr kfCopy = KeyFrameVector3::Clone(*kf);
-      AddAnimatorConnector( AnimatorConnector<Vector3>::New( proxy,
+      AddAnimatorConnector( AnimatorConnector<Vector3>::New( object,
                                                              target.propertyIndex,
                                                              target.componentIndex,
                                                              new KeyFrameVector3Functor(kfCopy,interpolation),
@@ -631,7 +631,7 @@ void Animation::AnimateBetween(Property target, const KeyFrames& keyFrames, Alph
       const KeyFrameVector4* kf;
       GetSpecialization(keyFrames, kf);
       KeyFrameVector4Ptr kfCopy = KeyFrameVector4::Clone(*kf);
-      AddAnimatorConnector( AnimatorConnector<Vector4>::New( proxy,
+      AddAnimatorConnector( AnimatorConnector<Vector4>::New( object,
                                                              target.propertyIndex,
                                                              target.componentIndex,
                                                              new KeyFrameVector4Functor(kfCopy,interpolation),
@@ -645,7 +645,7 @@ void Animation::AnimateBetween(Property target, const KeyFrames& keyFrames, Alph
       const KeyFrameQuaternion* kf;
       GetSpecialization(keyFrames, kf);
       KeyFrameQuaternionPtr kfCopy = KeyFrameQuaternion::Clone(*kf);
-      AddAnimatorConnector( AnimatorConnector<Quaternion>::New( proxy,
+      AddAnimatorConnector( AnimatorConnector<Quaternion>::New( object,
                                                                 target.propertyIndex,
                                                                 target.componentIndex,
                                                                 new KeyFrameQuaternionFunctor(kfCopy),