Merge "Size negotiation patch 2: Re-enable size negotiation on builder actors." into...

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / public-api / shader-effects / nine-patch-mask-effect.cpp

diff --git a/dali-toolkit/public-api/shader-effects/nine-patch-mask-effect.cpp b/dali-toolkit/public-api/shader-effects/nine-patch-mask-effect.cpp
index bfaba3d..d2b8967 100644 (file)
--- a/dali-toolkit/public-api/shader-effects/nine-patch-mask-effect.cpp
+++ b/dali-toolkit/public-api/shader-effects/nine-patch-mask-effect.cpp
@@ -19,7 +19,10 @@
 #include <dali-toolkit/public-api/shader-effects/nine-patch-mask-effect.h>
 
 // EXTERNAL INCLUDES
+#include <dali/public-api/animation/constraint.h>
+#include <dali/public-api/object/property-input.h>
 #include <dali/public-api/shader-effects/shader-effect.h>
+#include <dali/public-api/images/resource-image.h>
 
 namespace Dali
 {
@@ -30,14 +33,17 @@ namespace Toolkit
 namespace NinePatchMaskEffect
 {
 
-struct NinePatchMaskEffectSizeConstraint
+namespace
 {
-  Vector2 operator()( const Vector2& current, const PropertyInput& property )
-  {
-    const Vector3& actorSize = property.GetVector3();
-    return Vector2( actorSize.x, actorSize.y );
-  }
-};
+
+void NinePatchMaskEffectSizeConstraint( Vector2& current, const PropertyInputContainer& inputs )
+{
+  const Vector3& actorSize = inputs[0]->GetVector3();
+  current.x = actorSize.x;
+  current.y = actorSize.y;
+}
+
+} // unnamed namespace
 
 static void DoApply( ImageActor actor, const std::string& maskImage, const Vector2& maskSize, Vector4 maskBorder )
 {
@@ -83,12 +89,13 @@ static void DoApply( ImageActor actor, const std::string& maskImage, const Vecto
     GeometryType( GEOMETRY_TYPE_IMAGE ),
     ShaderEffect::GeometryHints( ShaderEffect::HINT_BLENDING ) );
 
-  maskEffect.SetEffectImage( Image::New( maskImage ) );
+  maskEffect.SetEffectImage( ResourceImage::New( maskImage ) );
 
   maskEffect.SetUniform( "uImageSize", Vector2(0,0) /*Constrained to actor size*/ );
-  maskEffect.ApplyConstraint( Constraint::New<Vector2>( maskEffect.GetPropertyIndex("uImageSize"),
-                                                        Source(actor, Actor::SIZE),
-                                                        NinePatchMaskEffectSizeConstraint() ) );
+
+  Constraint constraint = Constraint::New<Vector2>( maskEffect, maskEffect.GetPropertyIndex("uImageSize"), NinePatchMaskEffectSizeConstraint );
+  constraint.AddSource( Source(actor, Actor::Property::SIZE) );
+  constraint.Apply();
 
   maskEffect.SetUniform( "uMaskSize", maskSize );
 
@@ -101,7 +108,7 @@ static void DoApply( ImageActor actor, const std::string& maskImage, const Vecto
 
 void Apply( ImageActor actor, const std::string& maskImage )
 {
-  Vector2 maskSize = Image::GetImageSize( maskImage );
+  Vector2 maskSize = ResourceImage::GetImageSize( maskImage );
 
   const float leftRight = (maskSize.width  - 1.0f) * 0.5f;
   const float topBottom = (maskSize.height - 1.0f) * 0.5f;
@@ -111,7 +118,7 @@ void Apply( ImageActor actor, const std::string& maskImage )
 
 void Apply( ImageActor actor, const std::string& maskImage, const Vector4& maskBorder )
 {
-  Vector2 maskSize = Image::GetImageSize( maskImage );
+  Vector2 maskSize = ResourceImage::GetImageSize( maskImage );
 
   DoApply( actor, maskImage, maskSize, maskBorder );
 }