//
// EXTERNAL INCLUDES
-#include <set>
#include <boost/function.hpp>
// INTERNAL INCLUDES
+#include <dali/public-api/common/set-wrapper.h>
#include <dali/internal/common/event-to-update.h>
#include <dali/internal/common/message.h>
#include <dali/internal/event/common/proxy-object.h>
}
/**
+ * @copydoc ActiveConstraintBase::OnCustomWeightSet()
+ */
+ virtual void OnCustomWeightSet( ProxyObject& weightObject )
+ {
+ ObserveProxy( weightObject );
+ }
+
+ /**
* @copydoc ActiveConstraintBase::OnFirstApply()
*/
virtual void OnFirstApply( ProxyObject& parent )
SceneGraph::ConstraintBase* sceneGraphConstraint = SceneGraphConstraint::New( *targetProperty,
propertyOwners,
func,
- mInterpolatorFunction );
+ mInterpolatorFunction,
+ mCustomWeight );
DALI_ASSERT_DEBUG( NULL != sceneGraphConstraint );
sceneGraphConstraint->SetInitialWeight( mOffstageWeight );
sceneGraphConstraint->SetRemoveAction( mRemoveAction );
}
/**
+ * @copydoc ActiveConstraintBase::OnCustomWeightSet()
+ */
+ virtual void OnCustomWeightSet( ProxyObject& weightObject )
+ {
+ ObserveProxy( weightObject );
+ }
+
+ /**
* @copydoc ActiveConstraintBase::OnFirstApply()
*/
virtual void OnFirstApply( ProxyObject& parent )
sceneGraphConstraint = SceneGraphConstraint::New( *targetProperty,
propertyOwners,
func,
- mInterpolatorFunction );
+ mInterpolatorFunction,
+ mCustomWeight );
}
else
{
if ( 0 == componentIndex )
{
typedef SceneGraph::Constraint< float, PropertyComponentAccessorX<Vector3> > SceneGraphConstraint;
- sceneGraphConstraint = SceneGraphConstraint::New( *targetProperty, propertyOwners, func, mInterpolatorFunction );
+ sceneGraphConstraint = SceneGraphConstraint::New( *targetProperty, propertyOwners, func, mInterpolatorFunction, mCustomWeight );
}
else if ( 1 == componentIndex )
{
typedef SceneGraph::Constraint< float, PropertyComponentAccessorY<Vector3> > SceneGraphConstraint;
- sceneGraphConstraint = SceneGraphConstraint::New( *targetProperty, propertyOwners, func, mInterpolatorFunction );
+ sceneGraphConstraint = SceneGraphConstraint::New( *targetProperty, propertyOwners, func, mInterpolatorFunction, mCustomWeight );
}
else if ( 2 == componentIndex )
{
typedef SceneGraph::Constraint< float, PropertyComponentAccessorZ<Vector3> > SceneGraphConstraint;
- sceneGraphConstraint = SceneGraphConstraint::New( *targetProperty, propertyOwners, func, mInterpolatorFunction );
+ sceneGraphConstraint = SceneGraphConstraint::New( *targetProperty, propertyOwners, func, mInterpolatorFunction, mCustomWeight );
}
}
else if ( PropertyTypes::Get< Vector4 >() == targetProperty->GetType() )
if ( 0 == componentIndex )
{
typedef SceneGraph::Constraint< float, PropertyComponentAccessorX<Vector4> > SceneGraphConstraint;
- sceneGraphConstraint = SceneGraphConstraint::New( *targetProperty, propertyOwners, func, mInterpolatorFunction );
+ sceneGraphConstraint = SceneGraphConstraint::New( *targetProperty, propertyOwners, func, mInterpolatorFunction, mCustomWeight );
}
else if ( 1 == componentIndex )
{
typedef SceneGraph::Constraint< float, PropertyComponentAccessorY<Vector4> > SceneGraphConstraint;
- sceneGraphConstraint = SceneGraphConstraint::New( *targetProperty, propertyOwners, func, mInterpolatorFunction );
+ sceneGraphConstraint = SceneGraphConstraint::New( *targetProperty, propertyOwners, func, mInterpolatorFunction, mCustomWeight );
}
else if ( 2 == componentIndex )
{
typedef SceneGraph::Constraint< float, PropertyComponentAccessorZ<Vector4> > SceneGraphConstraint;
- sceneGraphConstraint = SceneGraphConstraint::New( *targetProperty, propertyOwners, func, mInterpolatorFunction );
+ sceneGraphConstraint = SceneGraphConstraint::New( *targetProperty, propertyOwners, func, mInterpolatorFunction, mCustomWeight );
}
else if ( 3 == componentIndex )
{
typedef SceneGraph::Constraint< float, PropertyComponentAccessorW<Vector4> > SceneGraphConstraint;
- sceneGraphConstraint = SceneGraphConstraint::New( *targetProperty, propertyOwners, func, mInterpolatorFunction );
+ sceneGraphConstraint = SceneGraphConstraint::New( *targetProperty, propertyOwners, func, mInterpolatorFunction, mCustomWeight );
}
}
}