X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fbubble-effect%2Fbubble-emitter-impl.cpp;h=ae17a0dcdbe88081107fa62bca297bc873f3337f;hp=0661494b521f031d4e1cb8911835417fc43e804a;hb=df92f45e89c92ca9b2286d51116ff7b69e75c569;hpb=e4e5db1d2d7997e7bf803a531048d8dcb959083b diff --git a/dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.cpp b/dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.cpp index 0661494..ae17a0d 100644 --- a/dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.cpp +++ b/dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.cpp @@ -261,14 +261,14 @@ void BubbleEmitter::EmitBubble( Animation& animation, const Vector2& emitPositio unsigned int groupIdx = mCurrentUniform / mNumBubblePerShader; SetBubbleParameter( mEffect[groupIdx], curUniform, emitPosition, direction, displacement); animation.AnimateTo( Property( mEffect[groupIdx], mEffect[groupIdx].GetPercentagePropertyName(curUniform) ), - 1.f, AlphaFunctions::Linear ); + 1.f, AlphaFunction::LINEAR ); if( mCurrentUniform % mNumShader == 0 ) { unsigned int uniform = mCurrentUniform / mNumShader; SetBubbleParameter(mEffectForNoise, uniform, emitPosition, displacement); animation.AnimateTo( Property( mEffectForNoise, mEffectForNoise.GetPercentagePropertyName(uniform) ), - 1.f, AlphaFunctions::Linear ); + 1.f, AlphaFunction::LINEAR ); } mCurrentUniform = (mCurrentUniform + 1) % mTotalNumOfBubble; @@ -280,10 +280,10 @@ void BubbleEmitter::StartExplosion( float duration, float multiple ) for(unsigned int i=0; i < mNumShader; i++ ) { animation.AnimateTo( Property( mEffect[i], mEffect[i].GetMagnificationPropertyName() ), - multiple, AlphaFunctions::EaseOut); + multiple, AlphaFunction::EASE_OUT); } animation.AnimateTo( Property( mEffectForNoise, mEffectForNoise.GetMagnificationPropertyName() ), - multiple, AlphaFunctions::EaseOut); + multiple, AlphaFunction::EASE_OUT); animation.Play(); animation.FinishedSignal().Connect(this, &BubbleEmitter::OnExplosionFinished);