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
(Vector) Ensure that all animation data is applied at once
[platform/core/uifw/dali-toolkit.git]
/
automated-tests
/
src
/
dali-toolkit
/
utc-Dali-BubbleEmitter.cpp
diff --git
a/automated-tests/src/dali-toolkit/utc-Dali-BubbleEmitter.cpp
b/automated-tests/src/dali-toolkit/utc-Dali-BubbleEmitter.cpp
index
a4575fc
..
1b15e74
100644
(file)
--- a/
automated-tests/src/dali-toolkit/utc-Dali-BubbleEmitter.cpp
+++ b/
automated-tests/src/dali-toolkit/utc-Dali-BubbleEmitter.cpp
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 201
6
Samsung Electronics Co., Ltd.
+ * Copyright (c) 201
7
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.
@@
-198,9
+198,9
@@
int UtcDaliBubbleEmitterSetBubbleScale(void)
DALI_TEST_CHECK(emitter);
Actor root = emitter.GetRootActor();
Stage::GetCurrent().Add( root );
DALI_TEST_CHECK(emitter);
Actor root = emitter.GetRootActor();
Stage::GetCurrent().Add( root );
- root.SetP
osition(
Vector3::ZERO );
- root.SetP
arentOrigin(
ParentOrigin::CENTER );
- root.Set
AnchorPoint(
AnchorPoint::CENTER );
+ root.SetP
roperty( Actor::Property::POSITION,
Vector3::ZERO );
+ root.SetP
roperty( Actor::Property::PARENT_ORIGIN,
ParentOrigin::CENTER );
+ root.Set
Property( Actor::Property::ANCHOR_POINT,
AnchorPoint::CENTER );
TestGlAbstraction& gl = application.GetGlAbstraction();
TestGlAbstraction& gl = application.GetGlAbstraction();
@@
-288,20
+288,24
@@
int UtcDaliBubbleEmitterEmitBubble(void)
(bubbleRenderer.GetProperty(propertyIndex1)).Get( value1 );
DALI_TEST_EQUALS(value0, 0.f, TEST_LOCATION );
DALI_TEST_EQUALS(value1, 0.f, TEST_LOCATION );
(bubbleRenderer.GetProperty(propertyIndex1)).Get( value1 );
DALI_TEST_EQUALS(value0, 0.f, TEST_LOCATION );
DALI_TEST_EQUALS(value1, 0.f, TEST_LOCATION );
+ ( bubbleRenderer.GetCurrentProperty( propertyIndex0 ) ).Get( value0 );
+ ( bubbleRenderer.GetCurrentProperty( propertyIndex0 ) ).Get( value1 );
+ DALI_TEST_EQUALS(value0, 0.f, TEST_LOCATION );
+ DALI_TEST_EQUALS(value1, 0.f, TEST_LOCATION );
animation.Play();
Wait(application, 300);
propertyIndex0 = bubbleRenderer.GetPropertyIndex( "uPercentage[0]" );
propertyIndex1 = bubbleRenderer.GetPropertyIndex( "uPercentage[1]" );
animation.Play();
Wait(application, 300);
propertyIndex0 = bubbleRenderer.GetPropertyIndex( "uPercentage[0]" );
propertyIndex1 = bubbleRenderer.GetPropertyIndex( "uPercentage[1]" );
- (
bubbleRenderer.GetProperty(propertyIndex0)
).Get( value0 );
- (
bubbleRenderer.GetProperty(propertyIndex1)
).Get( value1 );
+ (
bubbleRenderer.GetCurrentProperty( propertyIndex0 )
).Get( value0 );
+ (
bubbleRenderer.GetCurrentProperty( propertyIndex0 )
).Get( value1 );
DALI_TEST_CHECK( value0 >= 0.6f );
DALI_TEST_CHECK( value1 >= 0.6f );
Wait(application,500);
DALI_TEST_CHECK( value0 >= 0.6f );
DALI_TEST_CHECK( value1 >= 0.6f );
Wait(application,500);
- (
bubbleRenderer.GetProperty(propertyIndex0)
).Get( value0 );
- (
bubbleRenderer.GetProperty(propertyIndex1)
).Get( value1 );
+ (
bubbleRenderer.GetCurrentProperty( propertyIndex0 )
).Get( value0 );
+ (
bubbleRenderer.GetCurrentProperty( propertyIndex0 )
).Get( value1 );
DALI_TEST_EQUALS(value0, 1.f, TEST_LOCATION );
DALI_TEST_EQUALS(value1, 1.f, TEST_LOCATION );
END_TEST;
DALI_TEST_EQUALS(value0, 1.f, TEST_LOCATION );
DALI_TEST_EQUALS(value1, 1.f, TEST_LOCATION );
END_TEST;
@@
-317,9
+321,9
@@
int UtcDaliBubbleEmitterRestore(void)
BubbleEmitter emitter = BubbleEmitter::New( movementArea,shapeImage, 90, Vector2( 5.f, 10.f ));
Actor root = emitter.GetRootActor();
Stage::GetCurrent().Add( root );
BubbleEmitter emitter = BubbleEmitter::New( movementArea,shapeImage, 90, Vector2( 5.f, 10.f ));
Actor root = emitter.GetRootActor();
Stage::GetCurrent().Add( root );
- root.SetP
osition(
Vector3::ZERO );
- root.SetP
arentOrigin(
ParentOrigin::CENTER );
- root.Set
AnchorPoint(
AnchorPoint::CENTER );
+ root.SetP
roperty( Actor::Property::POSITION,
Vector3::ZERO );
+ root.SetP
roperty( Actor::Property::PARENT_ORIGIN,
ParentOrigin::CENTER );
+ root.Set
Property( Actor::Property::ANCHOR_POINT,
AnchorPoint::CENTER );
Renderer renderer = root.GetRendererAt( 0 );
DALI_TEST_CHECK( renderer );
Renderer renderer = root.GetRendererAt( 0 );
DALI_TEST_CHECK( renderer );