Peter M. Groen / dali-demo

Commit 3807430cdebda4eef0a0e7481283db0e2e87fa30

Authored by Xiangyin Ma
1 parent 59c7a43e

Change the colors in demo laucher 

Change-Id: I5dbe51d7bd65a18fc150acadd4d8ffe15b9c5546
Inline Side-by-side
Showing 1 changed file with 10 additions and 6 deletions
demo/dali-table-view.cpp
  View file @3807430
@@ -67,7 +67,14 @@ const float EFFECT_SNAP_DURATION = 0.66f; ///< Scroll Snap @@ -67,7 +67,14 @@ const float EFFECT_SNAP_DURATION = 0.66f; ///< Scroll Snap
67 const float EFFECT_FLICK_DURATION = 0.5f; ///< Scroll Flick Duration for Effects 67 const float EFFECT_FLICK_DURATION = 0.5f; ///< Scroll Flick Duration for Effects
68 const Vector3 ANGLE_CUBE_PAGE_ROTATE(Math::PI * 0.5f, Math::PI * 0.5f, 0.0f); 68 const Vector3 ANGLE_CUBE_PAGE_ROTATE(Math::PI * 0.5f, Math::PI * 0.5f, 0.0f);
69 69
70 - 70 +const Vector4 BUBBLE_COLOR[] =
  71 +{
  72 + Vector4( 0.3255f, 0.3412f, 0.6353f, 0.38f ),
  73 + Vector4( 0.3647f, 0.7569f, 0.8157f, 0.38f ),
  74 + Vector4( 0.3804f, 0.7412f, 0.6510f, 0.38f ),
  75 + Vector4( 1.f, 1.f, 1.f, 0.2f )
  76 +};
  77 +const int NUMBER_OF_BUBBLE_COLOR( sizeof(BUBBLE_COLOR) / sizeof(BUBBLE_COLOR[0]) );
71 78
72 const int NUM_BACKGROUND_IMAGES = 18; 79 const int NUM_BACKGROUND_IMAGES = 18;
73 const float BACKGROUND_SWIPE_SCALE = 0.025f; 80 const float BACKGROUND_SWIPE_SCALE = 0.025f;
@@ -79,7 +86,7 @@ const float SCALE_SPEED_SIN = 0.1f; @@ -79,7 +86,7 @@ const float SCALE_SPEED_SIN = 0.1f;
79 const unsigned int BACKGROUND_ANIMATION_DURATION = 15000; // 15 secs 86 const unsigned int BACKGROUND_ANIMATION_DURATION = 15000; // 15 secs
80 87
81 const float BACKGROUND_Z = -1.0f; 88 const float BACKGROUND_Z = -1.0f;
82 -const Vector4 BACKGROUND_COLOR( 1.0f, 1.0f, 1.0f, 1.0f ); 89 +const Vector4 BACKGROUND_COLOR( 0.3569f, 0.5451f, 0.7294f, 1.0f );
83 90
84 const float BUBBLE_MIN_Z = -1.0; 91 const float BUBBLE_MIN_Z = -1.0;
85 const float BUBBLE_MAX_Z = 0.0f; 92 const float BUBBLE_MAX_Z = 0.0f;
@@ -755,9 +762,6 @@ void DaliTableView::AddBackgroundActors( Actor layer, int count, BufferImage dis @@ -755,9 +762,6 @@ void DaliTableView::AddBackgroundActors( Actor layer, int count, BufferImage dis
755 for( int i = 0; i < count; ++i ) 762 for( int i = 0; i < count; ++i )
756 { 763 {
757 float randSize = Random::Range( 10.0f, 400.0f ); 764 float randSize = Random::Range( 10.0f, 400.0f );
758 - float hue = Random::Range( 0.3f, 1.0f );  
759 - Vector4 randColour( hue, hue * 0.5, 0.0f, Random::Range( 0.3f, 0.6f ));  
760 -  
761 ImageActor dfActor = ImageActor::New( distanceField ); 765 ImageActor dfActor = ImageActor::New( distanceField );
762 dfActor.SetSize( Vector2( randSize, randSize ) ); 766 dfActor.SetSize( Vector2( randSize, randSize ) );
763 dfActor.SetParentOrigin( ParentOrigin::CENTER ); 767 dfActor.SetParentOrigin( ParentOrigin::CENTER );
@@ -767,7 +771,7 @@ void DaliTableView::AddBackgroundActors( Actor layer, int count, BufferImage dis @@ -767,7 +771,7 @@ void DaliTableView::AddBackgroundActors( Actor layer, int count, BufferImage dis
767 771
768 ShaderEffect effect = Toolkit::CreateDistanceFieldEffect(); 772 ShaderEffect effect = Toolkit::CreateDistanceFieldEffect();
769 dfActor.SetShaderEffect( effect ); 773 dfActor.SetShaderEffect( effect );
770 - dfActor.SetColor( randColour ); 774 + dfActor.SetColor( BUBBLE_COLOR[ i%NUMBER_OF_BUBBLE_COLOR ] );
771 effect.SetUniform("uOutlineParams", Vector2( 0.55f, 0.00f ) ); 775 effect.SetUniform("uOutlineParams", Vector2( 0.55f, 0.00f ) );
772 effect.SetUniform("uSmoothing", 0.5f ); 776 effect.SetUniform("uSmoothing", 0.5f );
773 layer.Add( dfActor ); 777 layer.Add( dfActor );