X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Finternal%2Fevent%2Fcommon%2Fobject-impl.cpp;h=d09d502cbb6c25ce8f99a998c02f83d0ed984091;hb=b1ce4d4fcd7c85330c5fe99465c78bb8b9c42244;hp=34bd166835ef05936939ad4267f9adff4de7d112;hpb=6c63642f3e4c95c69c7bfbb1d142189efad6a5c9;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 34bd166..d09d502 100644 --- a/dali/internal/event/common/object-impl.cpp +++ b/dali/internal/event/common/object-impl.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014 Samsung Electronics Co., Ltd. + * Copyright (c) 2015 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. @@ -109,7 +109,21 @@ void Object::OnSceneObjectRemove() int Object::GetPropertyComponentIndex( Property::Index index ) const { - return Property::INVALID_COMPONENT_INDEX; + int componentIndex = Property::INVALID_COMPONENT_INDEX; + + const TypeInfo* typeInfo( GetTypeInfo() ); + if ( typeInfo ) + { + componentIndex = typeInfo->GetComponentIndex(index); + } + + // For animatable property, check whether it is registered already and register it if not yet. + if ( ( index >= ANIMATABLE_PROPERTY_REGISTRATION_START_INDEX ) && ( index <= ANIMATABLE_PROPERTY_REGISTRATION_MAX_INDEX ) && ( NULL == RegisterAnimatableProperty(index) ) ) + { + componentIndex = Property::INVALID_COMPONENT_INDEX; + } + + return componentIndex; } bool Object::Supports( Capability capability ) const @@ -185,14 +199,9 @@ Property::Index Object::GetPropertyIndex(const std::string& name) const 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 = FindAnimatableProperty( index ); - if(!animatableProperty) + if ( NULL == RegisterAnimatableProperty(index) ) { - const TypeInfo* typeInfo( GetTypeInfo() ); - if (typeInfo) - { - index = RegisterSceneGraphProperty(typeInfo->GetPropertyName(index), index, Property::Value(typeInfo->GetPropertyType(index))); - } + index = Property::INVALID_INDEX; } } } @@ -355,6 +364,8 @@ void Object::SetProperty( Property::Index index, const Property::Value& property { 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 ); @@ -369,23 +380,17 @@ void Object::SetProperty( Property::Index index, const Property::Value& property else { DALI_LOG_ERROR("Cannot find property index\n"); + propertySet = false; } } 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 = FindAnimatableProperty( index ); + AnimatablePropertyMetadata* animatableProperty = RegisterAnimatableProperty( index ); if(!animatableProperty) { - const TypeInfo* typeInfo( GetTypeInfo() ); - if (!typeInfo) - { - DALI_LOG_ERROR("Cannot find property index\n"); - } - else if ( Property::INVALID_INDEX == RegisterSceneGraphProperty( typeInfo->GetPropertyName( index ), index, propertyValue ) ) - { - DALI_LOG_ERROR("Cannot register property\n"); - } + DALI_LOG_ERROR("Cannot find property index\n"); + propertySet = false; } else { @@ -406,15 +411,26 @@ void Object::SetProperty( Property::Index index, const Property::Value& property else if( custom->IsWritable() ) { custom->value = propertyValue; - OnPropertySet(index, propertyValue); } - // trying to set value on read only property is no-op + else + { + // trying to set value on read only property is no-op + propertySet = false; + } } else { DALI_LOG_ERROR("Invalid property index\n"); + propertySet = false; } } + + // 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); + } } Property::Value Object::GetProperty(Property::Index index) const @@ -442,25 +458,10 @@ Property::Value Object::GetProperty(Property::Index index) const 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 = FindAnimatableProperty( index ); + AnimatablePropertyMetadata* animatableProperty = RegisterAnimatableProperty( index ); if(!animatableProperty) { - const TypeInfo* typeInfo( GetTypeInfo() ); - if (typeInfo) - { - if(Property::INVALID_INDEX != RegisterSceneGraphProperty(typeInfo->GetPropertyName(index), index, Property::Value(typeInfo->GetPropertyType(index)))) - { - value = Property::Value(typeInfo->GetPropertyType(index)); // Return an initialized property value according to the type - } - else - { - DALI_LOG_ERROR("Cannot register property\n"); - } - } - else - { - DALI_LOG_ERROR("Cannot find property index\n"); - } + DALI_LOG_ERROR("Cannot find property index\n"); } else { @@ -487,7 +488,7 @@ Property::Value Object::GetProperty(Property::Index index) const void Object::GetPropertyIndices( Property::IndexContainer& indices ) const { - indices.clear(); + indices.Clear(); // Default Properties GetDefaultPropertyIndices( indices ); @@ -502,14 +503,14 @@ void Object::GetPropertyIndices( Property::IndexContainer& indices ) const // Custom Properties if ( mCustomProperties.Count() > 0 ) { - indices.reserve( indices.size() + mCustomProperties.Count() ); + indices.Reserve( indices.Size() + mCustomProperties.Count() ); PropertyMetadataLookup::ConstIterator iter = mCustomProperties.Begin(); const PropertyMetadataLookup::ConstIterator endIter = mCustomProperties.End(); int i=0; for ( ; iter != endIter; ++iter, ++i ) { - indices.push_back( PROPERTY_CUSTOM_START_INDEX + i ); + indices.PushBack( PROPERTY_CUSTOM_START_INDEX + i ); } } } @@ -612,7 +613,7 @@ Property::Index Object::RegisterSceneGraphProperty(const std::string& name, Prop } else { - mAnimatableProperties.PushBack( new AnimatablePropertyMetadata( index, propertyValue.GetType(), property ) ); + mAnimatableProperties.PushBack( new AnimatablePropertyMetadata( index, Property::INVALID_COMPONENT_INDEX, propertyValue.GetType(), property ) ); // base property } // queue a message to add the property @@ -667,18 +668,7 @@ Dali::PropertyNotification Object::AddPropertyNotification(Property::Index index 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 = FindAnimatableProperty( index ); - if( !animatable ) - { - const TypeInfo* typeInfo( GetTypeInfo() ); - if ( typeInfo ) - { - if( Property::INVALID_INDEX != RegisterSceneGraphProperty( typeInfo->GetPropertyName( index ), index, Property::Value( typeInfo->GetPropertyType( index ) ) ) ) - { - animatable = FindAnimatableProperty( index ); - } - } - } + AnimatablePropertyMetadata* animatable = RegisterAnimatableProperty( index ); DALI_ASSERT_ALWAYS( animatable && "Property index is invalid" ); } else if ( mCustomProperties.Count() > 0 ) @@ -826,7 +816,18 @@ Property::Value Object::GetPropertyValue( const PropertyMetadata* entry ) const const AnimatableProperty* property = dynamic_cast< const AnimatableProperty* >( entry->GetSceneGraphProperty() ); DALI_ASSERT_DEBUG( NULL != property ); - value = (*property)[ bufferIndex ]; + if(entry->componentIndex == 0) + { + value = (*property)[ bufferIndex ].x; + } + else if(entry->componentIndex == 1) + { + value = (*property)[ bufferIndex ].y; + } + else + { + value = (*property)[ bufferIndex ]; + } break; } @@ -835,7 +836,22 @@ Property::Value Object::GetPropertyValue( const PropertyMetadata* entry ) const const AnimatableProperty* property = dynamic_cast< const AnimatableProperty* >( entry->GetSceneGraphProperty() ); DALI_ASSERT_DEBUG( NULL != property ); - value = (*property)[ bufferIndex ]; + 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; } @@ -844,7 +860,26 @@ Property::Value Object::GetPropertyValue( const PropertyMetadata* entry ) const const AnimatableProperty* property = dynamic_cast< const AnimatableProperty* >( entry->GetSceneGraphProperty() ); DALI_ASSERT_DEBUG( NULL != property ); - value = (*property)[ bufferIndex ]; + 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; } @@ -936,7 +971,18 @@ void Object::SetSceneGraphProperty( Property::Index index, const PropertyMetadat DALI_ASSERT_DEBUG( NULL != property ); // property is being used in a separate thread; queue a message to set the property - BakeMessage( GetEventThreadServices(), *property, value.Get() ); + if(entry.componentIndex == 0) + { + SetXComponentMessage( GetEventThreadServices(), *property, value.Get() ); + } + else if(entry.componentIndex == 1) + { + SetYComponentMessage( GetEventThreadServices(), *property, value.Get() ); + } + else + { + BakeMessage( GetEventThreadServices(), *property, value.Get() ); + } break; } @@ -946,7 +992,23 @@ void Object::SetSceneGraphProperty( Property::Index index, const PropertyMetadat DALI_ASSERT_DEBUG( NULL != property ); // property is being used in a separate thread; queue a message to set the property - BakeMessage( GetEventThreadServices(), *property, value.Get() ); + if(entry.componentIndex == 0) + { + SetXComponentMessage( GetEventThreadServices(), *property, value.Get() ); + } + else if(entry.componentIndex == 1) + { + SetYComponentMessage( GetEventThreadServices(), *property, value.Get() ); + } + else if(entry.componentIndex == 2) + { + SetZComponentMessage( GetEventThreadServices(), *property, value.Get() ); + } + else + { + BakeMessage( GetEventThreadServices(), *property, value.Get() ); + } + break; } @@ -956,7 +1018,26 @@ void Object::SetSceneGraphProperty( Property::Index index, const PropertyMetadat DALI_ASSERT_DEBUG( NULL != property ); // property is being used in a separate thread; queue a message to set the property - BakeMessage( GetEventThreadServices(), *property, value.Get() ); + if(entry.componentIndex == 0) + { + SetXComponentMessage( GetEventThreadServices(), *property, value.Get() ); + } + else if(entry.componentIndex == 1) + { + SetYComponentMessage( GetEventThreadServices(), *property, value.Get() ); + } + else if(entry.componentIndex == 2) + { + SetZComponentMessage( GetEventThreadServices(), *property, value.Get() ); + } + else if(entry.componentIndex == 3) + { + SetWComponentMessage( GetEventThreadServices(), *property, value.Get() ); + } + else + { + BakeMessage( GetEventThreadServices(), *property, value.Get() ); + } break; } @@ -1129,6 +1210,49 @@ AnimatablePropertyMetadata* Object::FindAnimatableProperty( Property::Index inde return NULL; } +AnimatablePropertyMetadata* Object::RegisterAnimatableProperty(Property::Index index) const +{ + DALI_ASSERT_ALWAYS( (( index >= ANIMATABLE_PROPERTY_REGISTRATION_START_INDEX ) && ( index <= ANIMATABLE_PROPERTY_REGISTRATION_MAX_INDEX )) + && "Property index is out of bounds" ); + + // check whether the animatable property is registered already, if not then register one. + AnimatablePropertyMetadata* animatableProperty = FindAnimatableProperty( index ); + if(!animatableProperty) + { + const TypeInfo* typeInfo( GetTypeInfo() ); + if (typeInfo) + { + Property::Index basePropertyIndex = typeInfo->GetBasePropertyIndex(index); + if(basePropertyIndex == Property::INVALID_INDEX) + { + // If the property is not a component of a base property, register the whole property itself. + index = RegisterSceneGraphProperty(typeInfo->GetPropertyName(index), index, Property::Value(typeInfo->GetPropertyType(index))); + } + else + { + // Since the property is a component of a base property, check whether the base property is regsitered. + animatableProperty = FindAnimatableProperty( basePropertyIndex ); + if(!animatableProperty) + { + // If the base property is not registered yet, register the base property first. + if(Property::INVALID_INDEX != RegisterSceneGraphProperty(typeInfo->GetPropertyName(basePropertyIndex), basePropertyIndex, Property::Value(typeInfo->GetPropertyType(basePropertyIndex)))) + { + animatableProperty = static_cast(mAnimatableProperties[mAnimatableProperties.Size()-1]); + } + } + + // Create the metadata for the property component. + mAnimatableProperties.PushBack( new AnimatablePropertyMetadata( index, typeInfo->GetComponentIndex(index), animatableProperty->type, animatableProperty->GetSceneGraphProperty() ) ); + } + + // The metadata has just been added and therefore should be in the end of the vector. + animatableProperty = static_cast(mAnimatableProperties[mAnimatableProperties.Size()-1]); + } + } + + return animatableProperty; +} + } // namespace Internal } // namespace Dali