/*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2018 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/public-api/math/radian.h>
#include <dali/internal/event/actors/actor-impl.h>
#include <dali/internal/event/common/property-notification-manager.h>
-#include <dali/internal/event/common/proxy-object.h>
+#include <dali/internal/event/common/object-impl.h>
#include <dali/internal/event/common/stage-impl.h>
#include <dali/internal/update/manager/update-manager.h>
#include <dali/internal/update/common/scene-graph-property-notification.h>
#include <dali/internal/event/common/thread-local-storage.h>
-using namespace std;
-
using Dali::Internal::SceneGraph::UpdateManager;
namespace Dali
UpdateManager& updateManager = tls.GetUpdateManager();
- PropertyNotificationManager& propertyNotificationManager = Stage::GetCurrent()->GetPropertyNotificationManager();
-
+ PropertyNotificationManager& propertyNotificationManager = tls.GetPropertyNotificationManager();
PropertyNotificationPtr propertyNotification = new PropertyNotification(updateManager,
propertyNotificationManager,
target,
componentIndex,
condition);
-
return propertyNotification;
}
-PropertyNotification::PropertyNotification(UpdateManager& updateManager,
- PropertyNotificationManager& propertyNotificationManager,
- Property& target,
- int componentIndex,
- const Dali::PropertyCondition& condition)
-: mUpdateManager(updateManager),
- mPropertyNotification(NULL),
- mPropertyNotificationManager(propertyNotificationManager),
- mProxyPropertyIndex(target.propertyIndex),
- mPropertyType(Property::NONE),
- mComponentIndex(componentIndex),
- mCondition(condition),
- mNotifyMode(Dali::PropertyNotification::NotifyOnTrue),
- mNotifyResult(false)
-{
- // Set condition arguments (as simple vector of floats)
- PropertyCondition::ArgumentContainer arguments = GetImplementation(condition).arguments;
- PropertyCondition::ArgumentConstIter iter = arguments.begin();
-
- while( iter != arguments.end() )
+PropertyNotification::PropertyNotification( UpdateManager& updateManager,
+ PropertyNotificationManager& propertyNotificationManager,
+ Property& target,
+ int componentIndex,
+ const Dali::PropertyCondition& condition )
+: mUpdateManager( updateManager ),
+ mPropertyNotification( NULL ),
+ mPropertyNotificationManager( propertyNotificationManager ),
+ mObjectPropertyIndex( target.propertyIndex ),
+ mPropertyType( Property::NONE ),
+ mComponentIndex( componentIndex ),
+ mCondition( condition ),
+ mNotifyMode( Dali::PropertyNotification::NotifyOnTrue ),
+ mNotifyResult( false )
+{
+ const Internal::PropertyCondition& conditionImpl = GetImplementation( condition );
+
+ Dali::Vector<float>::SizeType count = conditionImpl.arguments.Count();
+ for( Dali::Vector<float>::SizeType index = 0; index < count; ++index )
{
- const Property::Value& value = *iter;
- float floatValue;
- value.Get(floatValue);
-
- mRawConditionArgs.PushBack( floatValue );
- ++iter;
+ mRawConditionArgs.PushBack( conditionImpl.arguments[ index ] );
}
- // Observe target proxy and create/destroy notification scene object accordingly.
- mProxy = dynamic_cast<ProxyObject*>( &GetImplementation(target.object) );
- if ( mProxy )
+ // Observe target object and create/destroy notification scene object accordingly.
+ mObject = dynamic_cast<Object*>( &GetImplementation(target.object) );
+ if ( mObject )
{
- mPropertyType = mProxy->GetPropertyType(mProxyPropertyIndex);
+ mPropertyType = mObject->GetPropertyType(mObjectPropertyIndex);
- int internalComponentIndex = mProxy->GetPropertyComponentIndex(mProxyPropertyIndex);
+ int internalComponentIndex = mObject->GetPropertyComponentIndex(mObjectPropertyIndex);
if( internalComponentIndex != Property::INVALID_COMPONENT_INDEX )
{
// override the one passed in
}
if(mComponentIndex != Property::INVALID_COMPONENT_INDEX)
{
- Property::Type type = mProxy->GetPropertyType(mProxyPropertyIndex);
+ Property::Type type = mObject->GetPropertyType(mObjectPropertyIndex);
if( type == Property::VECTOR2
|| type == Property::VECTOR3
|| type == Property::VECTOR4 )
}
}
- // Check if target scene-object already present, and if so create our notification
- // scene-object
- const SceneGraph::PropertyOwner* object = mProxy->GetSceneObject();
- if (object)
- {
- CreateSceneObject();
- }
+ // all objects always have scene object
+ CreateSceneObject();
}
// Connect to the property notification manager
}
}
-Dali::PropertyNotifySignalV2& PropertyNotification::NotifySignal()
+Dali::PropertyNotifySignalType& PropertyNotification::NotifySignal()
{
return mNotifySignal;
}
Dali::Handle PropertyNotification::GetTarget() const
{
- Dali::Handle handle(mProxy);
+ Dali::Handle handle(mObject);
return handle;
}
Property::Index PropertyNotification::GetTargetProperty() const
{
- return mProxyPropertyIndex;
+ return mObjectPropertyIndex;
}
void PropertyNotification::SetNotifyMode( NotifyMode mode )
void PropertyNotification::CreateSceneObject()
{
- DALI_ASSERT_DEBUG( mPropertyNotification == NULL );
-
- // Create a new PropertyNotification, temporarily owned
- SceneGraph::PropertyNotification* propertyNotification = SceneGraph::PropertyNotification::New( *mProxy,
- mProxyPropertyIndex,
- mPropertyType,
- mComponentIndex,
- GetImplementation(mCondition).type,
- mRawConditionArgs,
- mNotifyMode );
- // Keep a const pointer to the PropertyNotification.
- mPropertyNotification = propertyNotification;
-
- // Transfer scene object ownership to the update manager through a message
- AddPropertyNotificationMessage( mUpdateManager, propertyNotification );
+ // this method can be called from constructor and on stage connection
+ if( !mPropertyNotification )
+ {
+ // Create a new PropertyNotification, keep a const pointer to it
+ mPropertyNotification = SceneGraph::PropertyNotification::New( *mObject,
+ mObjectPropertyIndex,
+ mPropertyType,
+ mComponentIndex,
+ GetImplementation( mCondition ).type,
+ mRawConditionArgs,
+ mNotifyMode );
+ OwnerPointer< SceneGraph::PropertyNotification > transferOwnership( const_cast<SceneGraph::PropertyNotification*>( mPropertyNotification ) );
+ AddPropertyNotificationMessage( mUpdateManager, transferOwnership );
+ }
}
void PropertyNotification::DestroySceneObject()