*/
// EXTERNAL INCLUDES
+#include <dali/public-api/actors/layer.h>
+#include <dali/devel-api/common/stage.h>
#include <dali/integration-api/debug.h>
// INTERNAL INCLUDES
if( 0 == alphaFunctionLut.size() )
{
// coding convention is uppercase enums
- alphaFunctionLut["DEFAULT"] = AlphaFunctions::Default;
- alphaFunctionLut["LINEAR"] = AlphaFunctions::Linear;
- alphaFunctionLut["SQUARE"] = AlphaFunctions::Square;
- alphaFunctionLut["REVERSE"] = AlphaFunctions::Reverse;
- alphaFunctionLut["EASE_IN"] = AlphaFunctions::EaseIn;
- alphaFunctionLut["EASE_OUT"] = AlphaFunctions::EaseOut;
- alphaFunctionLut["EASE_IN_OUT"] = AlphaFunctions::EaseInOut;
- alphaFunctionLut["EASE_IN_SINE"] = AlphaFunctions::EaseInSine;
- alphaFunctionLut["EASE_OUT_SINE"] = AlphaFunctions::EaseOutSine;
- alphaFunctionLut["EASE_IN_OUT_SINE"] = AlphaFunctions::EaseInOutSine;
- alphaFunctionLut["EASE_IN_SINE_33"] = AlphaFunctions::EaseInSine33;
- alphaFunctionLut["EASE_OUT_SINE_33"] = AlphaFunctions::EaseOutSine33;
- alphaFunctionLut["EASE_IN_OUT_SINE_33"] = AlphaFunctions::EaseInOutSine33;
- alphaFunctionLut["EASE_IN_OUT_SINE_50"] = AlphaFunctions::EaseInOutSine50;
- alphaFunctionLut["EASE_IN_OUT_SINE_60"] = AlphaFunctions::EaseInOutSine60;
- alphaFunctionLut["EASE_IN_OUT_SINE_70"] = AlphaFunctions::EaseInOutSine70;
- alphaFunctionLut["EASE_IN_OUT_SINE_80"] = AlphaFunctions::EaseInOutSine80;
- alphaFunctionLut["EASE_IN_OUT_SINE_90"] = AlphaFunctions::EaseInOutSine90;
- alphaFunctionLut["DOUBLE_EASE_IN_OUT_SINE_60"] = AlphaFunctions::DoubleEaseInOutSine60;
- alphaFunctionLut["EASE_OUT_QUINT_50"] = AlphaFunctions::EaseOutQuint50;
- alphaFunctionLut["EASE_OUT_QUINT_80"] = AlphaFunctions::EaseOutQuint80;
- alphaFunctionLut["BOUNCE"] = AlphaFunctions::Bounce;
- alphaFunctionLut["BOUNCE_BACK"] = AlphaFunctions::BounceBack;
- alphaFunctionLut["EASE_IN_BACK"] = AlphaFunctions::EaseInBack;
- alphaFunctionLut["EASE_OUT_BACK"] = AlphaFunctions::EaseOutBack;
- alphaFunctionLut["EASE_IN_OUT_BACK"] = AlphaFunctions::EaseInOutBack;
- alphaFunctionLut["SIN"] = AlphaFunctions::Sin;
- alphaFunctionLut["SIN2X"] = AlphaFunctions::Sin2x;
+ alphaFunctionLut["DEFAULT"] = AlphaFunction(AlphaFunction::DEFAULT);
+ alphaFunctionLut["LINEAR"] = AlphaFunction(AlphaFunction::LINEAR);
+ alphaFunctionLut["REVERSE"] = AlphaFunction(AlphaFunction::REVERSE);
+ alphaFunctionLut["EASE_IN_SQUARE"] = AlphaFunction(AlphaFunction::EASE_IN_SQUARE);
+ alphaFunctionLut["EASE_OUT_SQUARE"] = AlphaFunction(AlphaFunction::EASE_OUT_SQUARE);
+ alphaFunctionLut["EASE_IN"] = AlphaFunction(AlphaFunction::EASE_IN);
+ alphaFunctionLut["EASE_OUT"] = AlphaFunction(AlphaFunction::EASE_OUT);
+ alphaFunctionLut["EASE_IN_OUT"] = AlphaFunction(AlphaFunction::EASE_IN_OUT);
+ alphaFunctionLut["EASE_IN_SINE"] = AlphaFunction(AlphaFunction::EASE_IN_SINE);
+ alphaFunctionLut["EASE_OUT_SINE"] = AlphaFunction(AlphaFunction::EASE_OUT_SINE);
+ alphaFunctionLut["EASE_IN_OUT_SINE"] = AlphaFunction(AlphaFunction::EASE_IN_OUT_SINE);
+ alphaFunctionLut["BOUNCE"] = AlphaFunction(AlphaFunction::BOUNCE);
+ alphaFunctionLut["SIN"] = AlphaFunction(AlphaFunction::SIN);
+ alphaFunctionLut["EASE_OUT_BACK"] = AlphaFunction(AlphaFunction::EASE_OUT_BACK);
}
const AlphaFunctionLut::const_iterator iter( alphaFunctionLut.find( alphaFunction ) );
}
else
{
- DALI_ASSERT_ALWAYS( iter != alphaFunctionLut.end() && "Unknown Anchor Constant" );
- return Dali::AlphaFunctions::Default;
+ DALI_ASSERT_ALWAYS( iter != alphaFunctionLut.end() && "Unknown Alpha Constant" );
+ return Dali::AlphaFunction::DEFAULT;
}
}
Animation animation( Animation::New( 0.f ) );
- // duration needs to be set before AnimateTo calls for correct operation when AnimateTo has no "time-period".
+ // duration needs to be set before AnimateTo calls for correct operation when AnimateTo has no "timePeriod".
OptionalFloat duration = constant.IsFloat( IsChild(child, "duration" ) );
if( duration )
animation.SetLooping( *looping );
}
- if( OptionalString endAction = constant.IsString( IsChild(child, "end-action" ) ) )
+ if( OptionalString endAction = constant.IsString( IsChild(child, "endAction" ) ) )
{
if("BAKE" == *endAction)
{
- animation.SetEndAction( Animation::Bake );
+ animation.SetEndAction( Animation::BAKE );
}
else if("DISCARD" == *endAction)
{
- animation.SetEndAction( Animation::Discard );
+ animation.SetEndAction( Animation::DISCARD );
}
else if("BAKE_FINAL" == *endAction)
{
- animation.SetEndAction( Animation::BakeFinal );
+ animation.SetEndAction( Animation::BAKE_FINAL );
}
}
- if( OptionalString endAction = constant.IsString( IsChild(child, "disconnect-action" ) ) )
+ if( OptionalString endAction = constant.IsString( IsChild(child, "disconnectAction" ) ) )
{
if("BAKE" == *endAction)
{
- animation.SetDisconnectAction( Animation::Bake );
+ animation.SetDisconnectAction( Animation::BAKE );
}
else if("DISCARD" == *endAction)
{
- animation.SetDisconnectAction( Animation::Discard );
+ animation.SetDisconnectAction( Animation::DISCARD );
}
else if("BAKE_FINAL" == *endAction)
{
- animation.SetDisconnectAction( Animation::BakeFinal );
+ animation.SetDisconnectAction( Animation::BAKE_FINAL );
}
}
// to allow animating shader uniforms
if( propIndex == Property::INVALID_INDEX )
{
- RenderableActor renderable = RenderableActor::DownCast( targetHandle );
- if( renderable )
- {
- // A limitation here is that its possible that between creation of animation
- // and running it the ShaderEffect of the actor has been changed.
- // However this is a unlikely use case especially when using scripts.
- if( ShaderEffect effect = renderable.GetShaderEffect() )
- {
- propIndex = effect.GetPropertyIndex( *property );
- if(propIndex != Property::INVALID_INDEX)
- {
- targetHandle = effect;
- }
- else
- {
- DALI_SCRIPT_WARNING( "Cannot find property on object or ShaderEffect\n" );
- continue;
- }
- }
- }
- else
- {
- DALI_SCRIPT_WARNING( "Cannot find property on object or ShaderEffect\n" );
+ DALI_SCRIPT_WARNING( "Cannot find property on object\n" );
continue;
- }
- }
-
- if( propIndex == Property::INVALID_INDEX)
- {
- DALI_ASSERT_ALWAYS( propIndex != Property::INVALID_INDEX && "Animation must specify a valid property" );
- continue;
}
}
// these are the defaults
- AlphaFunction alphaFunction( AlphaFunctions::Default );
+ AlphaFunction alphaFunction( AlphaFunction::DEFAULT );
TimePeriod timePeriod( 0.f );
- OptionalChild timeChild = IsChild( pKeyChild.second, "time-period" );
+ OptionalChild timeChild = IsChild( pKeyChild.second, "timePeriod" );
if( timeChild )
{
durationSum = std::max( durationSum, timePeriod.delaySeconds + timePeriod.durationSeconds );
- if( OptionalString alphaChild = constant.IsString( IsChild(pKeyChild.second, "alpha-function" ) ) )
+ if( OptionalString alphaChild = constant.IsString( IsChild(pKeyChild.second, "alphaFunction" ) ) )
{
alphaFunction = GetAlphaFunction( *alphaChild );
}
- if( OptionalChild keyFrameChild = IsChild(pKeyChild.second, "key-frames") )
+ if( OptionalChild keyFrameChild = IsChild(pKeyChild.second, "keyFrames") )
{
DALI_ASSERT_ALWAYS( property && "Animation must specify a property name" );
Property prop = Property( targetHandle, propIndex );
throw;
}
- AlphaFunction kfAlphaFunction( AlphaFunctions::Default );
- if( OptionalString alphaFuncStr = constant.IsString( IsChild(pKeyChild.second, "alpha-function") ) )
+ AlphaFunction kfAlphaFunction( AlphaFunction::DEFAULT );
+ if( OptionalString alphaFuncStr = constant.IsString( IsChild(pKeyChild.second, "alphaFunction") ) )
{
kfAlphaFunction = GetAlphaFunction( *alphaFuncStr );
}
projects / platform / core / uifw / dali-toolkit.git / blobdiff