/*
- * 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.
// INTERNAL INCLUDES
#include <dali/integration-api/debug.h>
+#include <dali/devel-api/object/handle-devel.h>
#include <dali/internal/update/animation/scene-graph-constraint-base.h>
#include <dali/internal/update/common/animatable-property.h>
#include <dali/internal/update/common/property-owner-messages.h>
-#include <dali/internal/event/animation/active-constraint-base.h>
+#include <dali/internal/update/common/uniform-map.h>
#include <dali/internal/event/animation/constraint-impl.h>
-#include <dali/internal/event/common/stage-impl.h>
+#include <dali/internal/event/common/property-helper.h>
#include <dali/internal/event/common/property-notification-impl.h>
+#include <dali/internal/event/common/stage-impl.h>
#include <dali/internal/event/common/type-registry-impl.h>
using Dali::Internal::SceneGraph::AnimatableProperty;
namespace // unnamed namespace
{
const int SUPPORTED_CAPABILITIES = Dali::Handle::DYNAMIC_PROPERTIES; // Object provides this capability
-typedef Dali::Vector<Object::Observer*>::Iterator ObserverIter;
-typedef Dali::Vector<Object::Observer*>::ConstIterator ConstObserverIter;
#if defined(DEBUG_ENABLED)
Debug::Filter* gLogFilter = Debug::Filter::New(Debug::NoLogging, false, "LOG_OBJECT" );
#endif
+
+constexpr Property::Index MAX_PER_CLASS_PROPERTY_INDEX = ANIMATABLE_PROPERTY_REGISTRATION_MAX_INDEX;
+
} // unnamed namespace
Object::Object()
void Object::RemoveObserver(Observer& observer)
{
// Find the observer...
- const ConstObserverIter endIter = mObservers.End();
- for( ObserverIter iter = mObservers.Begin(); iter != endIter; ++iter)
+ const auto endIter = mObservers.End();
+ for( auto iter = mObservers.Begin(); iter != endIter; ++iter)
{
if( (*iter) == &observer)
{
DALI_ASSERT_DEBUG(endIter != mObservers.End());
}
-void Object::OnSceneObjectAdd()
-{
- // Notification for this object's constraints
- if( mConstraints )
- {
- const ActiveConstraintConstIter endIter = mConstraints->end();
- for ( ActiveConstraintIter iter = mConstraints->begin(); endIter != iter; ++iter )
- {
- ActiveConstraintBase& baseConstraint = GetImplementation( *iter );
- baseConstraint.OnParentSceneObjectAdded();
- }
- }
-
- // Notification for observers
- for( ConstObserverIter iter = mObservers.Begin(), endIter = mObservers.End(); iter != endIter; ++iter)
- {
- (*iter)->SceneObjectAdded(*this);
- }
-
- // enable property notifications in scene graph
- EnablePropertyNotifications();
-}
-
-void Object::OnSceneObjectRemove()
-{
- // Notification for this object's constraints
- if( mConstraints )
- {
- const ActiveConstraintConstIter endIter = mConstraints->end();
- for ( ActiveConstraintIter iter = mConstraints->begin(); endIter != iter; ++iter )
- {
- ActiveConstraintBase& baseConstraint = GetImplementation( *iter );
- baseConstraint.OnParentSceneObjectRemoved();
- }
- }
-
- // Notification for observers
- for( ConstObserverIter iter = mObservers.Begin(), endIter = mObservers.End(); iter != endIter; ++iter )
- {
- (*iter)->SceneObjectRemoved(*this);
- }
-
- // disable property notifications in scene graph
- DisablePropertyNotifications();
-}
-
-int Object::GetPropertyComponentIndex( Property::Index index ) const
-{
- return Property::INVALID_COMPONENT_INDEX;
-}
-
bool Object::Supports( Capability capability ) const
{
return (capability & SUPPORTED_CAPABILITIES);
}
-unsigned int Object::GetPropertyCount() const
+uint32_t Object::GetPropertyCount() const
{
- unsigned int count = GetDefaultPropertyCount();
-
- DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Default Properties: %d\n", count );
-
+ uint32_t count = 0u;
const TypeInfo* typeInfo( GetTypeInfo() );
if ( typeInfo )
{
- unsigned int manual( typeInfo->GetPropertyCount() );
- count += manual;
+ count = typeInfo->GetPropertyCount();
- DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Manual Properties: %d\n", manual );
+ DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Registered Properties: %d\n", count );
}
- unsigned int custom( mCustomProperties.Count() );
+ uint32_t custom = static_cast<uint32_t>( mCustomProperties.Count() );
count += custom;
DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Custom Properties: %d\n", custom );
{
DALI_ASSERT_ALWAYS( index > Property::INVALID_INDEX && "Property index out of bounds" );
- if ( index < DEFAULT_PROPERTY_MAX_COUNT )
- {
- return GetDefaultPropertyName( index );
- }
-
- if ( ( index >= PROPERTY_REGISTRATION_START_INDEX ) && ( index <= PROPERTY_REGISTRATION_MAX_INDEX ) )
+ // is this a per class or per instance property
+ if ( index < MAX_PER_CLASS_PROPERTY_INDEX )
{
const TypeInfo* typeInfo( GetTypeInfo() );
if ( typeInfo )
{
return typeInfo->GetPropertyName( index );
}
- else
+ }
+ else // child property or custom property
+ {
+ CustomPropertyMetadata* custom = FindCustomProperty( index );
+ if( custom )
{
- DALI_ASSERT_ALWAYS( ! "Property index is invalid" );
+ return custom->name;
}
}
- CustomProperty* custom = FindCustomProperty( index );
- if( custom )
- {
- return custom->name;
- }
- return "";
+ DALI_LOG_ERROR( "Property index %d not found\n", index );
+ return std::string();
}
-Property::Index Object::GetPropertyIndex(const std::string& name) const
+Property::Index Object::GetPropertyIndex( const std::string& name ) const
{
- Property::Index index = GetDefaultPropertyIndex( name );
+ Property::Index index = Property::INVALID_INDEX;
- if ( index == Property::INVALID_INDEX )
+ const TypeInfo* typeInfo( GetTypeInfo() );
+ if ( typeInfo )
{
- const TypeInfo* typeInfo( GetTypeInfo() );
- if ( typeInfo )
+ index = typeInfo->GetPropertyIndex( name );
+ }
+ if( (index == Property::INVALID_INDEX)&&( mCustomProperties.Count() > 0 ) )
+ {
+ Property::Index count = PROPERTY_CUSTOM_START_INDEX;
+ const auto end = mCustomProperties.End();
+ for( auto iter = mCustomProperties.Begin(); iter != end; ++iter, ++count )
{
- index = typeInfo->GetPropertyIndex( name );
+ CustomPropertyMetadata* custom = static_cast<CustomPropertyMetadata*>(*iter);
+ if ( custom->name == name )
+ {
+ if ( custom->childPropertyIndex != Property::INVALID_INDEX )
+ {
+ // If it is a child property, return the child property index
+ index = custom->childPropertyIndex;
+ }
+ else
+ {
+ index = count;
+ }
+ break;
+ }
}
}
- if( ( index == Property::INVALID_INDEX )&&( mCustomProperties.Count() > 0 ) )
+ return index;
+}
+
+Property::Index Object::GetPropertyIndex( Property::Index key ) const
+{
+ Property::Index index = Property::INVALID_INDEX;
+
+ if( mCustomProperties.Count() > 0 )
{
Property::Index count = PROPERTY_CUSTOM_START_INDEX;
- const CustomPropertyLookup::ConstIterator end = mCustomProperties.End();
- for( CustomPropertyLookup::ConstIterator iter = mCustomProperties.Begin(); iter != end; ++iter, ++count )
+ const auto end = mCustomProperties.End();
+ for( auto iter = mCustomProperties.Begin(); iter != end; ++iter, ++count )
{
- CustomProperty* custom = *iter;
- if ( custom->name == name )
+ CustomPropertyMetadata* custom = static_cast<CustomPropertyMetadata*>(*iter);
+ if( custom->key == key )
{
- index = count;
+ if( custom->childPropertyIndex != Property::INVALID_INDEX )
+ {
+ // If it is a child property, return the child property index
+ index = custom->childPropertyIndex;
+ }
+ else
+ {
+ index = count;
+ }
break;
}
}
return index;
}
+Property::Index Object::GetPropertyIndex( Property::Key key ) const
+{
+ Property::Index index = Property::INVALID_INDEX;
+ if( key.type == Property::Key::INDEX )
+ {
+ index = GetPropertyIndex( key.indexKey );
+ }
+ else
+ {
+ index = GetPropertyIndex( key.stringKey );
+ }
+ return index;
+}
+
bool Object::IsPropertyWritable( Property::Index index ) const
{
DALI_ASSERT_ALWAYS(index > Property::INVALID_INDEX && "Property index is out of bounds");
- if ( index < DEFAULT_PROPERTY_MAX_COUNT )
- {
- return IsDefaultPropertyWritable( index );
- }
+ bool writable = false;
- if ( ( index >= PROPERTY_REGISTRATION_START_INDEX ) && ( index <= PROPERTY_REGISTRATION_MAX_INDEX ) )
+ // is this a per class or per instance property
+ if ( index < MAX_PER_CLASS_PROPERTY_INDEX )
{
const TypeInfo* typeInfo( GetTypeInfo() );
if ( typeInfo )
{
- return typeInfo->IsPropertyWritable( index );
+ writable = typeInfo->IsPropertyWritable( index );
}
- else
+ }
+ else
+ {
+ CustomPropertyMetadata* custom = FindCustomProperty( index );
+ if( custom )
{
- DALI_ASSERT_ALWAYS( ! "Invalid property index" );
+ writable = custom->IsWritable();
}
}
- CustomProperty* custom = FindCustomProperty( index );
- if( custom )
- {
- return custom->IsWritable();
- }
- return false;
+ return writable;
}
bool Object::IsPropertyAnimatable( Property::Index index ) const
{
DALI_ASSERT_ALWAYS(index > Property::INVALID_INDEX && "Property index is out of bounds");
- if ( index < DEFAULT_PROPERTY_MAX_COUNT )
- {
- return IsDefaultPropertyAnimatable( index );
- }
+ bool animatable = false;
- if ( ( index >= PROPERTY_REGISTRATION_START_INDEX ) && ( index <= PROPERTY_REGISTRATION_MAX_INDEX ) )
+ // is this a per class or per instance property
+ if ( index < MAX_PER_CLASS_PROPERTY_INDEX )
{
- // Type Registry event-thread only properties are not animatable.
- return false;
+ const TypeInfo* typeInfo( GetTypeInfo() );
+ if ( typeInfo )
+ {
+ animatable = typeInfo->IsPropertyAnimatable( index );
+ }
}
-
- CustomProperty* custom = FindCustomProperty( index );
- if( custom )
+ else
{
- return custom->IsAnimatable();
+ CustomPropertyMetadata* custom = FindCustomProperty( index );
+ if( custom )
+ {
+ animatable = custom->IsAnimatable();
+ }
}
- return false;
+
+ return animatable;
}
bool Object::IsPropertyAConstraintInput( Property::Index index ) const
{
DALI_ASSERT_ALWAYS(index > Property::INVALID_INDEX && "Property index is out of bounds");
- if ( index < DEFAULT_PROPERTY_MAX_COUNT )
- {
- return IsDefaultPropertyAConstraintInput( index );
- }
+ bool isConstraintInput = false;
- if ( ( index >= PROPERTY_REGISTRATION_START_INDEX ) && ( index <= PROPERTY_REGISTRATION_MAX_INDEX ) )
+ // is this a per class or per instance property
+ if ( index < MAX_PER_CLASS_PROPERTY_INDEX )
{
- // Type Registry event-thread only properties cannot be used as an input to a constraint.
- return false;
+ const TypeInfo* typeInfo( GetTypeInfo() );
+ if ( typeInfo )
+ {
+ isConstraintInput = typeInfo->IsPropertyAConstraintInput( index );
+ }
}
-
- CustomProperty* custom = FindCustomProperty( index );
- if( custom )
+ else
{
- // ... custom properties can be used as input to a constraint.
- return true;
+ CustomPropertyMetadata* custom = FindCustomProperty( index );
+ if( custom )
+ {
+ // ... custom properties can be used as input to a constraint.
+ isConstraintInput = true;
+ }
}
- return false;
+
+ return isConstraintInput;
}
Property::Type Object::GetPropertyType( Property::Index index ) const
{
DALI_ASSERT_ALWAYS(index > Property::INVALID_INDEX && "Property index is out of bounds" );
- if ( index < DEFAULT_PROPERTY_MAX_COUNT )
- {
- return GetDefaultPropertyType( index );
- }
-
- if ( ( index >= PROPERTY_REGISTRATION_START_INDEX ) && ( index <= PROPERTY_REGISTRATION_MAX_INDEX ) )
+ // is this a per class or per instance property
+ if ( index < MAX_PER_CLASS_PROPERTY_INDEX )
{
const TypeInfo* typeInfo( GetTypeInfo() );
if ( typeInfo )
{
return typeInfo->GetPropertyType( index );
}
- else
- {
- DALI_ASSERT_ALWAYS( ! "Cannot find property index" );
- }
}
- CustomProperty* custom = FindCustomProperty( index );
+ CustomPropertyMetadata* custom = FindCustomProperty( index );
if( custom )
{
- return custom->type;
+ return custom->GetType();
}
+
return Property::NONE;
}
{
DALI_ASSERT_ALWAYS(index > Property::INVALID_INDEX && "Property index is out of bounds" );
+ bool propertySet( true );
+
if ( index < DEFAULT_PROPERTY_MAX_COUNT )
{
SetDefaultProperty( index, propertyValue );
}
else
{
- DALI_ASSERT_ALWAYS( ! "Cannot find property index" );
+ // cannot register this property as there is no setter for it.
+ // event side properties must have a setter for now so need to be registered
+ DALI_LOG_ERROR( "Property index %d not found\n", index );
+ propertySet = false;
}
}
- else
+ else if ( ( index >= ANIMATABLE_PROPERTY_REGISTRATION_START_INDEX ) && ( index <= ANIMATABLE_PROPERTY_REGISTRATION_MAX_INDEX ) )
{
- CustomProperty* custom = FindCustomProperty( index );
- DALI_ASSERT_ALWAYS( custom && "Invalid property index" );
- if( custom->IsAnimatable() )
+ // check whether the animatable property is registered already, if not then register one.
+ AnimatablePropertyMetadata* animatableProperty = GetSceneAnimatableProperty( index, &propertyValue );
+ if( !animatableProperty )
{
+ DALI_LOG_ERROR( "Property index %d not found\n", index );
+ propertySet = false;
+ }
+ else
+ {
+ // update the cached property value
+ animatableProperty->SetPropertyValue( propertyValue );
+
// set the scene graph property value
- SetSceneGraphProperty( index, *custom, propertyValue );
+ SetSceneGraphProperty( index, *animatableProperty, propertyValue );
+ }
+ }
+ else
+ {
+ CustomPropertyMetadata* custom = FindCustomProperty( index );
+
+ if ( ( index >= CHILD_PROPERTY_REGISTRATION_START_INDEX ) && ( index <= CHILD_PROPERTY_REGISTRATION_MAX_INDEX ) )
+ {
+ if( !custom )
+ {
+ // If the child property is not registered yet, register it.
+ custom = new CustomPropertyMetadata( "", propertyValue, Property::READ_WRITE );
+ mCustomProperties.PushBack( custom );
+ }
+
+ custom->childPropertyIndex = index;
+
+ // Resolve name for the child property
+ Object* parent = GetParentObject();
+ if( parent )
+ {
+ const TypeInfo* parentTypeInfo( parent->GetTypeInfo() );
+ if( parentTypeInfo )
+ {
+ custom->name = parentTypeInfo->GetChildPropertyName( index );
+ }
+ }
+ }
+
+ if( custom )
+ {
+ if( custom->IsAnimatable() )
+ {
+ // update the cached property value
+ custom->SetPropertyValue( propertyValue );
+
+ // set the scene graph property value
+ SetSceneGraphProperty( index, *custom, propertyValue );
+ }
+ else if( custom->IsWritable() )
+ {
+ // update the cached property value
+ custom->SetPropertyValue( propertyValue );
+ }
+ else
+ {
+ // trying to set value on read only property is no-op
+ propertySet = false;
+ }
}
- else if( custom->IsWritable() )
+ else
{
- custom->value = propertyValue;
- OnPropertySet(index, propertyValue);
+ DALI_LOG_ERROR( "Property index %d not found\n", index );
+ propertySet = false;
}
- // trying to set value on read only property is no-op
+ }
+
+ // Let derived classes know that a property has been set
+ // TODO: We should not call this for read-only properties, SetDefaultProperty() && TypeInfo::SetProperty() should return a bool, which would be true if the property is set
+ if ( propertySet )
+ {
+ OnPropertySet( index, propertyValue );
+ Dali::Handle handle( this );
+ mPropertySetSignal.Emit( handle, index, propertyValue );
}
}
}
else
{
- DALI_ASSERT_ALWAYS( ! "Cannot find property index" );
+ DALI_LOG_ERROR( "Property index %d not found\n", index );
}
}
- else if( mCustomProperties.Count() > 0 )
+ else if ( ( index >= ANIMATABLE_PROPERTY_REGISTRATION_START_INDEX ) && ( index <= ANIMATABLE_PROPERTY_REGISTRATION_MAX_INDEX ) )
{
- CustomProperty* custom = FindCustomProperty( index );
- DALI_ASSERT_ALWAYS( custom && "Invalid property index" );
-
- if( !custom->IsAnimatable() )
+ // check whether the animatable property is registered already, if not then register one.
+ // this is needed because property value may have been set as full property and get as a property component
+ AnimatablePropertyMetadata* animatableProperty = GetSceneAnimatableProperty( index, nullptr );
+ if( animatableProperty )
{
- value = custom->value;
+ // get the cached animatable property value
+ value = animatableProperty->GetPropertyValue();
}
else
{
- BufferIndex bufferIndex( GetEventThreadServices().GetEventBufferIndex() );
-
- switch ( custom->type )
- {
- case Property::BOOLEAN:
- {
- const AnimatableProperty<bool>* property = dynamic_cast< const AnimatableProperty<bool>* >( custom->GetSceneGraphProperty() );
- DALI_ASSERT_DEBUG( NULL != property );
-
- value = (*property)[ bufferIndex ];
- break;
- }
-
- case Property::FLOAT:
- {
- const AnimatableProperty<float>* property = dynamic_cast< const AnimatableProperty<float>* >( custom->GetSceneGraphProperty() );
- DALI_ASSERT_DEBUG( NULL != property );
-
- value = (*property)[ bufferIndex ];
- break;
- }
-
- case Property::INTEGER:
- {
- const AnimatableProperty<int>* property = dynamic_cast< const AnimatableProperty<int>* >( custom->GetSceneGraphProperty() );
- DALI_ASSERT_DEBUG( NULL != property );
-
- value = (*property)[ bufferIndex ];
- break;
- }
-
- case Property::VECTOR2:
- {
- const AnimatableProperty<Vector2>* property = dynamic_cast< const AnimatableProperty<Vector2>* >( custom->GetSceneGraphProperty() );
- DALI_ASSERT_DEBUG( NULL != property );
-
- value = (*property)[ bufferIndex ];
- break;
- }
-
- case Property::VECTOR3:
- {
- const AnimatableProperty<Vector3>* property = dynamic_cast< const AnimatableProperty<Vector3>* >( custom->GetSceneGraphProperty() );
- DALI_ASSERT_DEBUG( NULL != property );
-
- value = (*property)[ bufferIndex ];
- break;
- }
-
- case Property::VECTOR4:
- {
- const AnimatableProperty<Vector4>* property = dynamic_cast< const AnimatableProperty<Vector4>* >( custom->GetSceneGraphProperty() );
- DALI_ASSERT_DEBUG( NULL != property );
-
- value = (*property)[ bufferIndex ];
- break;
- }
-
- case Property::MATRIX:
- {
- const AnimatableProperty<Matrix>* property = dynamic_cast< const AnimatableProperty<Matrix>* >( custom->GetSceneGraphProperty() );
- DALI_ASSERT_DEBUG( NULL != property );
-
- value = (*property)[ bufferIndex ];
- break;
- }
-
- case Property::MATRIX3:
- {
- const AnimatableProperty<Matrix3>* property = dynamic_cast< const AnimatableProperty<Matrix3>* >( custom->GetSceneGraphProperty() );
- DALI_ASSERT_DEBUG( NULL != property );
-
- value = (*property)[ bufferIndex ];
- break;
- }
-
- case Property::ROTATION:
- {
- const AnimatableProperty<Quaternion>* property = dynamic_cast< const AnimatableProperty<Quaternion>* >( custom->GetSceneGraphProperty() );
- DALI_ASSERT_DEBUG( NULL != property );
-
- value = (*property)[ bufferIndex ];
- break;
- }
-
- default:
- {
- DALI_ASSERT_ALWAYS( false && "PropertyType enumeration is out of bounds" );
- break;
- }
- } // switch(type)
- } // if animatable
-
+ DALI_LOG_ERROR( "Property index %d not found\n", index );
+ }
+ }
+ else if(mCustomProperties.Count() > 0)
+ {
+ CustomPropertyMetadata* custom = FindCustomProperty( index );
+ if(custom)
+ {
+ // get the cached custom property value
+ value = custom->GetPropertyValue();
+ }
+ else
+ {
+ DALI_LOG_ERROR( "Property index %d not found\n", index );
+ }
} // if custom
return value;
}
-void Object::GetPropertyIndices( Property::IndexContainer& indices ) const
+Property::Value Object::GetCurrentProperty( Property::Index index ) const
{
- indices.clear();
+ DALI_ASSERT_ALWAYS( index > Property::INVALID_INDEX && "Property index is out of bounds" );
- // Default Properties
- GetDefaultPropertyIndices( indices );
+ Property::Value value;
- // Manual Properties
- const TypeInfo* typeInfo( GetTypeInfo() );
- if ( typeInfo )
+ if ( index < DEFAULT_PROPERTY_MAX_COUNT )
{
- typeInfo->GetPropertyIndices( indices );
+ value = GetDefaultPropertyCurrentValue( index );
}
-
- // Custom Properties
- if ( mCustomProperties.Count() > 0 )
+ else if ( ( index >= PROPERTY_REGISTRATION_START_INDEX ) && ( index <= PROPERTY_REGISTRATION_MAX_INDEX ) )
{
- indices.reserve( indices.size() + mCustomProperties.Count() );
-
- CustomPropertyLookup::ConstIterator iter = mCustomProperties.Begin();
- const CustomPropertyLookup::ConstIterator endIter = mCustomProperties.End();
- int i=0;
- for ( ; iter != endIter; ++iter, ++i )
+ const TypeInfo* typeInfo( GetTypeInfo() );
+ if ( typeInfo )
{
- indices.push_back( PROPERTY_CUSTOM_START_INDEX + i );
+ value = typeInfo->GetProperty( this, index );
}
- }
-}
-
-Property::Index Object::RegisterProperty( const std::string& name, const Property::Value& propertyValue)
-{
- // Create a new property
- Dali::Internal::OwnerPointer<PropertyBase> newProperty;
-
- switch ( propertyValue.GetType() )
- {
- case Property::BOOLEAN:
- {
- newProperty = new AnimatableProperty<bool>( propertyValue.Get<bool>() );
- break;
- }
-
- case Property::FLOAT:
+ else
{
- newProperty = new AnimatableProperty<float>( propertyValue.Get<float>() );
- break;
+ DALI_LOG_ERROR( "Property index %d not found\n", index );
}
-
- case Property::INTEGER:
+ }
+ else if ( ( index >= ANIMATABLE_PROPERTY_REGISTRATION_START_INDEX ) && ( index <= ANIMATABLE_PROPERTY_REGISTRATION_MAX_INDEX ) )
+ {
+ // check whether the animatable property is registered already, if not then register one.
+ // this is needed because property value may have been set as full property and get as a property component
+ AnimatablePropertyMetadata* animatableProperty = GetSceneAnimatableProperty( index, nullptr );
+ if( animatableProperty )
{
- newProperty = new AnimatableProperty<int>( propertyValue.Get<int>() );
- break;
+ // get the animatable property value
+ value = GetCurrentPropertyValue( *animatableProperty );
}
-
- case Property::VECTOR2:
+ else
{
- newProperty = new AnimatableProperty<Vector2>( propertyValue.Get<Vector2>() );
- break;
+ DALI_LOG_ERROR( "Property index %d not found\n", index );
}
-
- case Property::VECTOR3:
+ }
+ else if(mCustomProperties.Count() > 0)
+ {
+ CustomPropertyMetadata* custom = FindCustomProperty( index );
+ if(custom)
{
- newProperty = new AnimatableProperty<Vector3>( propertyValue.Get<Vector3>() );
- break;
+ // get the custom property value
+ value = GetCurrentPropertyValue( *custom );
}
-
- case Property::VECTOR4:
+ else
{
- newProperty = new AnimatableProperty<Vector4>( propertyValue.Get<Vector4>() );
- break;
+ DALI_LOG_ERROR( "Property index %d not found\n", index );
}
+ } // if custom
- case Property::MATRIX:
- {
- newProperty = new AnimatableProperty<Matrix>( propertyValue.Get<Matrix>() );
- break;
- }
+ return value;
+}
- case Property::MATRIX3:
- {
- newProperty = new AnimatableProperty<Matrix3>( propertyValue.Get<Matrix3>() );
- break;
- }
+void Object::GetPropertyIndices( Property::IndexContainer& indices ) const
+{
+ indices.Clear();
- case Property::ROTATION:
- {
- newProperty = new AnimatableProperty<Quaternion>( propertyValue.Get<Quaternion>() );
- break;
- }
+ // Manual Properties
+ const TypeInfo* typeInfo( GetTypeInfo() );
+ if ( typeInfo )
+ {
+ typeInfo->GetPropertyIndices( indices );
+ }
- case Property::UNSIGNED_INTEGER:
- case Property::RECTANGLE:
- case Property::STRING:
- case Property::ARRAY:
- case Property::MAP:
- {
- DALI_LOG_WARNING( "Property Type %d\n", propertyValue.GetType() );
- DALI_ASSERT_ALWAYS( !"PropertyType is not animatable" );
- break;
- }
+ // Custom Properties
+ if ( mCustomProperties.Count() > 0 )
+ {
+ indices.Reserve( indices.Size() + mCustomProperties.Count() );
- default:
+ auto iter = mCustomProperties.Begin();
+ const auto endIter = mCustomProperties.End();
+ int32_t i = 0;
+ for ( ; iter != endIter; ++iter, ++i )
{
- DALI_LOG_WARNING( "Property Type %d\n", propertyValue.GetType() );
- DALI_ASSERT_ALWAYS( !"PropertyType enumeration is out of bounds" );
- break;
+ CustomPropertyMetadata* custom = static_cast<CustomPropertyMetadata*>( *iter );
+ if ( custom->childPropertyIndex != Property::INVALID_INDEX )
+ {
+ // If it is a child property, add the child property index
+ indices.PushBack( custom->childPropertyIndex );
+ }
+ else
+ {
+ indices.PushBack( PROPERTY_CUSTOM_START_INDEX + i );
+ }
}
}
+}
- // get the scene property owner from derived class
- const SceneGraph::PropertyOwner* scenePropertyOwner = GetPropertyOwner();
- Property::Index index = PROPERTY_CUSTOM_START_INDEX + mCustomProperties.Count();
- // we can only pass properties to scene graph side if there is a scene object
- if( scenePropertyOwner )
- {
- // keep a local pointer to the property as the OwnerPointer will pass its copy to the message
- const PropertyBase* property = newProperty.Get();
- mCustomProperties.PushBack( new CustomProperty( name, propertyValue.GetType(), property ) );
-
- // queue a message to add the property
- InstallCustomPropertyMessage( GetEventThreadServices(), *scenePropertyOwner, newProperty.Release() ); // Message takes ownership
+Property::Index Object::RegisterProperty( const std::string& name, const Property::Value& propertyValue )
+{
+ return RegisterProperty( name, Property::INVALID_KEY, propertyValue, Property::ANIMATABLE );
+}
- // notify the derived class (optional) method in case it needs to do some more work on the new property
- // note! have to use the local pointer as OwnerPointer now points to NULL as it handed over its ownership
- NotifyScenePropertyInstalled( *property, name, index );
- }
- else
- {
- // property was orphaned and killed so return invalid index
- index = Property::INVALID_INDEX;
- }
+Property::Index Object::RegisterProperty( const std::string& name, Property::Index key, const Property::Value& propertyValue )
+{
+ return RegisterProperty( name, key, propertyValue, Property::ANIMATABLE );
+}
- return index;
+Property::Index Object::RegisterProperty( const std::string& name, const Property::Value& propertyValue, Property::AccessMode accessMode )
+{
+ return RegisterProperty( name, Property::INVALID_KEY, propertyValue, accessMode );
}
-Property::Index Object::RegisterProperty( const std::string& name, const Property::Value& propertyValue, Property::AccessMode accessMode)
+Property::Index Object::RegisterProperty( const std::string& name, Property::Index key, const Property::Value& propertyValue, Property::AccessMode accessMode )
{
+ // If property with the required key already exists, then just set it.
Property::Index index = Property::INVALID_INDEX;
+ if( key != Property::INVALID_KEY ) // Try integer key first if it's valid
+ {
+ index = GetPropertyIndex( key );
+ }
+ if( index == Property::INVALID_INDEX ) // If it wasn't valid, or doesn't exist, try name
+ {
+ index = GetPropertyIndex( name );
+ }
- if(Property::ANIMATABLE == accessMode)
+ if( index != Property::INVALID_INDEX ) // If there was a valid index found by either key, set it.
{
- index = RegisterProperty(name, propertyValue);
+ SetProperty( index, propertyValue );
}
else
{
- // Add entry to the property lookup
- index = PROPERTY_CUSTOM_START_INDEX + mCustomProperties.Count();
- mCustomProperties.PushBack( new CustomProperty( name, propertyValue, accessMode ) );
+ // Otherwise register the property
+
+ if( Property::ANIMATABLE == accessMode )
+ {
+ index = RegisterSceneGraphProperty( name, key, PROPERTY_CUSTOM_START_INDEX + static_cast<Property::Index>( mCustomProperties.Count() ), propertyValue );
+ AddUniformMapping( index, name );
+ }
+ else
+ {
+ // Add entry to the property lookup
+ index = PROPERTY_CUSTOM_START_INDEX + static_cast<Property::Index>( mCustomProperties.Count() );
+
+ CustomPropertyMetadata* customProperty = new CustomPropertyMetadata( name, propertyValue, accessMode );
+
+ // Resolve index for the child property
+ Object* parent = GetParentObject();
+ if( parent )
+ {
+ const TypeInfo* parentTypeInfo( parent->GetTypeInfo() );
+ if( parentTypeInfo )
+ {
+ Property::Index childPropertyIndex = parentTypeInfo->GetChildPropertyIndex( name );
+ if( childPropertyIndex != Property::INVALID_INDEX )
+ {
+ customProperty->childPropertyIndex = childPropertyIndex;
+ index = childPropertyIndex;
+ }
+ }
+ }
+
+ mCustomProperties.PushBack( customProperty );
+ }
}
return index;
}
-Dali::PropertyNotification Object::AddPropertyNotification(Property::Index index,
- int componentIndex,
- const Dali::PropertyCondition& condition)
+bool Object::DoesCustomPropertyExist( Property::Index index )
+{
+ auto metadata = FindCustomProperty( index );
+ return metadata != nullptr;
+}
+
+Dali::PropertyNotification Object::AddPropertyNotification( Property::Index index,
+ int32_t componentIndex,
+ const Dali::PropertyCondition& condition)
{
if ( index >= DEFAULT_PROPERTY_MAX_COUNT )
{
if ( index <= PROPERTY_REGISTRATION_MAX_INDEX )
{
- DALI_ASSERT_ALWAYS( false && "Property notification added to event side only property." );
+ DALI_ABORT( "Property notification added to event side only property." );
+ }
+ else if ( ( index >= ANIMATABLE_PROPERTY_REGISTRATION_START_INDEX ) && ( index <= ANIMATABLE_PROPERTY_REGISTRATION_MAX_INDEX ) )
+ {
+ // check whether the animatable property is registered already, if not then register one.
+ AnimatablePropertyMetadata* animatable = GetSceneAnimatableProperty( index, nullptr );
+ DALI_ASSERT_ALWAYS( animatable && "Property index is invalid" );
}
else if ( mCustomProperties.Count() > 0 )
{
- CustomProperty* custom = FindCustomProperty( index );
+ CustomPropertyMetadata* custom = FindCustomProperty( index );
DALI_ASSERT_ALWAYS( custom && "Invalid property index" );
DALI_ASSERT_ALWAYS( custom->IsAnimatable() && "Property notification added to event side only property." );
}
{
if( mPropertyNotifications )
{
- PropertyNotificationContainerIter iter = mPropertyNotifications->begin();
+ auto iter = mPropertyNotifications->begin();
while(iter != mPropertyNotifications->end() )
{
if(*iter == propertyNotification)
{
if( mPropertyNotifications )
{
- PropertyNotificationContainerIter iter = mPropertyNotifications->begin();
+ auto iter = mPropertyNotifications->begin();
while(iter != mPropertyNotifications->end() )
{
// As we can't ensure all references are removed, we can just disable
}
}
-void Object::EnablePropertyNotifications()
+void Object::NotifyPropertyAnimation( Animation& animation, Property::Index index, const Property::Value& value, Animation::Type animationType )
{
- if( mPropertyNotifications )
+ if ( index < DEFAULT_PROPERTY_MAX_COUNT )
+ {
+ OnNotifyDefaultPropertyAnimation( animation, index, value, animationType );
+ }
+ else
{
- PropertyNotificationContainerIter iter = mPropertyNotifications->begin();
- PropertyNotificationContainerIter endIter = mPropertyNotifications->end();
+ PropertyMetadata* propertyMetadata = NULL;
+ if( ( index >= ANIMATABLE_PROPERTY_REGISTRATION_START_INDEX ) && ( index <= ANIMATABLE_PROPERTY_REGISTRATION_MAX_INDEX ) )
+ {
+ propertyMetadata = FindAnimatableProperty( index );
+ }
+ else
+ {
+ CustomPropertyMetadata* custom = FindCustomProperty( index );
+ if( custom && custom->IsAnimatable() )
+ {
+ propertyMetadata = custom;
+ }
+ }
- for( ; iter != endIter; ++iter )
+ if( propertyMetadata )
{
- GetImplementation(*iter).Enable();
+ switch( animationType )
+ {
+ case Animation::TO:
+ case Animation::BETWEEN:
+ {
+ // Update the cached property value
+ propertyMetadata->SetPropertyValue( value );
+ break;
+ }
+ case Animation::BY:
+ {
+ // Adjust the cached property value
+ propertyMetadata->AdjustPropertyValueBy( value );
+ break;
+ }
+ }
}
}
}
-void Object::DisablePropertyNotifications()
+void Object::AddUniformMapping( Property::Index propertyIndex, const std::string& uniformName ) const
{
- if( mPropertyNotifications )
+ // Get the address of the property if it's a scene property
+ const PropertyInputImpl* propertyPtr = GetSceneObjectInputProperty( propertyIndex );
+
+ // Check instead for newly registered properties
+ if( propertyPtr == NULL )
{
- PropertyNotificationContainerIter iter = mPropertyNotifications->begin();
- PropertyNotificationContainerIter endIter = mPropertyNotifications->end();
+ PropertyMetadata* animatable = FindAnimatableProperty( propertyIndex );
+ if( animatable != NULL )
+ {
+ propertyPtr = animatable->GetSceneGraphProperty();
+ }
+ }
- for( ; iter != endIter; ++iter )
+ if( propertyPtr == NULL )
+ {
+ PropertyMetadata* custom = FindCustomProperty( propertyIndex );
+ if( custom != NULL )
{
- GetImplementation(*iter).Disable();
+ propertyPtr = custom->GetSceneGraphProperty();
+ }
+ }
+
+ if( propertyPtr != NULL )
+ {
+ const SceneGraph::PropertyOwner* sceneObject = GetPropertyOwner();
+
+ if( sceneObject != NULL )
+ {
+ OwnerPointer< SceneGraph::UniformPropertyMapping > map = new SceneGraph::UniformPropertyMapping( uniformName, propertyPtr );
+ // Message takes ownership of Uniform map (and will delete it after copy)
+ AddUniformMapMessage( const_cast<EventThreadServices&>(GetEventThreadServices()), *sceneObject, map );
+ }
+ else
+ {
+ DALI_ASSERT_ALWAYS(0 && "MESH_REWORK - Need to store property whilst off-stage" );
}
}
}
-Dali::ActiveConstraint Object::ApplyConstraint( Constraint& constraint )
+void Object::RemoveUniformMapping( const std::string& uniformName )
{
- return Dali::ActiveConstraint( DoApplyConstraint( constraint, Dali::Handle() ) );
+ const SceneGraph::PropertyOwner* sceneObject = GetSceneObject();
+ RemoveUniformMapMessage( GetEventThreadServices(), *sceneObject, uniformName);
}
-Dali::ActiveConstraint Object::ApplyConstraint( Constraint& constraint, Dali::Handle weightObject )
+void Object::ApplyConstraint( ConstraintBase& constraint )
{
- return Dali::ActiveConstraint( DoApplyConstraint( constraint, weightObject ) );
+ if( !mConstraints )
+ {
+ mConstraints = new ConstraintContainer;
+ }
+ mConstraints->push_back( Dali::Constraint( &constraint ) );
}
-ActiveConstraintBase* Object::DoApplyConstraint( Constraint& constraint, Dali::Handle weightObject )
+void Object::RemoveConstraint( ConstraintBase& constraint )
{
- ActiveConstraintBase* activeConstraintImpl = constraint.CreateActiveConstraint();
- DALI_ASSERT_DEBUG( NULL != activeConstraintImpl );
-
- Dali::ActiveConstraint activeConstraint( activeConstraintImpl );
-
- if( weightObject )
+ // NULL if the Constraint sources are destroyed before Constraint::Apply()
+ if( mConstraints )
{
- Object& weightObjectImpl = GetImplementation( weightObject );
- Property::Index weightIndex = weightObjectImpl.GetPropertyIndex( "weight" );
-
- if( Property::INVALID_INDEX != weightIndex )
+ ConstraintIter it( std::find( mConstraints->begin(), mConstraints->end(), Dali::Constraint( &constraint ) ) );
+ if( it != mConstraints->end() )
{
- activeConstraintImpl->SetCustomWeightObject( weightObjectImpl, weightIndex );
+ mConstraints->erase( it );
}
}
+}
- if( !mConstraints )
+void Object::RemoveConstraints()
+{
+ // guard against constraint sending messages during core destruction
+ if( mConstraints && Stage::IsInstalled() )
{
- mConstraints = new ActiveConstraintContainer;
- }
- mConstraints->push_back( activeConstraint );
-
- activeConstraintImpl->FirstApply( *this, constraint.GetApplyTime() );
+ // If we have nothing in the scene-graph, just clear constraint containers
+ const SceneGraph::PropertyOwner* propertyOwner = GetSceneObject();
+ if ( NULL != propertyOwner )
+ {
+ const auto endIter = mConstraints->end();
+ for ( auto iter = mConstraints->begin(); endIter != iter; ++iter )
+ {
+ GetImplementation( *iter ).RemoveInternal();
+ }
+ }
- return activeConstraintImpl;
+ delete mConstraints;
+ mConstraints = NULL;
+ }
}
-void Object::SetSceneGraphProperty( Property::Index index, const CustomProperty& entry, const Property::Value& value )
+void Object::RemoveConstraints( uint32_t tag )
{
- switch ( entry.type )
+ // guard against constraint sending messages during core destruction
+ if( mConstraints && Stage::IsInstalled() )
{
- case Property::BOOLEAN:
+ auto iter( mConstraints->begin() );
+ while(iter != mConstraints->end() )
{
- const AnimatableProperty<bool>* property = dynamic_cast< const AnimatableProperty<bool>* >( entry.GetSceneGraphProperty() );
- DALI_ASSERT_DEBUG( NULL != property );
-
- // property is being used in a separate thread; queue a message to set the property
- BakeMessage<bool>( GetEventThreadServices(), *property, value.Get<bool>() );
- break;
+ ConstraintBase& constraint = GetImplementation( *iter );
+ if( constraint.GetTag() == tag )
+ {
+ GetImplementation( *iter ).RemoveInternal();
+ iter = mConstraints->erase( iter );
+ }
+ else
+ {
+ ++iter;
+ }
}
- case Property::FLOAT:
+ if ( mConstraints->empty() )
{
- const AnimatableProperty<float>* property = dynamic_cast< const AnimatableProperty<float>* >( entry.GetSceneGraphProperty() );
- DALI_ASSERT_DEBUG( NULL != property );
-
- // property is being used in a separate thread; queue a message to set the property
- BakeMessage<float>( GetEventThreadServices(), *property, value.Get<float>() );
- break;
+ delete mConstraints;
+ mConstraints = NULL;
}
+ }
+}
- case Property::INTEGER:
- {
- const AnimatableProperty<int>* property = dynamic_cast< const AnimatableProperty<int>* >( entry.GetSceneGraphProperty() );
- DALI_ASSERT_DEBUG( NULL != property );
-
- // property is being used in a separate thread; queue a message to set the property
- BakeMessage<int>( GetEventThreadServices(), *property, value.Get<int>() );
- break;
- }
+void Object::SetTypeInfo( const TypeInfo* typeInfo )
+{
+ mTypeInfo = typeInfo;
+}
- case Property::VECTOR2:
- {
- const AnimatableProperty<Vector2>* property = dynamic_cast< const AnimatableProperty<Vector2>* >( entry.GetSceneGraphProperty() );
- DALI_ASSERT_DEBUG( NULL != property );
+int32_t Object::GetPropertyComponentIndex( Property::Index index ) const
+{
+ int32_t componentIndex = Property::INVALID_COMPONENT_INDEX;
- // property is being used in a separate thread; queue a message to set the property
- BakeMessage<Vector2>( GetEventThreadServices(), *property, value.Get<Vector2>() );
- break;
- }
+ const TypeInfo* typeInfo( GetTypeInfo() );
+ if ( typeInfo )
+ {
+ componentIndex = typeInfo->GetComponentIndex(index);
+ }
- case Property::VECTOR3:
- {
- const AnimatableProperty<Vector3>* property = dynamic_cast< const AnimatableProperty<Vector3>* >( entry.GetSceneGraphProperty() );
- DALI_ASSERT_DEBUG( NULL != property );
+ return componentIndex;
+}
- // property is being used in a separate thread; queue a message to set the property
- BakeMessage<Vector3>( GetEventThreadServices(), *property, value.Get<Vector3>() );
- break;
- }
+DevelHandle::PropertySetSignalType& Object::PropertySetSignal()
+{
+ return mPropertySetSignal;
+}
- case Property::VECTOR4:
- {
- const AnimatableProperty<Vector4>* property = dynamic_cast< const AnimatableProperty<Vector4>* >( entry.GetSceneGraphProperty() );
- DALI_ASSERT_DEBUG( NULL != property );
+Object::~Object()
+{
+ // Notification for observers
+ for( auto iter = mObservers.Begin(), endIter = mObservers.End(); iter != endIter; ++iter)
+ {
+ (*iter)->ObjectDestroyed(*this);
+ }
- // property is being used in a separate thread; queue a message to set the property
- BakeMessage<Vector4>( GetEventThreadServices(), *property, value.Get<Vector4>() );
+ delete mConstraints;
+ delete mPropertyNotifications;
+}
+
+void Object::OnSceneObjectAdd()
+{
+ // Notification for observers
+ for( auto iter = mObservers.Begin(), endIter = mObservers.End(); iter != endIter; ++iter)
+ {
+ (*iter)->SceneObjectAdded(*this);
+ }
+
+ // enable property notifications in scene graph
+ EnablePropertyNotifications();
+}
+
+void Object::OnSceneObjectRemove()
+{
+ // Notification for observers
+ for( auto iter = mObservers.Begin(), endIter = mObservers.End(); iter != endIter; ++iter )
+ {
+ (*iter)->SceneObjectRemoved(*this);
+ }
+
+ // disable property notifications in scene graph
+ DisablePropertyNotifications();
+}
+
+const TypeInfo* Object::GetTypeInfo() const
+{
+ if ( !mTypeInfo )
+ {
+ // This uses a dynamic_cast so can be quite expensive so we only really want to do it once
+ // especially as the type-info does not change during the life-time of an application
+
+ TypeRegistry::TypeInfoPointer typeInfoHandle = TypeRegistry::Get()->GetTypeInfo( this );
+ if ( typeInfoHandle )
+ {
+ mTypeInfo = typeInfoHandle.Get(); // just a raw pointer to use, ownership is kept
+ }
+ }
+
+ return mTypeInfo;
+}
+
+CustomPropertyMetadata* Object::FindCustomProperty( Property::Index index ) const
+{
+ CustomPropertyMetadata* property( NULL );
+ if ( ( index >= CHILD_PROPERTY_REGISTRATION_START_INDEX ) && ( index <= CHILD_PROPERTY_REGISTRATION_MAX_INDEX ) )
+ {
+ for ( std::size_t arrayIndex = 0; arrayIndex < mCustomProperties.Count(); arrayIndex++ )
+ {
+ CustomPropertyMetadata* custom = static_cast<CustomPropertyMetadata*>( mCustomProperties[ arrayIndex ] );
+ if( custom->childPropertyIndex == index )
+ {
+ property = custom;
+ }
+ }
+ }
+ else
+ {
+ int arrayIndex = index - PROPERTY_CUSTOM_START_INDEX;
+ if( arrayIndex >= 0 )
+ {
+ if( arrayIndex < static_cast<int>( mCustomProperties.Count() ) ) // we can only access the first 2 billion custom properties
+ {
+ property = static_cast<CustomPropertyMetadata*>(mCustomProperties[ arrayIndex ]);
+ }
+ }
+ }
+ return property;
+}
+
+AnimatablePropertyMetadata* Object::FindAnimatableProperty( Property::Index index ) const
+{
+ for( auto&& entry : mAnimatableProperties )
+ {
+ AnimatablePropertyMetadata* property = static_cast<AnimatablePropertyMetadata*>( entry );
+ if( property->index == index )
+ {
+ return property;
+ }
+ }
+ return NULL;
+}
+
+Property::Index Object::RegisterSceneGraphProperty(const std::string& name, Property::Index key, Property::Index index, const Property::Value& propertyValue) const
+{
+ // Create a new property
+ Dali::Internal::OwnerPointer<PropertyBase> newProperty;
+
+ switch ( propertyValue.GetType() )
+ {
+ case Property::BOOLEAN:
+ {
+ newProperty = new AnimatableProperty<bool>( propertyValue.Get<bool>() );
break;
}
- case Property::ROTATION:
+ case Property::INTEGER:
{
- const AnimatableProperty<Quaternion>* property = dynamic_cast< const AnimatableProperty<Quaternion>* >( entry.GetSceneGraphProperty() );
- DALI_ASSERT_DEBUG( NULL != property );
+ newProperty = new AnimatableProperty<int>( propertyValue.Get<int>() );
+ break;
+ }
- // property is being used in a separate thread; queue a message to set the property
- BakeMessage<Quaternion>( GetEventThreadServices(), *property, value.Get<Quaternion>() );
+ case Property::FLOAT:
+ {
+ newProperty = new AnimatableProperty<float>( propertyValue.Get<float>() );
break;
}
- case Property::MATRIX:
+ case Property::VECTOR2:
{
- const AnimatableProperty<Matrix>* property = dynamic_cast< const AnimatableProperty<Matrix>* >( entry.GetSceneGraphProperty() );
- DALI_ASSERT_DEBUG( NULL != property );
+ newProperty = new AnimatableProperty<Vector2>( propertyValue.Get<Vector2>() );
+ break;
+ }
- // property is being used in a separate thread; queue a message to set the property
- BakeMessage<Matrix>( GetEventThreadServices(), *property, value.Get<Matrix>() );
+ case Property::VECTOR3:
+ {
+ newProperty = new AnimatableProperty<Vector3>( propertyValue.Get<Vector3>() );
+ break;
+ }
+
+ case Property::VECTOR4:
+ {
+ newProperty = new AnimatableProperty<Vector4>( propertyValue.Get<Vector4>() );
+ break;
+ }
+
+ case Property::MATRIX:
+ {
+ newProperty = new AnimatableProperty<Matrix>( propertyValue.Get<Matrix>() );
break;
}
case Property::MATRIX3:
{
- const AnimatableProperty<Matrix3>* property = dynamic_cast< const AnimatableProperty<Matrix3>* >( entry.GetSceneGraphProperty() );
- DALI_ASSERT_DEBUG( NULL != property );
+ newProperty = new AnimatableProperty<Matrix3>( propertyValue.Get<Matrix3>() );
+ break;
+ }
- // property is being used in a separate thread; queue a message to set the property
- BakeMessage<Matrix3>( GetEventThreadServices(), *property, value.Get<Matrix3>() );
+ case Property::ROTATION:
+ {
+ newProperty = new AnimatableProperty<Quaternion>( propertyValue.Get<Quaternion>() );
break;
}
- default:
+ case Property::RECTANGLE:
+ case Property::STRING:
+ case Property::ARRAY:
+ case Property::MAP:
+ case Property::EXTENTS:
+ case Property::NONE:
{
- // non-animatable scene graph property, do nothing
+ DALI_ASSERT_ALWAYS( !"PropertyType is not animatable" );
+ break;
}
}
-}
-const TypeInfo* Object::GetTypeInfo() const
-{
- if ( !mTypeInfo )
+ // get the scene property owner from derived class
+ const SceneGraph::PropertyOwner* scenePropertyOwner = GetPropertyOwner();
+ // we can only pass properties to scene graph side if there is a scene object
+ if( scenePropertyOwner )
{
- // This uses a dynamic_cast so can be quite expensive so we only really want to do it once
- // especially as the type-info does not change during the life-time of an application
+ // keep a local pointer to the property as the OwnerPointer will pass its copy to the message
+ const PropertyBase* property = newProperty.Get();
+ if(index >= PROPERTY_CUSTOM_START_INDEX)
+ {
+ DALI_ASSERT_ALWAYS( index <= PROPERTY_CUSTOM_MAX_INDEX && "Too many custom properties have been registered" );
- Dali::TypeInfo typeInfoHandle = TypeRegistry::Get()->GetTypeInfo( this );
- if ( typeInfoHandle )
+ mCustomProperties.PushBack( new CustomPropertyMetadata( name, key, propertyValue, property ) );
+ }
+ else
{
- mTypeInfo = &GetImplementation( typeInfoHandle );
+ mAnimatableProperties.PushBack( new AnimatablePropertyMetadata( index, propertyValue, property ) );
}
- }
- return mTypeInfo;
-}
+ // queue a message to add the property
+ InstallCustomPropertyMessage( const_cast<EventThreadServices&>(GetEventThreadServices()), *scenePropertyOwner, newProperty ); // Message takes ownership
-void Object::RemoveConstraint( ActiveConstraint& constraint, bool isInScenegraph )
-{
- // guard against constraint sending messages during core destruction
- if ( Stage::IsInstalled() )
+ return index;
+ }
+ else
{
- if( isInScenegraph )
- {
- ActiveConstraintBase& baseConstraint = GetImplementation( constraint );
- baseConstraint.BeginRemove();
- }
+ // property was orphaned and killed so return invalid index
+ return Property::INVALID_INDEX;
}
}
-void Object::RemoveConstraint( Dali::ActiveConstraint activeConstraint )
+void Object::RegisterAnimatableProperty( const TypeInfo& typeInfo,
+ Property::Index index,
+ const Property::Value* value ) const
{
- // guard against constraint sending messages during core destruction
- if( mConstraints && Stage::IsInstalled() )
+ // If the property is not a component of a base property, register the whole property itself.
+ const std::string& propertyName = typeInfo.GetPropertyName( index );
+ Property::Value initialValue;
+ if( value )
{
- bool isInSceneGraph( NULL != GetSceneObject() );
-
- ActiveConstraintIter it( std::find( mConstraints->begin(), mConstraints->end(), activeConstraint ) );
- if( it != mConstraints->end() )
- {
- RemoveConstraint( *it, isInSceneGraph );
- mConstraints->erase( it );
- }
+ initialValue = *value;
}
+ else
+ {
+ initialValue = typeInfo.GetPropertyDefaultValue( index );
+ }
+ RegisterSceneGraphProperty( propertyName, Property::INVALID_KEY, index, initialValue );
+ AddUniformMapping( index, propertyName );
}
-void Object::RemoveConstraints( unsigned int tag )
+AnimatablePropertyMetadata* Object::GetSceneAnimatableProperty( Property::Index index, const Property::Value* value ) const
{
- // guard against constraint sending messages during core destruction
- if( mConstraints && Stage::IsInstalled() )
+ // property range already checked by calling methods
+ // check whether the animatable property is registered already, if not then register one.
+ AnimatablePropertyMetadata* animatableProperty = FindAnimatableProperty( index );
+ if( !animatableProperty )
{
- bool isInSceneGraph( NULL != GetSceneObject() );
-
- ActiveConstraintIter iter( mConstraints->begin() );
- while(iter != mConstraints->end() )
+ const TypeInfo* typeInfo( GetTypeInfo() );
+ if( typeInfo )
{
- ActiveConstraintBase& constraint = GetImplementation( *iter );
- if( constraint.GetTag() == tag )
+ Property::Index basePropertyIndex = typeInfo->GetBasePropertyIndex( index );
+ if( basePropertyIndex == Property::INVALID_INDEX )
{
- RemoveConstraint( *iter, isInSceneGraph );
- iter = mConstraints->erase( iter );
+ // If the property is not a component of a base property, register the whole property itself.
+ RegisterAnimatableProperty( *typeInfo, index, value );
}
else
{
- ++iter;
+ // Since the property is a component of a base property, check whether the base property is registered.
+ animatableProperty = FindAnimatableProperty( basePropertyIndex );
+ if( !animatableProperty )
+ {
+ // If the base property is not registered yet, register the base property first.
+ RegisterAnimatableProperty( *typeInfo, basePropertyIndex, value );
+ animatableProperty = static_cast<AnimatablePropertyMetadata*>(mAnimatableProperties[mAnimatableProperties.Size()-1]);
+ }
+
+ // Create the metadata for the property component.
+ mAnimatableProperties.PushBack( new AnimatablePropertyMetadata( index, typeInfo->GetComponentIndex(index), animatableProperty->value, animatableProperty->GetSceneGraphProperty() ) );
}
+
+ // The metadata has just been added and therefore should be in the end of the vector.
+ animatableProperty = static_cast<AnimatablePropertyMetadata*>(mAnimatableProperties[mAnimatableProperties.Size()-1]);
}
}
+
+ return animatableProperty;
}
-void Object::RemoveConstraints()
+void Object::ResolveChildProperties()
{
- // guard against constraint sending messages during core destruction
- if( mConstraints && Stage::IsInstalled() )
+ // Resolve index for the child property
+ Object* parent = GetParentObject();
+ if( parent )
{
- // If we have nothing in the scene-graph, just clear constraint containers
- const SceneGraph::PropertyOwner* propertyOwner = GetSceneObject();
- if ( NULL != propertyOwner )
+ const TypeInfo* parentTypeInfo( parent->GetTypeInfo() );
+ if( parentTypeInfo )
{
- const ActiveConstraintConstIter endIter = mConstraints->end();
- for ( ActiveConstraintIter iter = mConstraints->begin(); endIter != iter; ++iter )
+ // Go through each custom property
+ for( auto&& entry : mCustomProperties )
{
- RemoveConstraint( *iter, true );
+ CustomPropertyMetadata* customProperty = static_cast<CustomPropertyMetadata*>( entry );
+
+ if( customProperty->name.empty() )
+ {
+ if( customProperty->childPropertyIndex != Property::INVALID_INDEX )
+ {
+ // Resolve name for any child property with no name
+ customProperty->name = parentTypeInfo->GetChildPropertyName( customProperty->childPropertyIndex );
+ }
+ }
+ else
+ {
+ Property::Index childPropertyIndex = parentTypeInfo->GetChildPropertyIndex( customProperty->name );
+ if( childPropertyIndex != Property::INVALID_INDEX )
+ {
+ // Resolve index for any property with a name that matches the parent's child property name
+ customProperty->childPropertyIndex = childPropertyIndex;
+ }
+ }
}
}
-
- delete mConstraints;
- mConstraints = NULL;
}
}
-void Object::SetTypeInfo( const TypeInfo* typeInfo )
+void Object::EnablePropertyNotifications()
{
- mTypeInfo = typeInfo;
+ if( mPropertyNotifications )
+ {
+ for( auto&& element : *mPropertyNotifications )
+ {
+ GetImplementation( element ).Enable();
+ }
+ }
}
-Object::~Object()
+void Object::DisablePropertyNotifications()
{
- // Notification for this object's constraints
- // (note that the ActiveConstraint handles may outlive the Object)
- if( mConstraints )
+ if( mPropertyNotifications )
{
- const ActiveConstraintConstIter endIter = mConstraints->end();
- for ( ActiveConstraintIter iter = mConstraints->begin(); endIter != iter; ++iter )
+ for( auto&& element : *mPropertyNotifications )
{
- ActiveConstraintBase& baseConstraint = GetImplementation( *iter );
- baseConstraint.OnParentDestroyed();
+ GetImplementation( element ).Disable();
}
}
+}
- // Notification for observers
- for( ConstObserverIter iter = mObservers.Begin(), endIter = mObservers.End(); iter != endIter; ++iter)
+Property::Value Object::GetCurrentPropertyValue( const PropertyMetadata& entry ) const
+{
+ Property::Value value;
+
+ if( !entry.IsAnimatable() )
{
- (*iter)->ObjectDestroyed(*this);
+ value = entry.GetPropertyValue();
}
+ else
+ {
+ BufferIndex bufferIndex( GetEventThreadServices().GetEventBufferIndex() );
- delete mConstraints;
- delete mPropertyNotifications;
+ switch ( entry.GetType() )
+ {
+ case Property::BOOLEAN:
+ {
+ const AnimatableProperty<bool>* property = static_cast< const AnimatableProperty<bool>* >( entry.GetSceneGraphProperty() );
+ DALI_ASSERT_DEBUG( NULL != property );
+
+ value = (*property)[ bufferIndex ];
+ break;
+ }
+
+ case Property::INTEGER:
+ {
+ const AnimatableProperty<int>* property = static_cast< const AnimatableProperty<int>* >( entry.GetSceneGraphProperty() );
+ DALI_ASSERT_DEBUG( NULL != property );
+
+ value = (*property)[ bufferIndex ];
+ break;
+ }
+
+ case Property::FLOAT:
+ {
+ const AnimatableProperty<float>* property = static_cast< const AnimatableProperty<float>* >( entry.GetSceneGraphProperty() );
+ DALI_ASSERT_DEBUG( NULL != property );
+
+ value = (*property)[ bufferIndex ];
+ break;
+ }
+
+ case Property::VECTOR2:
+ {
+ const AnimatableProperty<Vector2>* property = static_cast< const AnimatableProperty<Vector2>* >( entry.GetSceneGraphProperty() );
+ DALI_ASSERT_DEBUG( NULL != property );
+
+ if(entry.componentIndex == 0)
+ {
+ value = (*property)[ bufferIndex ].x;
+ }
+ else if(entry.componentIndex == 1)
+ {
+ value = (*property)[ bufferIndex ].y;
+ }
+ else
+ {
+ value = (*property)[ bufferIndex ];
+ }
+ break;
+ }
+
+ case Property::VECTOR3:
+ {
+ const AnimatableProperty<Vector3>* property = static_cast< const AnimatableProperty<Vector3>* >( entry.GetSceneGraphProperty() );
+ DALI_ASSERT_DEBUG( NULL != property );
+
+ if(entry.componentIndex == 0)
+ {
+ value = (*property)[ bufferIndex ].x;
+ }
+ else if(entry.componentIndex == 1)
+ {
+ value = (*property)[ bufferIndex ].y;
+ }
+ else if(entry.componentIndex == 2)
+ {
+ value = (*property)[ bufferIndex ].z;
+ }
+ else
+ {
+ value = (*property)[ bufferIndex ];
+ }
+ break;
+ }
+
+ case Property::VECTOR4:
+ {
+ const AnimatableProperty<Vector4>* property = static_cast< const AnimatableProperty<Vector4>* >( entry.GetSceneGraphProperty() );
+ DALI_ASSERT_DEBUG( NULL != property );
+
+ if(entry.componentIndex == 0)
+ {
+ value = (*property)[ bufferIndex ].x;
+ }
+ else if(entry.componentIndex == 1)
+ {
+ value = (*property)[ bufferIndex ].y;
+ }
+ else if(entry.componentIndex == 2)
+ {
+ value = (*property)[ bufferIndex ].z;
+ }
+ else if(entry.componentIndex == 3)
+ {
+ value = (*property)[ bufferIndex ].w;
+ }
+ else
+ {
+ value = (*property)[ bufferIndex ];
+ }
+ break;
+ }
+
+ case Property::MATRIX:
+ {
+ const AnimatableProperty<Matrix>* property = static_cast< const AnimatableProperty<Matrix>* >( entry.GetSceneGraphProperty() );
+ DALI_ASSERT_DEBUG( NULL != property );
+
+ value = (*property)[ bufferIndex ];
+ break;
+ }
+
+ case Property::MATRIX3:
+ {
+ const AnimatableProperty<Matrix3>* property = static_cast< const AnimatableProperty<Matrix3>* >( entry.GetSceneGraphProperty() );
+ DALI_ASSERT_DEBUG( NULL != property );
+
+ value = (*property)[ bufferIndex ];
+ break;
+ }
+
+ case Property::ROTATION:
+ {
+ const AnimatableProperty<Quaternion>* property = static_cast< const AnimatableProperty<Quaternion>* >( entry.GetSceneGraphProperty() );
+ DALI_ASSERT_DEBUG( NULL != property );
+
+ value = (*property)[ bufferIndex ];
+ break;
+ }
+
+ default:
+ {
+ // unreachable code due to higher level logic
+ }
+ } // switch(type)
+ } // if animatable
+
+ return value;
}
-CustomProperty* Object::FindCustomProperty( Property::Index index ) const
+void Object::SetSceneGraphProperty( Property::Index index, const PropertyMetadata& entry, const Property::Value& value )
{
- CustomProperty* property( NULL );
- int arrayIndex = index - PROPERTY_CUSTOM_START_INDEX;
- if( arrayIndex >= 0 )
+ switch ( entry.GetType() )
{
- if( arrayIndex < (int)mCustomProperties.Count() ) // we can only access the first 2 billion custom properties
+ case Property::BOOLEAN:
+ {
+ const AnimatableProperty<bool>* property = dynamic_cast< const AnimatableProperty<bool>* >( entry.GetSceneGraphProperty() );
+ DALI_ASSERT_DEBUG( NULL != property );
+
+ // property is being used in a separate thread; queue a message to set the property
+ BakeMessage<bool>( GetEventThreadServices(), *property, value.Get<bool>() );
+ break;
+ }
+
+ case Property::INTEGER:
+ {
+ const AnimatableProperty<int>* property = dynamic_cast< const AnimatableProperty<int>* >( entry.GetSceneGraphProperty() );
+ DALI_ASSERT_DEBUG( NULL != property );
+
+ // property is being used in a separate thread; queue a message to set the property
+ BakeMessage<int>( GetEventThreadServices(), *property, value.Get<int>() );
+ break;
+ }
+
+ case Property::FLOAT:
+ {
+ const AnimatableProperty<float>* property = dynamic_cast< const AnimatableProperty<float>* >( entry.GetSceneGraphProperty() );
+ DALI_ASSERT_DEBUG( NULL != property );
+
+ // property is being used in a separate thread; queue a message to set the property
+ BakeMessage<float>( GetEventThreadServices(), *property, value.Get<float>() );
+ break;
+ }
+
+ case Property::VECTOR2:
+ {
+ const AnimatableProperty<Vector2>* property = dynamic_cast< const AnimatableProperty<Vector2>* >( entry.GetSceneGraphProperty() );
+ DALI_ASSERT_DEBUG( NULL != property );
+
+ // property is being used in a separate thread; queue a message to set the property
+ if(entry.componentIndex == 0)
+ {
+ SetXComponentMessage<Vector2>( GetEventThreadServices(), *property, value.Get<float>() );
+ }
+ else if(entry.componentIndex == 1)
+ {
+ SetYComponentMessage<Vector2>( GetEventThreadServices(), *property, value.Get<float>() );
+ }
+ else
+ {
+ BakeMessage<Vector2>( GetEventThreadServices(), *property, value.Get<Vector2>() );
+ }
+ break;
+ }
+
+ case Property::VECTOR3:
+ {
+ const AnimatableProperty<Vector3>* property = dynamic_cast< const AnimatableProperty<Vector3>* >( entry.GetSceneGraphProperty() );
+ DALI_ASSERT_DEBUG( NULL != property );
+
+ // property is being used in a separate thread; queue a message to set the property
+ if(entry.componentIndex == 0)
+ {
+ SetXComponentMessage<Vector3>( GetEventThreadServices(), *property, value.Get<float>() );
+ }
+ else if(entry.componentIndex == 1)
+ {
+ SetYComponentMessage<Vector3>( GetEventThreadServices(), *property, value.Get<float>() );
+ }
+ else if(entry.componentIndex == 2)
+ {
+ SetZComponentMessage<Vector3>( GetEventThreadServices(), *property, value.Get<float>() );
+ }
+ else
+ {
+ BakeMessage<Vector3>( GetEventThreadServices(), *property, value.Get<Vector3>() );
+ }
+
+ break;
+ }
+
+ case Property::VECTOR4:
{
- property = mCustomProperties[ arrayIndex ];
+ const AnimatableProperty<Vector4>* property = dynamic_cast< const AnimatableProperty<Vector4>* >( entry.GetSceneGraphProperty() );
+ DALI_ASSERT_DEBUG( NULL != property );
+
+ // property is being used in a separate thread; queue a message to set the property
+ if(entry.componentIndex == 0)
+ {
+ SetXComponentMessage<Vector4>( GetEventThreadServices(), *property, value.Get<float>() );
+ }
+ else if(entry.componentIndex == 1)
+ {
+ SetYComponentMessage<Vector4>( GetEventThreadServices(), *property, value.Get<float>() );
+ }
+ else if(entry.componentIndex == 2)
+ {
+ SetZComponentMessage<Vector4>( GetEventThreadServices(), *property, value.Get<float>() );
+ }
+ else if(entry.componentIndex == 3)
+ {
+ SetWComponentMessage<Vector4>( GetEventThreadServices(), *property, value.Get<float>() );
+ }
+ else
+ {
+ BakeMessage<Vector4>( GetEventThreadServices(), *property, value.Get<Vector4>() );
+ }
+ break;
+ }
+
+ case Property::ROTATION:
+ {
+ const AnimatableProperty<Quaternion>* property = dynamic_cast< const AnimatableProperty<Quaternion>* >( entry.GetSceneGraphProperty() );
+ DALI_ASSERT_DEBUG( NULL != property );
+
+ // property is being used in a separate thread; queue a message to set the property
+ BakeMessage<Quaternion>( GetEventThreadServices(), *property, value.Get<Quaternion>() );
+ break;
+ }
+
+ case Property::MATRIX:
+ {
+ const AnimatableProperty<Matrix>* property = dynamic_cast< const AnimatableProperty<Matrix>* >( entry.GetSceneGraphProperty() );
+ DALI_ASSERT_DEBUG( NULL != property );
+
+ // property is being used in a separate thread; queue a message to set the property
+ BakeMessage<Matrix>( GetEventThreadServices(), *property, value.Get<Matrix>() );
+ break;
+ }
+
+ case Property::MATRIX3:
+ {
+ const AnimatableProperty<Matrix3>* property = dynamic_cast< const AnimatableProperty<Matrix3>* >( entry.GetSceneGraphProperty() );
+ DALI_ASSERT_DEBUG( NULL != property );
+
+ // property is being used in a separate thread; queue a message to set the property
+ BakeMessage<Matrix3>( GetEventThreadServices(), *property, value.Get<Matrix3>() );
+ break;
+ }
+
+ default:
+ {
+ // non-animatable scene graph property, do nothing
}
}
- return property;
}
} // namespace Internal