Merge remote-tracking branch 'origin/tizen' into devel/new_mesh 04/39604/1
authorFrancisco Santos <f1.santos@samsung.com>
Tue, 19 May 2015 10:55:33 +0000 (11:55 +0100)
committerFrancisco Santos <f1.santos@samsung.com>
Tue, 19 May 2015 10:55:33 +0000 (11:55 +0100)
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

1  2 
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
     *