X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;ds=sidebyside;f=automated-tests%2Fsrc%2Fdali-toolkit%2Fdali-toolkit-test-utils%2Ftoolkit-vector-animation-renderer.cpp;h=a8f3ab80139a8ba3b5a9f243d1185651f95db57e;hb=1f5f10ff81ed70d033cbc236216dda5ea5a1b8e4;hp=e6456ec7dab867be63419a7dd516f1aa2ad5a173;hpb=020b07151378db83ab8e12eb3e2d51db0ed69996;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-vector-animation-renderer.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-vector-animation-renderer.cpp index e6456ec..a8f3ab8 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-vector-animation-renderer.cpp +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-vector-animation-renderer.cpp @@ -129,6 +129,11 @@ public: mNeedDroppedFrames = false; } + if(mDynamicPropertyCallback) + { + CallbackBase::ExecuteReturn(*mDynamicPropertyCallback, 0, 0, frameNumber); + } + if(mNeedTrigger) { mEventThreadCallback->Trigger(); @@ -190,6 +195,11 @@ public: } } + void AddPropertyValueCallback(const std::string& keyPath, Dali::VectorAnimationRenderer::VectorProperty property, CallbackBase* callback, int32_t id) + { + mDynamicPropertyCallback = std::unique_ptr(callback); + } + Dali::VectorAnimationRenderer::UploadCompletedSignalType& UploadCompletedSignal() { return mUploadCompletedSignal; @@ -216,23 +226,25 @@ public: public: static uint32_t mCount; - std::string mUrl; - Dali::Renderer mRenderer; - Dali::Mutex mMutex; - uint32_t mWidth; - uint32_t mHeight; - uint32_t mDefaultWidth; - uint32_t mDefaultHeight; - uint32_t mTotalFrameNumber; - uint32_t mPreviousFrame; - uint32_t mDelayTime; - uint32_t mDroppedFrames; - float mFrameRate; - bool mTestFrameDrop; - bool mNeedDroppedFrames; - bool mLoadFailed{false}; - bool mResourceReady{false}; - bool mNeedTrigger{true}; + std::string mUrl; + Dali::Renderer mRenderer; + Dali::Mutex mMutex; + std::unique_ptr mDynamicPropertyCallback{nullptr}; + + uint32_t mWidth; + uint32_t mHeight; + uint32_t mDefaultWidth; + uint32_t mDefaultHeight; + uint32_t mTotalFrameNumber; + uint32_t mPreviousFrame; + uint32_t mDelayTime; + uint32_t mDroppedFrames; + float mFrameRate; + bool mTestFrameDrop; + bool mNeedDroppedFrames; + bool mLoadFailed{false}; + bool mResourceReady{false}; + bool mNeedTrigger{true}; Dali::VectorAnimationRenderer::UploadCompletedSignalType mUploadCompletedSignal; std::unique_ptr mEventThreadCallback; @@ -348,6 +360,11 @@ void VectorAnimationRenderer::InvalidateBuffer() return Internal::Adaptor::GetImplementation(*this).InvalidateBuffer(); } +void VectorAnimationRenderer::AddPropertyValueCallback(const std::string& keyPath, VectorProperty property, CallbackBase* callback, int32_t id) +{ + Internal::Adaptor::GetImplementation(*this).AddPropertyValueCallback(keyPath, property, callback, id); +} + VectorAnimationRenderer::UploadCompletedSignalType& VectorAnimationRenderer::UploadCompletedSignal() { return Internal::Adaptor::GetImplementation(*this).UploadCompletedSignal();