projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[dali_1.4.33] Merge branch 'devel/master'
[platform/core/uifw/dali-toolkit.git]
/
automated-tests
/
src
/
dali-toolkit
/
dali-toolkit-test-utils
/
toolkit-vector-animation-renderer.cpp
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
6a42d9c
..
8e856bb
100755
(executable)
--- 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
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 201
8
Samsung Electronics Co., Ltd.
+ * Copyright (c) 201
9
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.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-36,37
+36,66
@@
public:
: mUrl( url ),
mRenderer(),
mWidth( 0 ),
: mUrl( url ),
mRenderer(),
mWidth( 0 ),
- mHeight( 0 )
+ mHeight( 0 ),
+ mPreviousFrame( 0 )
{
}
void SetRenderer( Dali::Renderer renderer )
{
mRenderer = renderer;
{
}
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 );
+ }
}
void SetSize( uint32_t width, uint32_t height )
{
mWidth = width;
mHeight = height;
}
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 );
+ }
+ }
+
+ void StopRender()
+ {
}
}
- bool
StartRender(
)
+ bool
Render( uint32_t frameNumber
)
{
{
+ if( frameNumber == 1 && mPreviousFrame != frameNumber )
+ {
+ mPreviousFrame = frameNumber;
+ // For test corverage
+ return false;
+ }
+ mPreviousFrame = frameNumber;
return true;
}
return true;
}
- void StopRender()
+ uint32_t GetTotalFrameNumber() const
{
{
+ return 5;
}
}
- void Render( uint32_t frameNumber )
+ float GetFrameRate() const
{
{
+ return 60.0f;
}
}
- uint32_t GetTotalFrameNumber()
+ void GetDefaultSize( uint32_t& width, uint32_t& height ) const
{
{
- return 5;
+ width = 100;
+ height = 100;
}
public:
}
public:
@@
-75,7
+104,7
@@
public:
Dali::Renderer mRenderer;
uint32_t mWidth;
uint32_t mHeight;
Dali::Renderer mRenderer;
uint32_t mWidth;
uint32_t mHeight;
-
+ uint32_t mPreviousFrame;
};
inline VectorAnimationRenderer& GetImplementation( Dali::VectorAnimationRenderer& renderer )
};
inline VectorAnimationRenderer& GetImplementation( Dali::VectorAnimationRenderer& renderer )
@@
-142,25
+171,30
@@
void VectorAnimationRenderer::SetSize( uint32_t width, uint32_t height )
Internal::Adaptor::GetImplementation( *this ).SetSize( width, height );
}
Internal::Adaptor::GetImplementation( *this ).SetSize( width, height );
}
-bool VectorAnimationRenderer::StartRender()
-{
- return Internal::Adaptor::GetImplementation( *this ).StartRender();
-}
-
void VectorAnimationRenderer::StopRender()
{
Internal::Adaptor::GetImplementation( *this ).StopRender();
}
void VectorAnimationRenderer::StopRender()
{
Internal::Adaptor::GetImplementation( *this ).StopRender();
}
-
void
VectorAnimationRenderer::Render( uint32_t frameNumber )
+
bool
VectorAnimationRenderer::Render( uint32_t frameNumber )
{
{
- Internal::Adaptor::GetImplementation( *this ).Render( frameNumber );
+
return
Internal::Adaptor::GetImplementation( *this ).Render( frameNumber );
}
}
-uint32_t VectorAnimationRenderer::GetTotalFrameNumber()
+uint32_t VectorAnimationRenderer::GetTotalFrameNumber()
const
{
return Internal::Adaptor::GetImplementation( *this ).GetTotalFrameNumber();
}
{
return Internal::Adaptor::GetImplementation( *this ).GetTotalFrameNumber();
}
+float VectorAnimationRenderer::GetFrameRate() const
+{
+ return Internal::Adaptor::GetImplementation( *this ).GetFrameRate();
+}
+
+void VectorAnimationRenderer::GetDefaultSize( uint32_t& width, uint32_t& height ) const
+{
+ Internal::Adaptor::GetImplementation( *this ).GetDefaultSize( width, height );
+}
+
} // namespace Dali;
} // namespace Dali;