#include <dali/devel-api/adaptor-framework/vector-animation-renderer.h>
#include <dali/public-api/object/base-object.h>
#include <toolkit-application.h>
+#include <toolkit-vector-animation-renderer.h>
+#include <toolkit-event-thread-callback.h>
+#include <memory>
namespace Dali
{
{
public:
- VectorAnimationRenderer( const std::string& url )
- : mUrl( url ),
+ VectorAnimationRenderer()
+ : mUrl(),
mRenderer(),
mWidth( 0 ),
mHeight( 0 ),
mPreviousFrame( 0 ),
- mFrameRate( 60.0f )
+ mFrameRate( 60.0f ),
+ mEventThreadCallback( new EventThreadCallback( MakeCallback( this, &VectorAnimationRenderer::OnTriggered ) ) )
{
mCount++;
mCount--;
}
+ bool Load(const std::string& url)
+ {
+ mUrl = url;
+ if(mUrl == "invalid.json")
+ {
+ return false;
+ }
+ return true;
+ }
+
void SetRenderer( Dali::Renderer renderer )
{
mRenderer = renderer;
bool Render( uint32_t frameNumber )
{
+ if( mNeedTrigger )
+ {
+ mEventThreadCallback->Trigger();
+ mNeedTrigger = false;
+ }
+
if( frameNumber == 1 && mPreviousFrame != frameNumber )
{
mPreviousFrame = frameNumber;
uint32_t GetTotalFrameNumber() const
{
- return 5;
+ return VECTOR_ANIMATION_TOTAL_FRAME_NUMBER;
}
float GetFrameRate() const
height = 100;
}
+ bool GetMarkerInfo( const std::string& marker, uint32_t& startFrame, uint32_t& endFrame ) const
+ {
+ if( marker.compare( VECTOR_ANIMATION_MARKER_NAME_1 ) == 0 )
+ {
+ startFrame = VECTOR_ANIMATION_MARKER_START_FRAME_1;
+ endFrame = VECTOR_ANIMATION_MARKER_END_FRAME_1;
+ }
+ else if( marker.compare( VECTOR_ANIMATION_MARKER_NAME_2 ) == 0 )
+ {
+ startFrame = VECTOR_ANIMATION_MARKER_START_FRAME_2;
+ endFrame = VECTOR_ANIMATION_MARKER_END_FRAME_2;
+ }
+ else
+ {
+ return false;
+ }
+ return true;
+ }
+
Dali::VectorAnimationRenderer::UploadCompletedSignalType& UploadCompletedSignal()
{
return mUploadCompletedSignal;
}
+ void OnTriggered()
+ {
+ }
+
public:
static uint32_t mCount;
+ static bool mNeedTrigger;
std::string mUrl;
Dali::Renderer mRenderer;
uint32_t mPreviousFrame;
float mFrameRate;
Dali::VectorAnimationRenderer::UploadCompletedSignalType mUploadCompletedSignal;
+ std::unique_ptr< EventThreadCallback > mEventThreadCallback;
};
uint32_t VectorAnimationRenderer::mCount = 0;
+bool VectorAnimationRenderer::mNeedTrigger = true;
inline VectorAnimationRenderer& GetImplementation( Dali::VectorAnimationRenderer& renderer )
{
/********************************* PUBLIC CLASS *******************************/
/********************************************************************************/
-VectorAnimationRenderer VectorAnimationRenderer::New( const std::string& url )
+VectorAnimationRenderer VectorAnimationRenderer::New()
{
- Internal::Adaptor::VectorAnimationRenderer* animationRenderer = new Internal::Adaptor::VectorAnimationRenderer( url );
+ Internal::Adaptor::VectorAnimationRenderer* animationRenderer = new Internal::Adaptor::VectorAnimationRenderer();
return VectorAnimationRenderer( animationRenderer );
}
{
}
+bool VectorAnimationRenderer::Load(const std::string& url)
+{
+ return Internal::Adaptor::GetImplementation( *this ).Load(url);
+}
+
void VectorAnimationRenderer::SetRenderer( Renderer renderer )
{
Internal::Adaptor::GetImplementation( *this ).SetRenderer( renderer );
{
}
+bool VectorAnimationRenderer::GetMarkerInfo( const std::string& marker, uint32_t& startFrame, uint32_t& endFrame ) const
+{
+ return Internal::Adaptor::GetImplementation( *this ).GetMarkerInfo( marker, startFrame, endFrame );
+}
+
VectorAnimationRenderer::UploadCompletedSignalType& VectorAnimationRenderer::UploadCompletedSignal()
{
return Internal::Adaptor::GetImplementation( *this ).UploadCompletedSignal();
}
-} // namespace Dali;
+} // namespace Dali
+
+namespace Test
+{
+namespace VectorAnimationRenderer
+{
+
+void RequestTrigger()
+{
+ Dali::Internal::Adaptor::VectorAnimationRenderer::mNeedTrigger = true;
+}
+
+} // VectorAnimationRenderer
+} // Test