Peter M. Groen / dali-demo

Commit 76c81225b02c04b203a6da7f677a26cd9980a5ea

Authored by Heeyong Song
1 parent 703a3a34

(ArcVisual) Fix wrong transtion animator value 

Change-Id: Id7a5c82f28e5148deb420075f4b65f93e9fccd86
Inline Side-by-side
Showing 1 changed file with 26 additions and 11 deletions
examples/arc-visual/arc-visual-example.cpp
  View file @76c8122
@@ -31,7 +31,7 @@ const float START_ANGLE_INITIAL_VALUE( 0.0f ); @@ -31,7 +31,7 @@ const float START_ANGLE_INITIAL_VALUE( 0.0f );
31 const float START_ANGLE_TARGET_VALUE( 360.0f ); 31 const float START_ANGLE_TARGET_VALUE( 360.0f );
32 const float SWEEP_ANGLE_INITIAL_VALUE( 90.0f ); 32 const float SWEEP_ANGLE_INITIAL_VALUE( 90.0f );
33 const float SWEEP_ANGLE_TARGET_VALUE( 360.0f ); 33 const float SWEEP_ANGLE_TARGET_VALUE( 360.0f );
34 -const float ANIMATION_DURATION( 5.0f ); 34 +const float ANIMATION_DURATION( 3.0f );
35 35
36 const Property::Value BACKGROUND 36 const Property::Value BACKGROUND
37 { 37 {
@@ -43,6 +43,29 @@ const Property::Value BACKGROUND @@ -43,6 +43,29 @@ const Property::Value BACKGROUND
43 { DevelArcVisual::Property::THICKNESS, 20.0f } 43 { DevelArcVisual::Property::THICKNESS, 20.0f }
44 }; 44 };
45 45
  46 +const Property::Value TRANSITION_ANIMATOR
  47 +{
  48 + { "timePeriod", Property::Map().Add( "duration", ANIMATION_DURATION ) }
  49 +};
  50 +
  51 +const Property::Value TRANSITION_START_ANGLE
  52 +{
  53 + { "target", "background" },
  54 + { "property", "startAngle" },
  55 + { "initialValue", START_ANGLE_INITIAL_VALUE },
  56 + { "targetValue", START_ANGLE_TARGET_VALUE },
  57 + { "animator", TRANSITION_ANIMATOR }
  58 +};
  59 +
  60 +const Property::Value TRANSITION_SWEEP_ANGLE
  61 +{
  62 + { "target", "background" },
  63 + { "property", "sweepAngle" },
  64 + { "initialValue", SWEEP_ANGLE_INITIAL_VALUE },
  65 + { "targetValue", SWEEP_ANGLE_TARGET_VALUE },
  66 + { "animator", TRANSITION_ANIMATOR }
  67 +};
  68 +
46 } // namespace 69 } // namespace
47 70
48 // This example shows the properties of the arc visual - thickness, startAngle and sweepAngle and animates them. 71 // This example shows the properties of the arc visual - thickness, startAngle and sweepAngle and animates them.
@@ -90,16 +113,8 @@ private: @@ -90,16 +113,8 @@ private:
90 if( touch.GetState( 0 ) == PointState::UP ) 113 if( touch.GetState( 0 ) == PointState::UP )
91 { 114 {
92 Property::Array array; 115 Property::Array array;
93 - array.PushBack( Property::Map().Add( "target", "background" )  
94 - .Add( "property", "startAngle" )  
95 - .Add( "initialValue", START_ANGLE_INITIAL_VALUE )  
96 - .Add( "targetValue", START_ANGLE_TARGET_VALUE )  
97 - .Add( "animator", Property::Map().Add( "duration", ANIMATION_DURATION ) ) );  
98 - array.PushBack( Property::Map().Add( "target", "background" )  
99 - .Add( "property", "sweepAngle" )  
100 - .Add( "initialValue", SWEEP_ANGLE_INITIAL_VALUE )  
101 - .Add( "targetValue", SWEEP_ANGLE_TARGET_VALUE )  
102 - .Add( "animator", Property::Map().Add( "duration", ANIMATION_DURATION ) ) ); 116 + array.PushBack( TRANSITION_START_ANGLE );
  117 + array.PushBack( TRANSITION_SWEEP_ANGLE );
103 118
104 TransitionData transitionData = TransitionData::New( array ); 119 TransitionData transitionData = TransitionData::New( array );
105 Animation animation = DevelControl::CreateTransition( Toolkit::Internal::GetImplementation( mControl ), transitionData ); 120 Animation animation = DevelControl::CreateTransition( Toolkit::Internal::GetImplementation( mControl ), transitionData );