From: Francisco Santos <f1.santos@samsung.com>
Date: Tue, 19 May 2015 10:55:33 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/tizen' into devel/new_mesh
X-Git-Tag: dali_1.0.47~2^2~16
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F04%2F39604%2F1;p=platform%2Fcore%2Fuifw%2Fdali-demo.git

Merge remote-tracking branch 'origin/tizen' into devel/new_mesh

Conflicts:
	examples/animated-shapes/animated-shapes-example.cpp
	examples/new-window/new-window-example.cpp
	examples/path-animation/path-animation.cpp
	examples/radial-menu/radial-menu-example.cpp
	examples/radial-menu/radial-sweep-view-impl.h
	examples/radial-menu/radial-sweep-view.cpp
	examples/refraction-effect/refraction-effect-example.cpp

Change-Id: I9da2bc5f3145cd179535081fca2d2504f4fd6cd6
---

661d97a34184795b6a99266a4a8b744f5fc11aa8
diff --cc examples/cluster/cluster-example.cpp
index 7dd8673,8f49325..958c8bb
--- a/examples/cluster/cluster-example.cpp
+++ b/examples/cluster/cluster-example.cpp
@@@ -642,6 -545,39 +545,40 @@@ public
    }
  
    /**
+    * Sets motion blur effect to a cluster and all its children
+    *
+    * @param[in] actor Cluster control to which the effect will be applied
+    */
+   void SetMotionBlurEffect( Actor actor )
+   {
++    /*
+     // only do something if the actor and effect are valid
+     if( actor )
+     {
+       // first remove from this actor
+       RenderableActor renderable = RenderableActor::DownCast( actor );
+       if( renderable )
+       {
+         MotionBlurEffect shaderEffect = MotionBlurEffect::New();
+         shaderEffect.SetSpeedScalingFactor(0.1f);
+ 
+         Dali::Property::Index uModelProperty = shaderEffect.GetPropertyIndex( "uModelLastFrame" );
+         Constraint constraint = Constraint::New<Matrix>( shaderEffect, uModelProperty, EqualToConstraint() );
+         constraint.AddSource( Source( actor , Actor::Property::WORLD_MATRIX ) );
+         constraint.Apply();
+         renderable.SetShaderEffect( shaderEffect );
+       }
+       // then all children recursively
+       const unsigned int count = actor.GetChildCount();
+       for( unsigned int index = 0; index < count; ++index )
+       {
+         Actor child( actor.GetChildAt( index ) );
+         SetMotionBlurEffect( child );
+       }
 -    }
++    }*/
+   }
+ 
+   /**
     * Resets ScrollView and Clusters settings
     * to reflect the new ExampleEffectType
     *