/*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2016 Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
*/
-#include <dali/internal/event/common/proxy-object.h>
+#include <dali/internal/event/common/object-impl.h>
#include <dali/internal/event/animation/property-constraint.h>
#include <dali/internal/event/animation/property-input-accessor.h>
#include <dali/internal/event/animation/property-input-indexer.h>
namespace SceneGraph
{
-PropertyNotification* PropertyNotification::New(ProxyObject& proxy,
+PropertyNotification* PropertyNotification::New(Object& object,
Property::Index propertyIndex,
Property::Type propertyType,
int componentIndex,
RawArgumentContainer& arguments,
NotifyMode notifyMode)
{
- return new PropertyNotification( proxy, propertyIndex, propertyType, componentIndex, condition, arguments, notifyMode );
+ return new PropertyNotification( object, propertyIndex, propertyType, componentIndex, condition, arguments, notifyMode );
}
-PropertyNotification::PropertyNotification(ProxyObject& proxy,
+PropertyNotification::PropertyNotification(Object& object,
Property::Index propertyIndex,
Property::Type propertyType,
int componentIndex,
ConditionType condition,
RawArgumentContainer& arguments,
NotifyMode notifyMode)
-: mProxy(&proxy),
+: mObject(&object),
mPropertyIndex(propertyIndex),
mPropertyType(propertyType),
mProperty(NULL),
mConditionType(condition),
mArguments(arguments),
mValid(false),
- mNotifyMode( Dali::PropertyNotification::Disabled )
+ mNotifyMode( Dali::PropertyNotification::Disabled ),
+ mConditionFunction(NULL)
{
SetNotifyMode(notifyMode);
}
}
- mProperty = mProxy->GetSceneObjectInputProperty( mPropertyIndex );
- int internalComponentIndex = mProxy->GetPropertyComponentIndex(mPropertyIndex);
+ mProperty = mObject->GetSceneObjectInputProperty( mPropertyIndex );
+ int internalComponentIndex = mObject->GetPropertyComponentIndex(mPropertyIndex);
if( internalComponentIndex != Property::INVALID_COMPONENT_INDEX )
{
// override the one passed in
if ( Property::INVALID_COMPONENT_INDEX != mComponentIndex )
{
// Evaluate Condition
- const PropertyInputComponentAccessor component( mProperty, mComponentIndex );
- const PropertyInputIndexer< PropertyInputComponentAccessor > input( bufferIndex, &component );
+ const PropertyInputAccessor component( mProperty, mComponentIndex );
+ const PropertyInputIndexer< PropertyInputAccessor > input( bufferIndex, &component );
currentValid = mConditionFunction(input, mArguments);
}
else