X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Finternal%2Fevent%2Fcommon%2Fobject-impl.cpp;h=344e72c2e9cb2abc40f81cbc5720c72adc3ebf94;hb=462cbee2270984cdca45488f3733d664dcf49187;hp=b404f60639c12eaec87f4d971543c45a5a7c3e2f;hpb=678983dc5a9cd24d211acc554c8b768ae43c771a;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 b404f60..344e72c 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) 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. @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include #include @@ -50,6 +50,8 @@ typedef Dali::Vector::ConstIterator ConstObserverIter; #if defined(DEBUG_ENABLED) Debug::Filter* gLogFilter = Debug::Filter::New(Debug::NoLogging, false, "LOG_OBJECT" ); #endif + + } // unnamed namespace Object::Object() @@ -86,17 +88,6 @@ void Object::RemoveObserver(Observer& observer) 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) { @@ -109,17 +100,6 @@ void Object::OnSceneObjectAdd() 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 ) { @@ -132,7 +112,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 @@ -170,7 +164,14 @@ std::string Object::GetPropertyName( Property::Index index ) const if ( index < DEFAULT_PROPERTY_MAX_COUNT ) { - return GetDefaultPropertyName( index ); + std::string string; + + const char * propertyName = GetDefaultPropertyName( index ); + if( propertyName ) + { + string = propertyName; + } + return string; } if ( ( ( index >= PROPERTY_REGISTRATION_START_INDEX ) && ( index <= PROPERTY_REGISTRATION_MAX_INDEX ) ) @@ -208,14 +209,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; } } } @@ -230,7 +226,45 @@ Property::Index Object::GetPropertyIndex(const std::string& name) const CustomPropertyMetadata* custom = static_cast(*iter); if ( custom->name == name ) { - 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::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; } } @@ -239,6 +273,20 @@ Property::Index Object::GetPropertyIndex(const std::string& name) const 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"); @@ -369,8 +417,9 @@ Property::Type Object::GetPropertyType( Property::Index index ) const CustomPropertyMetadata* custom = FindCustomProperty( index ); if( custom ) { - return custom->type; + return custom->GetType(); } + return Property::NONE; } @@ -378,6 +427,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 ); @@ -392,26 +443,23 @@ 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 && Property::INVALID_INDEX == RegisterSceneGraphProperty(typeInfo->GetPropertyName(index), index, propertyValue)) - { - DALI_LOG_ERROR("Cannot register property\n"); - } - else - { - DALI_LOG_ERROR("Cannot find property index\n"); - } + DALI_LOG_ERROR("Cannot find property index\n"); + propertySet = false; } else { + // update the cached property value + animatableProperty->SetPropertyValue( propertyValue ); + // set the scene graph property value SetSceneGraphProperty( index, *animatableProperty, propertyValue ); } @@ -419,25 +467,64 @@ void Object::SetProperty( Property::Index index, const Property::Value& property 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() ) { - custom->value = propertyValue; - OnPropertySet(index, propertyValue); + // update the cached property value + custom->SetPropertyValue( propertyValue ); + } + else + { + // trying to set value on read only property is no-op + propertySet = false; } - // trying to set value on read only property is no-op } 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 @@ -465,30 +552,68 @@ 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 + { + // 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) @@ -497,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 { @@ -510,7 +635,7 @@ Property::Value Object::GetProperty(Property::Index index) const void Object::GetPropertyIndices( Property::IndexContainer& indices ) const { - indices.clear(); + indices.Clear(); // Default Properties GetDefaultPropertyIndices( indices ); @@ -525,19 +650,28 @@ 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 ); + CustomPropertyMetadata* custom = static_cast( *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 ); + } } } } -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; @@ -550,15 +684,15 @@ Property::Index Object::RegisterSceneGraphProperty(const std::string& name, Prop break; } - case Property::FLOAT: + case Property::INTEGER: { - newProperty = new AnimatableProperty( propertyValue.Get() ); + newProperty = new AnimatableProperty( propertyValue.Get() ); break; } - case Property::INTEGER: + case Property::FLOAT: { - newProperty = new AnimatableProperty( propertyValue.Get() ); + newProperty = new AnimatableProperty( propertyValue.Get() ); break; } @@ -598,23 +732,15 @@ Property::Index Object::RegisterSceneGraphProperty(const std::string& name, Prop break; } - case Property::UNSIGNED_INTEGER: case Property::RECTANGLE: case Property::STRING: case Property::ARRAY: case Property::MAP: + case Property::NONE: { - DALI_LOG_WARNING( "Property Type %d\n", propertyValue.GetType() ); DALI_ASSERT_ALWAYS( !"PropertyType is not animatable" ); break; } - - default: - { - DALI_LOG_WARNING( "Property Type %d\n", propertyValue.GetType() ); - DALI_ASSERT_ALWAYS( !"PropertyType enumeration is out of bounds" ); - break; - } } // get the scene property owner from derived class @@ -626,11 +752,13 @@ Property::Index Object::RegisterSceneGraphProperty(const std::string& name, Prop const PropertyBase* property = newProperty.Get(); if(index >= PROPERTY_CUSTOM_START_INDEX) { - mCustomProperties.PushBack( new CustomPropertyMetadata( name, propertyValue.GetType(), property ) ); + DALI_ASSERT_ALWAYS( index <= PROPERTY_CUSTOM_MAX_INDEX && "Too many custom properties have been registered" ); + + mCustomProperties.PushBack( new CustomPropertyMetadata( name, key, propertyValue, property ) ); } else { - mAnimatableProperties.PushBack( new AnimatablePropertyMetadata( propertyValue.GetType(), property ) ); + mAnimatableProperties.PushBack( new AnimatablePropertyMetadata( index, propertyValue, property ) ); } // queue a message to add the property @@ -649,24 +777,72 @@ Property::Index Object::RegisterSceneGraphProperty(const std::string& name, Prop } } -Property::Index Object::RegisterProperty( const std::string& name, const Property::Value& propertyValue) +Property::Index Object::RegisterProperty( const std::string& name, const Property::Value& propertyValue ) { - return RegisterSceneGraphProperty(name, PROPERTY_CUSTOM_START_INDEX + mCustomProperties.Count(), propertyValue); + return RegisterProperty( name, Property::INVALID_KEY, propertyValue, Property::ANIMATABLE ); } -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 ) { + return RegisterProperty( name, key, propertyValue, Property::ANIMATABLE ); +} + +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, 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 CustomPropertyMetadata( name, propertyValue, accessMode ) ); + // Otherwise register the property + + if( Property::ANIMATABLE == accessMode ) + { + index = RegisterSceneGraphProperty( name, key, PROPERTY_CUSTOM_START_INDEX + mCustomProperties.Count(), propertyValue ); + AddUniformMapping( index, name ); + } + else + { + // Add entry to the property lookup + index = PROPERTY_CUSTOM_START_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; @@ -680,7 +856,13 @@ 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 ) ) + { + // check whether the animatable property is registered already, if not then register one. + AnimatablePropertyMetadata* animatable = RegisterAnimatableProperty( index ); + DALI_ASSERT_ALWAYS( animatable && "Property index is invalid" ); } else if ( mCustomProperties.Count() > 0 ) { @@ -742,6 +924,32 @@ void Object::RemovePropertyNotifications() } } +void Object::NotifyPropertyAnimation( Animation& animation, Property::Index index, const Property::Value& value ) +{ + if ( index < DEFAULT_PROPERTY_MAX_COUNT ) + { + OnNotifyDefaultPropertyAnimation( animation, index, value ); + } + else if ( ( index >= ANIMATABLE_PROPERTY_REGISTRATION_START_INDEX ) && ( index <= ANIMATABLE_PROPERTY_REGISTRATION_MAX_INDEX ) ) + { + AnimatablePropertyMetadata* animatableProperty = FindAnimatableProperty( index ); + if( animatableProperty ) + { + // update the cached property value + animatableProperty->SetPropertyValue( value ); + } + } + else + { + CustomPropertyMetadata* custom = FindCustomProperty( index ); + if( custom && custom->IsAnimatable() ) + { + // update the cached property value + custom->SetPropertyValue( value ); + } + } +} + void Object::EnablePropertyNotifications() { if( mPropertyNotifications ) @@ -770,46 +978,54 @@ void Object::DisablePropertyNotifications() } } -Dali::ActiveConstraint Object::ApplyConstraint( Constraint& constraint ) +void Object::AddUniformMapping( Property::Index propertyIndex, const std::string& uniformName ) const { - return Dali::ActiveConstraint( DoApplyConstraint( constraint, Dali::Handle() ) ); -} - -Dali::ActiveConstraint Object::ApplyConstraint( Constraint& constraint, Dali::Handle weightObject ) -{ - return Dali::ActiveConstraint( DoApplyConstraint( constraint, weightObject ) ); -} - -ActiveConstraintBase* Object::DoApplyConstraint( Constraint& constraint, Dali::Handle weightObject ) -{ - ActiveConstraintBase* activeConstraintImpl = constraint.CreateActiveConstraint(); - DALI_ASSERT_DEBUG( NULL != activeConstraintImpl ); - - Dali::ActiveConstraint activeConstraint( activeConstraintImpl ); + // Get the address of the property if it's a scene property + const PropertyInputImpl* propertyPtr = GetSceneObjectInputProperty( propertyIndex ); - if( weightObject ) + // Check instead for newly registered properties + if( propertyPtr == NULL ) { - Object& weightObjectImpl = GetImplementation( weightObject ); - Property::Index weightIndex = weightObjectImpl.GetPropertyIndex( "weight" ); - - if( Property::INVALID_INDEX != weightIndex ) + PropertyMetadata* animatable = FindAnimatableProperty( propertyIndex ); + if( animatable != NULL ) { - activeConstraintImpl->SetCustomWeightObject( weightObjectImpl, weightIndex ); + propertyPtr = animatable->GetSceneGraphProperty(); } } - if( !mConstraints ) + if( propertyPtr == NULL ) { - mConstraints = new ActiveConstraintContainer; + PropertyMetadata* custom = FindCustomProperty( propertyIndex ); + if( custom != NULL ) + { + propertyPtr = custom->GetSceneGraphProperty(); + } } - mConstraints->push_back( activeConstraint ); - activeConstraintImpl->FirstApply( *this, constraint.GetApplyTime() ); + if( propertyPtr != NULL ) + { + const SceneGraph::PropertyOwner* sceneObject = GetPropertyOwner(); - return activeConstraintImpl; + if( sceneObject != NULL ) + { + 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); + } + else + { + DALI_ASSERT_ALWAYS(0 && "MESH_REWORK - Need to store property whilst off-stage" ); + } + } } -Property::Value Object::GetPropertyValue( const PropertyMetadata* entry ) const +void Object::RemoveUniformMapping( const std::string& uniformName ) +{ + const SceneGraph::PropertyOwner* sceneObject = GetSceneObject(); + RemoveUniformMapMessage( GetEventThreadServices(), *sceneObject, uniformName); +} + +Property::Value Object::GetCurrentPropertyValue( const PropertyMetadata* entry ) const { Property::Value value; @@ -817,35 +1033,35 @@ Property::Value Object::GetPropertyValue( const PropertyMetadata* entry ) const if( !entry->IsAnimatable() ) { - value = entry->value; + value = entry->GetPropertyValue(); } else { BufferIndex bufferIndex( GetEventThreadServices().GetEventBufferIndex() ); - switch ( entry->type ) + switch ( entry->GetType() ) { case Property::BOOLEAN: { - const AnimatableProperty* property = dynamic_cast< const AnimatableProperty* >( entry->GetSceneGraphProperty() ); + const AnimatableProperty* property = static_cast< const AnimatableProperty* >( entry->GetSceneGraphProperty() ); DALI_ASSERT_DEBUG( NULL != property ); value = (*property)[ bufferIndex ]; break; } - case Property::FLOAT: + case Property::INTEGER: { - const AnimatableProperty* property = dynamic_cast< const AnimatableProperty* >( entry->GetSceneGraphProperty() ); + const AnimatableProperty* property = static_cast< const AnimatableProperty* >( entry->GetSceneGraphProperty() ); DALI_ASSERT_DEBUG( NULL != property ); value = (*property)[ bufferIndex ]; break; } - case Property::INTEGER: + case Property::FLOAT: { - const AnimatableProperty* property = dynamic_cast< const AnimatableProperty* >( entry->GetSceneGraphProperty() ); + const AnimatableProperty* property = static_cast< const AnimatableProperty* >( entry->GetSceneGraphProperty() ); DALI_ASSERT_DEBUG( NULL != property ); value = (*property)[ bufferIndex ]; @@ -854,34 +1070,79 @@ Property::Value Object::GetPropertyValue( const PropertyMetadata* entry ) const case Property::VECTOR2: { - const AnimatableProperty* property = dynamic_cast< const AnimatableProperty* >( entry->GetSceneGraphProperty() ); + const AnimatableProperty* property = static_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; } case Property::VECTOR3: { - const AnimatableProperty* property = dynamic_cast< const AnimatableProperty* >( entry->GetSceneGraphProperty() ); + const AnimatableProperty* property = static_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; } case Property::VECTOR4: { - const AnimatableProperty* property = dynamic_cast< const AnimatableProperty* >( entry->GetSceneGraphProperty() ); + const AnimatableProperty* property = static_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; } case Property::MATRIX: { - const AnimatableProperty* property = dynamic_cast< const AnimatableProperty* >( entry->GetSceneGraphProperty() ); + const AnimatableProperty* property = static_cast< const AnimatableProperty* >( entry->GetSceneGraphProperty() ); DALI_ASSERT_DEBUG( NULL != property ); value = (*property)[ bufferIndex ]; @@ -890,7 +1151,7 @@ Property::Value Object::GetPropertyValue( const PropertyMetadata* entry ) const case Property::MATRIX3: { - const AnimatableProperty* property = dynamic_cast< const AnimatableProperty* >( entry->GetSceneGraphProperty() ); + const AnimatableProperty* property = static_cast< const AnimatableProperty* >( entry->GetSceneGraphProperty() ); DALI_ASSERT_DEBUG( NULL != property ); value = (*property)[ bufferIndex ]; @@ -899,7 +1160,7 @@ Property::Value Object::GetPropertyValue( const PropertyMetadata* entry ) const case Property::ROTATION: { - const AnimatableProperty* property = dynamic_cast< const AnimatableProperty* >( entry->GetSceneGraphProperty() ); + const AnimatableProperty* property = static_cast< const AnimatableProperty* >( entry->GetSceneGraphProperty() ); DALI_ASSERT_DEBUG( NULL != property ); value = (*property)[ bufferIndex ]; @@ -908,8 +1169,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 @@ -919,7 +1179,7 @@ Property::Value Object::GetPropertyValue( const PropertyMetadata* entry ) const void Object::SetSceneGraphProperty( Property::Index index, const PropertyMetadata& entry, const Property::Value& value ) { - switch ( entry.type ) + switch ( entry.GetType() ) { case Property::BOOLEAN: { @@ -931,23 +1191,23 @@ void Object::SetSceneGraphProperty( Property::Index index, const PropertyMetadat break; } - case Property::FLOAT: + case Property::INTEGER: { - const AnimatableProperty* property = dynamic_cast< const AnimatableProperty* >( entry.GetSceneGraphProperty() ); + const AnimatableProperty* property = dynamic_cast< const AnimatableProperty* >( entry.GetSceneGraphProperty() ); 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() ); + BakeMessage( GetEventThreadServices(), *property, value.Get() ); break; } - case Property::INTEGER: + case Property::FLOAT: { - const AnimatableProperty* property = dynamic_cast< const AnimatableProperty* >( entry.GetSceneGraphProperty() ); + const AnimatableProperty* property = dynamic_cast< const AnimatableProperty* >( entry.GetSceneGraphProperty() ); 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() ); + BakeMessage( GetEventThreadServices(), *property, value.Get() ); break; } @@ -957,7 +1217,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; } @@ -967,7 +1238,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; } @@ -977,7 +1264,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; } @@ -1035,32 +1341,46 @@ const TypeInfo* Object::GetTypeInfo() const return mTypeInfo; } -void Object::RemoveConstraint( ActiveConstraint& constraint, bool isInScenegraph ) +void Object::ApplyConstraint( ConstraintBase& constraint ) { - // guard against constraint sending messages during core destruction - if ( Stage::IsInstalled() ) + if( !mConstraints ) + { + mConstraints = new ConstraintContainer; + } + mConstraints->push_back( Dali::Constraint( &constraint ) ); +} + +void Object::RemoveConstraint( ConstraintBase& constraint ) +{ + // NULL if the Constraint sources are destroyed before Constraint::Apply() + if( mConstraints ) { - if( isInScenegraph ) + ConstraintIter it( std::find( mConstraints->begin(), mConstraints->end(), Dali::Constraint( &constraint ) ) ); + if( it != mConstraints->end() ) { - ActiveConstraintBase& baseConstraint = GetImplementation( constraint ); - baseConstraint.BeginRemove(); + mConstraints->erase( it ); } } } -void Object::RemoveConstraint( Dali::ActiveConstraint activeConstraint ) +void Object::RemoveConstraints() { // guard against constraint sending messages during core destruction if( mConstraints && Stage::IsInstalled() ) { - bool isInSceneGraph( NULL != GetSceneObject() ); - - ActiveConstraintIter it( std::find( mConstraints->begin(), mConstraints->end(), activeConstraint ) ); - if( it != mConstraints->end() ) + // If we have nothing in the scene-graph, just clear constraint containers + const SceneGraph::PropertyOwner* propertyOwner = GetSceneObject(); + if ( NULL != propertyOwner ) { - RemoveConstraint( *it, isInSceneGraph ); - mConstraints->erase( it ); + const ConstraintConstIter endIter = mConstraints->end(); + for ( ConstraintIter iter = mConstraints->begin(); endIter != iter; ++iter ) + { + GetImplementation( *iter ).RemoveInternal(); + } } + + delete mConstraints; + mConstraints = NULL; } } @@ -1069,15 +1389,13 @@ void Object::RemoveConstraints( unsigned int tag ) // guard against constraint sending messages during core destruction if( mConstraints && Stage::IsInstalled() ) { - bool isInSceneGraph( NULL != GetSceneObject() ); - - ActiveConstraintIter iter( mConstraints->begin() ); + ConstraintIter iter( mConstraints->begin() ); while(iter != mConstraints->end() ) { - ActiveConstraintBase& constraint = GetImplementation( *iter ); + ConstraintBase& constraint = GetImplementation( *iter ); if( constraint.GetTag() == tag ) { - RemoveConstraint( *iter, isInSceneGraph ); + GetImplementation( *iter ).RemoveInternal(); iter = mConstraints->erase( iter ); } else @@ -1085,27 +1403,12 @@ void Object::RemoveConstraints( unsigned int tag ) ++iter; } } - } -} -void Object::RemoveConstraints() -{ - // guard against constraint sending messages during core destruction - if( mConstraints && Stage::IsInstalled() ) - { - // If we have nothing in the scene-graph, just clear constraint containers - const SceneGraph::PropertyOwner* propertyOwner = GetSceneObject(); - if ( NULL != propertyOwner ) + if ( mConstraints->empty() ) { - const ActiveConstraintConstIter endIter = mConstraints->end(); - for ( ActiveConstraintIter iter = mConstraints->begin(); endIter != iter; ++iter ) - { - RemoveConstraint( *iter, true ); - } + delete mConstraints; + mConstraints = NULL; } - - delete mConstraints; - mConstraints = NULL; } } @@ -1116,18 +1419,6 @@ void Object::SetTypeInfo( const TypeInfo* typeInfo ) Object::~Object() { - // Notification for this object's constraints - // (note that the ActiveConstraint handles may outlive the Object) - if( mConstraints ) - { - const ActiveConstraintConstIter endIter = mConstraints->end(); - for ( ActiveConstraintIter iter = mConstraints->begin(); endIter != iter; ++iter ) - { - ActiveConstraintBase& baseConstraint = GetImplementation( *iter ); - baseConstraint.OnParentDestroyed(); - } - } - // Notification for observers for( ConstObserverIter iter = mObservers.Begin(), endIter = mObservers.End(); iter != endIter; ++iter) { @@ -1141,12 +1432,26 @@ Object::~Object() CustomPropertyMetadata* Object::FindCustomProperty( Property::Index index ) const { CustomPropertyMetadata* property( NULL ); - int arrayIndex = index - PROPERTY_CUSTOM_START_INDEX; - if( arrayIndex >= 0 ) + 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( mCustomProperties[ arrayIndex ] ); + if( custom->childPropertyIndex == index ) + { + property = custom; + } + } + } + else { - if( arrayIndex < (int)mCustomProperties.Count() ) // we can only access the first 2 billion custom properties + int arrayIndex = index - PROPERTY_CUSTOM_START_INDEX; + if( arrayIndex >= 0 ) { - property = static_cast(mCustomProperties[ arrayIndex ]); + if( arrayIndex < (int)mCustomProperties.Count() ) // we can only access the first 2 billion custom properties + { + property = static_cast(mCustomProperties[ arrayIndex ]); + } } } return property; @@ -1154,16 +1459,102 @@ CustomPropertyMetadata* Object::FindCustomProperty( Property::Index index ) cons AnimatablePropertyMetadata* Object::FindAnimatableProperty( Property::Index index ) const { - AnimatablePropertyMetadata* property( NULL ); - int arrayIndex = index - ANIMATABLE_PROPERTY_REGISTRATION_START_INDEX; - if( arrayIndex >= 0 ) + for ( int arrayIndex = 0; arrayIndex < (int)mAnimatableProperties.Count(); arrayIndex++ ) { - if( arrayIndex < (int)mAnimatableProperties.Count() ) + AnimatablePropertyMetadata* property = static_cast( mAnimatableProperties[ arrayIndex ] ); + if( property->index == index ) { - property = static_cast(mAnimatableProperties[ arrayIndex ]); + return property; + } + } + 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. + const std::string& propertyName = typeInfo->GetPropertyName(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 registered. + animatableProperty = FindAnimatableProperty( basePropertyIndex ); + 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, Property::INVALID_KEY, basePropertyIndex, typeInfo->GetPropertyDefaultValue( basePropertyIndex ) ) ) + { + animatableProperty = static_cast(mAnimatableProperties[mAnimatableProperties.Size()-1]); + AddUniformMapping( basePropertyIndex, basePropertyName ); + } + } + + if(animatableProperty) + { + // 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(mAnimatableProperties[mAnimatableProperties.Size()-1]); + } + } + + return animatableProperty; +} + +void Object::ResolveChildProperties() +{ + // Resolve index for the child property + Object* parent = GetParentObject(); + if( parent ) + { + const TypeInfo* parentTypeInfo( parent->GetTypeInfo() ); + if( parentTypeInfo ) + { + // Go through each custom property + for ( int arrayIndex = 0; arrayIndex < (int)mCustomProperties.Count(); arrayIndex++ ) + { + CustomPropertyMetadata* customProperty = static_cast( mCustomProperties[ arrayIndex ] ); + + if( customProperty->name == "" ) + { + 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; + } + } + } } } - return property; } } // namespace Internal