X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Finternal%2Fevent%2Fcommon%2Fobject-impl.cpp;h=2396fd1b99f64bfd1bc3cc50f0d5ff1e26b61e9d;hb=refs%2Fchanges%2F50%2F154650%2F15;hp=a9af75062da72b80a2f0e45e8f7d369f53c27b88;hpb=3a5b25aa7510b0c2fb60aaa616cde0bf0a17b70a;p=platform%2Fcore%2Fuifw%2Fdali-core.git diff --git a/dali/internal/event/common/object-impl.cpp b/dali/internal/event/common/object-impl.cpp index a9af750..2396fd1 100644 --- a/dali/internal/event/common/object-impl.cpp +++ b/dali/internal/event/common/object-impl.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016 Samsung Electronics Co., Ltd. + * Copyright (c) 2017 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. @@ -243,6 +243,50 @@ Property::Index Object::GetPropertyIndex(const std::string& name) const 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 PropertyMetadataLookup::ConstIterator end = mCustomProperties.End(); + for( PropertyMetadataLookup::ConstIterator iter = mCustomProperties.Begin(); iter != end; ++iter, ++count ) + { + CustomPropertyMetadata* custom = static_cast(*iter); + if( custom->key == key ) + { + 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"); @@ -413,6 +457,9 @@ void Object::SetProperty( Property::Index index, const Property::Value& property } else { + // update the cached property value + animatableProperty->SetPropertyValue( propertyValue ); + // set the scene graph property value SetSceneGraphProperty( index, *animatableProperty, propertyValue ); } @@ -448,12 +495,16 @@ void Object::SetProperty( Property::Index index, const Property::Value& property { 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() ) { - custom->value = propertyValue; + // update the cached property value + custom->SetPropertyValue( propertyValue ); } else { @@ -508,8 +559,61 @@ Property::Value Object::GetProperty(Property::Index index) const } else { + // get the cached animatable property value + value = animatableProperty->GetPropertyValue(); + } + } + else if(mCustomProperties.Count() > 0) + { + CustomPropertyMetadata* custom = FindCustomProperty( index ); + if(custom) + { + // get the cached custom property value + value = custom->GetPropertyValue(); + } + else + { + DALI_LOG_ERROR("Invalid property index\n"); + } + } // if custom + + return value; +} + +Property::Value Object::GetCurrentProperty( Property::Index index ) const +{ + DALI_ASSERT_ALWAYS( index > Property::INVALID_INDEX && "Property index is out of bounds" ); + + Property::Value value; + + if ( index < DEFAULT_PROPERTY_MAX_COUNT ) + { + value = GetDefaultPropertyCurrentValue( index ); + } + else if ( ( index >= PROPERTY_REGISTRATION_START_INDEX ) && ( index <= PROPERTY_REGISTRATION_MAX_INDEX ) ) + { + const TypeInfo* typeInfo( GetTypeInfo() ); + if ( typeInfo ) + { + value = typeInfo->GetProperty( this, index ); + } + else + { + DALI_LOG_ERROR("Cannot find property index\n"); + } + } + 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* animatableProperty = RegisterAnimatableProperty( index ); + if(!animatableProperty) + { + DALI_LOG_ERROR("Cannot find property index\n"); + } + else + { // get the animatable property value - value = GetPropertyValue( animatableProperty ); + value = GetCurrentPropertyValue( animatableProperty ); } } else if(mCustomProperties.Count() > 0) @@ -518,7 +622,7 @@ Property::Value Object::GetProperty(Property::Index index) const if(custom) { // get the custom property value - value = GetPropertyValue( custom ); + value = GetCurrentPropertyValue( custom ); } else { @@ -567,7 +671,7 @@ void Object::GetPropertyIndices( Property::IndexContainer& indices ) const } } -Property::Index Object::RegisterSceneGraphProperty(const std::string& name, Property::Index index, const Property::Value& propertyValue) const +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 newProperty; @@ -632,6 +736,7 @@ Property::Index Object::RegisterSceneGraphProperty(const std::string& name, Prop case Property::STRING: case Property::ARRAY: case Property::MAP: + case Property::EXTENTS: case Property::NONE: { DALI_ASSERT_ALWAYS( !"PropertyType is not animatable" ); @@ -650,15 +755,15 @@ Property::Index Object::RegisterSceneGraphProperty(const std::string& name, Prop { DALI_ASSERT_ALWAYS( index <= PROPERTY_CUSTOM_MAX_INDEX && "Too many custom properties have been registered" ); - mCustomProperties.PushBack( new CustomPropertyMetadata( name, propertyValue.GetType(), property ) ); + mCustomProperties.PushBack( new CustomPropertyMetadata( name, key, propertyValue, property ) ); } else { - mAnimatableProperties.PushBack( new AnimatablePropertyMetadata( index, Property::INVALID_COMPONENT_INDEX, propertyValue.GetType(), property ) ); // base property + mAnimatableProperties.PushBack( new AnimatablePropertyMetadata( index, propertyValue, property ) ); } // queue a message to add the property - InstallCustomPropertyMessage( const_cast(GetEventThreadServices()), *scenePropertyOwner, newProperty.Release() ); // Message takes ownership + InstallCustomPropertyMessage( const_cast(GetEventThreadServices()), *scenePropertyOwner, newProperty ); // Message takes ownership // 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 @@ -675,14 +780,33 @@ Property::Index Object::RegisterSceneGraphProperty(const std::string& name, Prop Property::Index Object::RegisterProperty( const std::string& name, const Property::Value& propertyValue ) { - return RegisterProperty( name, propertyValue, Property::ANIMATABLE ); + return RegisterProperty( name, Property::INVALID_KEY, propertyValue, Property::ANIMATABLE ); +} + +Property::Index Object::RegisterProperty( const std::string& name, Property::Index key, const Property::Value& propertyValue ) +{ + return RegisterProperty( name, key, propertyValue, Property::ANIMATABLE ); } Property::Index Object::RegisterProperty( const std::string& name, const Property::Value& propertyValue, Property::AccessMode accessMode ) { - // If property with the required name already exists, then just set it. - Property::Index index = GetPropertyIndex( name ); - if( index != Property::INVALID_INDEX ) + return RegisterProperty( name, Property::INVALID_KEY, propertyValue, 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( index != Property::INVALID_INDEX ) // If there was a valid index found by either key, set it. { SetProperty( index, propertyValue ); } @@ -690,9 +814,9 @@ Property::Index Object::RegisterProperty( const std::string& name, const Propert { // Otherwise register the property - if(Property::ANIMATABLE == accessMode) + if( Property::ANIMATABLE == accessMode ) { - index = RegisterSceneGraphProperty( name, PROPERTY_CUSTOM_START_INDEX + mCustomProperties.Count(), propertyValue ); + index = RegisterSceneGraphProperty( name, key, PROPERTY_CUSTOM_START_INDEX + mCustomProperties.Count(), propertyValue ); AddUniformMapping( index, name ); } else @@ -733,7 +857,7 @@ Dali::PropertyNotification Object::AddPropertyNotification(Property::Index index { 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 ) ) { @@ -801,6 +925,50 @@ void Object::RemovePropertyNotifications() } } +void Object::NotifyPropertyAnimation( Animation& animation, Property::Index index, const Property::Value& value, Animation::Type animationType ) +{ + if ( index < DEFAULT_PROPERTY_MAX_COUNT ) + { + OnNotifyDefaultPropertyAnimation( animation, index, value, animationType ); + } + else + { + 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; + } + } + + if( propertyMetadata ) + { + 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::EnablePropertyNotifications() { if( mPropertyNotifications ) @@ -859,9 +1027,9 @@ void Object::AddUniformMapping( Property::Index propertyIndex, const std::string if( sceneObject != NULL ) { - SceneGraph::UniformPropertyMapping* map = new SceneGraph::UniformPropertyMapping( uniformName, propertyPtr ); + OwnerPointer< SceneGraph::UniformPropertyMapping > map = new SceneGraph::UniformPropertyMapping( uniformName, propertyPtr ); // Message takes ownership of Uniform map (and will delete it after copy) - AddUniformMapMessage( const_cast(GetEventThreadServices()), *sceneObject, map); + AddUniformMapMessage( const_cast(GetEventThreadServices()), *sceneObject, map ); } else { @@ -876,7 +1044,7 @@ void Object::RemoveUniformMapping( const std::string& uniformName ) RemoveUniformMapMessage( GetEventThreadServices(), *sceneObject, uniformName); } -Property::Value Object::GetPropertyValue( const PropertyMetadata* entry ) const +Property::Value Object::GetCurrentPropertyValue( const PropertyMetadata* entry ) const { Property::Value value; @@ -884,7 +1052,7 @@ Property::Value Object::GetPropertyValue( const PropertyMetadata* entry ) const if( !entry->IsAnimatable() ) { - value = entry->value; + value = entry->GetPropertyValue(); } else { @@ -1020,8 +1188,7 @@ Property::Value Object::GetPropertyValue( const PropertyMetadata* entry ) const default: { - DALI_ASSERT_ALWAYS( false && "PropertyType enumeration is out of bounds" ); - break; + // unreachable code due to higher level logic } } // switch(type) } // if animatable @@ -1300,7 +1467,7 @@ CustomPropertyMetadata* Object::FindCustomProperty( Property::Index index ) cons int arrayIndex = index - PROPERTY_CUSTOM_START_INDEX; if( arrayIndex >= 0 ) { - if( arrayIndex < (int)mCustomProperties.Count() ) // we can only access the first 2 billion custom properties + if( arrayIndex < static_cast( mCustomProperties.Count() ) ) // we can only access the first 2 billion custom properties { property = static_cast(mCustomProperties[ arrayIndex ]); } @@ -1311,7 +1478,8 @@ CustomPropertyMetadata* Object::FindCustomProperty( Property::Index index ) cons AnimatablePropertyMetadata* Object::FindAnimatableProperty( Property::Index index ) const { - for ( int arrayIndex = 0; arrayIndex < (int)mAnimatableProperties.Count(); arrayIndex++ ) + const PropertyMetadataLookup::SizeType count = mAnimatableProperties.Count(); + for ( PropertyMetadataLookup::SizeType arrayIndex = 0; arrayIndex < count; ++arrayIndex ) { AnimatablePropertyMetadata* property = static_cast( mAnimatableProperties[ arrayIndex ] ); if( property->index == index ) @@ -1329,28 +1497,29 @@ AnimatablePropertyMetadata* Object::RegisterAnimatableProperty(Property::Index i // check whether the animatable property is registered already, if not then register one. AnimatablePropertyMetadata* animatableProperty = FindAnimatableProperty( index ); - if(!animatableProperty) + if( !animatableProperty ) { const TypeInfo* typeInfo( GetTypeInfo() ); - if (typeInfo) + if( typeInfo ) { Property::Index basePropertyIndex = typeInfo->GetBasePropertyIndex(index); - if(basePropertyIndex == Property::INVALID_INDEX) + if( basePropertyIndex == Property::INVALID_INDEX ) { // If the property is not a component of a base property, register the whole property itself. const std::string& propertyName = typeInfo->GetPropertyName(index); - RegisterSceneGraphProperty(propertyName, index, typeInfo->GetPropertyDefaultValue(index)); + RegisterSceneGraphProperty(propertyName, Property::INVALID_KEY, index, typeInfo->GetPropertyDefaultValue(index)); AddUniformMapping( index, propertyName ); } else { - // Since the property is a component of a base property, check whether the base property is regsitered. + // Since the property is a component of a base property, check whether the base property is registered. animatableProperty = FindAnimatableProperty( basePropertyIndex ); - if(!animatableProperty) + if( !animatableProperty ) { // If the base property is not registered yet, register the base property first. const std::string& basePropertyName = typeInfo->GetPropertyName(basePropertyIndex); - if(Property::INVALID_INDEX != RegisterSceneGraphProperty(basePropertyName, basePropertyIndex, Property::Value(typeInfo->GetPropertyType(basePropertyIndex)))) + + if( Property::INVALID_INDEX != RegisterSceneGraphProperty( basePropertyName, Property::INVALID_KEY, basePropertyIndex, typeInfo->GetPropertyDefaultValue( basePropertyIndex ) ) ) { animatableProperty = static_cast(mAnimatableProperties[mAnimatableProperties.Size()-1]); AddUniformMapping( basePropertyIndex, basePropertyName ); @@ -1360,7 +1529,7 @@ AnimatablePropertyMetadata* Object::RegisterAnimatableProperty(Property::Index i if(animatableProperty) { // Create the metadata for the property component. - mAnimatableProperties.PushBack( new AnimatablePropertyMetadata( index, typeInfo->GetComponentIndex(index), animatableProperty->GetType(), animatableProperty->GetSceneGraphProperty() ) ); + mAnimatableProperties.PushBack( new AnimatablePropertyMetadata( index, typeInfo->GetComponentIndex(index), animatableProperty->value, animatableProperty->GetSceneGraphProperty() ) ); } } @@ -1382,7 +1551,8 @@ void Object::ResolveChildProperties() if( parentTypeInfo ) { // Go through each custom property - for ( int arrayIndex = 0; arrayIndex < (int)mCustomProperties.Count(); arrayIndex++ ) + const PropertyMetadataLookup::SizeType count = mCustomProperties.Count(); + for ( PropertyMetadataLookup::SizeType arrayIndex = 0; arrayIndex < count; ++arrayIndex ) { CustomPropertyMetadata* customProperty = static_cast( mCustomProperties[ arrayIndex ] );