X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Finternal%2Fevent%2Fanimation%2Fkey-frame-channel.h;h=378f6a4e3fd53ddded0d46aeba79aa2b5d60564f;hb=f3921a2529d98e26774c054ec635887742ae7b1a;hp=bba814fde583df138bd3ace85e0480479f30526c;hpb=86cc77228aed6d24b06b6ee61bd41d555d4f5451;p=platform%2Fcore%2Fuifw%2Fdali-core.git diff --git a/dali/internal/event/animation/key-frame-channel.h b/dali/internal/event/animation/key-frame-channel.h index bba814f..378f6a4 100644 --- a/dali/internal/event/animation/key-frame-channel.h +++ b/dali/internal/event/animation/key-frame-channel.h @@ -1,8 +1,8 @@ -#ifndef __DALI_INTERNAL_KEY_FRAME_CHANNEL_H__ -#define __DALI_INTERNAL_KEY_FRAME_CHANNEL_H__ +#ifndef DALI_INTERNAL_KEY_FRAME_CHANNEL_H +#define DALI_INTERNAL_KEY_FRAME_CHANNEL_H /* - * Copyright (c) 2014 Samsung Electronics Co., Ltd. + * Copyright (c) 2019 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -103,7 +103,6 @@ bool KeyFrameChannel::IsActive (float progress) /** * Use a linear search to find the interval containing progress - * TODO: Use binary search instead */ template bool KeyFrameChannel::FindInterval( @@ -156,7 +155,7 @@ V KeyFrameChannel::GetValue (float progress, Dali::Animation::Interpolation i { float frameProgress = (progress - start->GetProgress()) / (end->GetProgress() - start->GetProgress()); - if( interpolation == Dali::Animation::Linear ) + if( interpolation == Dali::Animation::LINEAR ) { Interpolate(interpolatedV, start->GetValue(), end->GetValue(), frameProgress); } @@ -203,4 +202,4 @@ typedef KeyFrameChannel KeyFrameChannelAngleAxis; } // Internal } // namespace Dali -#endif // __DALI_INTERNAL_KEY_FRAME_CHANNEL_H__ +#endif // DALI_INTERNAL_KEY_FRAME_CHANNEL_H