/*
- * Copyright (c) 2018 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.
#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, Dali::Renderer renderer, uint32_t width, uint32_t height )
+ VectorAnimationRenderer( const std::string& url )
: mUrl( url ),
- mRenderer( renderer ),
- mWidth( width ),
- mHeight( height )
+ mRenderer(),
+ mWidth( 0 ),
+ mHeight( 0 ),
+ mPreviousFrame( 0 ),
+ mFrameRate( 60.0f ),
+ mEventThreadCallback( new EventThreadCallback( MakeCallback( this, &VectorAnimationRenderer::OnTriggered ) ) )
{
+ mCount++;
+
+ if( mCount == 2 )
+ {
+ mFrameRate = 0.1f;
+ }
+ }
+
+ ~VectorAnimationRenderer()
+ {
+ mCount--;
+ }
+
+ void SetRenderer( Dali::Renderer renderer )
+ {
+ mRenderer = renderer;
+
+ if( mWidth != 0 && mHeight != 0 )
+ {
+ Dali::TextureSet textureSet = mRenderer.GetTextures();
+ Dali::Texture texture = Dali::Texture::New( TextureType::TEXTURE_2D, Pixel::RGBA8888, mWidth, mHeight );
+ textureSet.SetTexture( 0, texture );
+ mUploadCompletedSignal.Emit();
+ }
}
void SetSize( uint32_t width, uint32_t height )
{
mWidth = width;
mHeight = height;
+
+ if( mRenderer )
+ {
+ Dali::TextureSet textureSet = mRenderer.GetTextures();
+ Dali::Texture texture = Dali::Texture::New( TextureType::TEXTURE_2D, Pixel::RGBA8888, mWidth, mHeight );
+ textureSet.SetTexture( 0, texture );
+ mUploadCompletedSignal.Emit();
+ }
}
- bool StartRender()
+ bool Render( uint32_t frameNumber )
{
+ if( mNeedTrigger )
+ {
+ mEventThreadCallback->Trigger();
+ mNeedTrigger = false;
+ }
+
+ if( frameNumber == 1 && mPreviousFrame != frameNumber )
+ {
+ mPreviousFrame = frameNumber;
+ // For test corverage
+ return false;
+ }
+ mPreviousFrame = frameNumber;
return true;
}
- void StopRender()
+ uint32_t GetTotalFrameNumber() const
+ {
+ return VECTOR_ANIMATION_TOTAL_FRAME_NUMBER;
+ }
+
+ float GetFrameRate() const
{
+ return mFrameRate;
}
- void Render( uint32_t frameNumber )
+ void GetDefaultSize( uint32_t& width, uint32_t& height ) const
{
+ width = 100;
+ height = 100;
}
- uint32_t GetTotalFrameNumber()
+ 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()
{
- return 5;
}
public:
+ static uint32_t mCount;
+ static bool mNeedTrigger;
+
std::string mUrl;
Dali::Renderer mRenderer;
uint32_t mWidth;
uint32_t mHeight;
-
+ 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 )
{
DALI_ASSERT_ALWAYS( renderer && "VectorAnimationRenderer handle is empty." );
/********************************* PUBLIC CLASS *******************************/
/********************************************************************************/
-VectorAnimationRenderer VectorAnimationRenderer::New( const std::string& url, Renderer renderer, uint32_t width, uint32_t height )
+VectorAnimationRenderer VectorAnimationRenderer::New( const std::string& url )
{
- Internal::Adaptor::VectorAnimationRenderer* animationRenderer = new Internal::Adaptor::VectorAnimationRenderer( url, renderer, width, height );
+ Internal::Adaptor::VectorAnimationRenderer* animationRenderer = new Internal::Adaptor::VectorAnimationRenderer( url );
return VectorAnimationRenderer( animationRenderer );
}
return *this;
}
+void VectorAnimationRenderer::Finalize()
+{
+}
+
+void VectorAnimationRenderer::SetRenderer( Renderer renderer )
+{
+ Internal::Adaptor::GetImplementation( *this ).SetRenderer( renderer );
+}
+
void VectorAnimationRenderer::SetSize( uint32_t width, uint32_t height )
{
Internal::Adaptor::GetImplementation( *this ).SetSize( width, height );
}
-bool VectorAnimationRenderer::StartRender()
+bool VectorAnimationRenderer::Render( uint32_t frameNumber )
{
- return Internal::Adaptor::GetImplementation( *this ).StartRender();
+ return Internal::Adaptor::GetImplementation( *this ).Render( frameNumber );
}
-void VectorAnimationRenderer::StopRender()
+uint32_t VectorAnimationRenderer::GetTotalFrameNumber() const
{
- Internal::Adaptor::GetImplementation( *this ).StopRender();
+ return Internal::Adaptor::GetImplementation( *this ).GetTotalFrameNumber();
}
-void VectorAnimationRenderer::Render( uint32_t frameNumber )
+float VectorAnimationRenderer::GetFrameRate() const
{
- Internal::Adaptor::GetImplementation( *this ).Render( frameNumber );
+ return Internal::Adaptor::GetImplementation( *this ).GetFrameRate();
}
-uint32_t VectorAnimationRenderer::GetTotalFrameNumber()
+void VectorAnimationRenderer::GetDefaultSize( uint32_t& width, uint32_t& height ) const
{
- return Internal::Adaptor::GetImplementation( *this ).GetTotalFrameNumber();
+ Internal::Adaptor::GetImplementation( *this ).GetDefaultSize( width, height );
+}
+
+void VectorAnimationRenderer::GetLayerInfo( Property::Map& map ) const
+{
+}
+
+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 Test
+{
+namespace VectorAnimationRenderer
+{
+
+void RequestTrigger()
+{
+ Dali::Internal::Adaptor::VectorAnimationRenderer::mNeedTrigger = true;
}
-} // namespace Dali;
+} // VectorAnimationRenderer
+} // Test