X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Finternal%2Fupdate%2Fnodes%2Fnode.cpp;h=f1faa84d51b6d727442a126512fff905f97cdcc6;hb=b43741a90b40ca9dfbd33d6a9d390d3c09230e89;hp=813a99adf3e452b7f91e70cefe6dd56da0ea74ac;hpb=5ab025e3be9b5b8f9879938a0f1a59fafb69b1ca;p=platform%2Fcore%2Fuifw%2Fdali-core.git diff --git a/dali/internal/update/nodes/node.cpp b/dali/internal/update/nodes/node.cpp index 813a99a..f1faa84 100755 --- a/dali/internal/update/nodes/node.cpp +++ b/dali/internal/update/nodes/node.cpp @@ -51,7 +51,6 @@ namespace Internal namespace SceneGraph { -const PositionInheritanceMode Node::DEFAULT_POSITION_INHERITANCE_MODE( INHERIT_PARENT_POSITION ); const ColorMode Node::DEFAULT_COLOR_MODE( USE_OWN_MULTIPLY_PARENT_ALPHA ); uint32_t Node::mNodeCounter = 0; ///< A counter to provide unique node ids, up-to 4 billion @@ -88,6 +87,7 @@ Node::Node() mPosition( TRANSFORM_PROPERTY_POSITION ), // Zero initialized by default mOrientation(), // Initialized to identity by default mScale( TRANSFORM_PROPERTY_SCALE ), + mUpdateSizeHint( TRANSFORM_PROPERTY_UPDATE_SIZE_HINT ), mVisible( true ), mCulled( false ), mColor( Color::WHITE ), @@ -115,6 +115,7 @@ Node::Node() { mUniformMapChanged[0] = 0u; mUniformMapChanged[1] = 0u; + mPropertyDirty = false; #ifdef DEBUG_ENABLED gNodeCount++; @@ -154,6 +155,7 @@ void Node::CreateTransform( SceneGraph::TransformManager* transformManager ) //Initialize all the animatable properties mPosition.Initialize( transformManager, mTransformId ); mScale.Initialize( transformManager, mTransformId ); + mUpdateSizeHint.Initialize( transformManager, mTransformId ); mOrientation.Initialize( transformManager, mTransformId ); mSize.Initialize( transformManager, mTransformId ); mParentOrigin.Initialize( transformManager, mTransformId ); @@ -284,15 +286,17 @@ void Node::AddRenderer( Renderer* renderer ) } mRenderer.PushBack( renderer ); + SetPropertyDirty( true ); } -void Node::RemoveRenderer( Renderer* renderer ) +void Node::RemoveRenderer( const Renderer* renderer ) { RendererContainer::SizeType rendererCount( mRenderer.Size() ); for( RendererContainer::SizeType i = 0; i < rendererCount; ++i ) { if( mRenderer[i] == renderer ) { + SetPropertyDirty( true ); mRenderer.Erase( mRenderer.Begin()+i); return; } @@ -332,6 +336,9 @@ NodePropertyFlags Node::GetInheritedDirtyFlags( NodePropertyFlags parentFlags ) void Node::ResetDirtyFlags( BufferIndex updateBufferIndex ) { mDirtyFlags = NodePropertyFlags::NOTHING; + + SetPropertyDirty( false ); + } void Node::SetParent( Node& parentNode ) @@ -374,6 +381,31 @@ void Node::RecursiveDisconnectFromSceneGraph( BufferIndex updateBufferIndex ) } } +void Node::SetPropertyDirty( bool value ) +{ + mPropertyDirty = value; + + const NodeIter endIter = mChildren.End(); + for ( NodeIter iter = mChildren.Begin(); iter != endIter; ++iter ) + { + Node* current = *iter; + current->SetPropertyDirty( value ); + } +} + +bool Node::IsPropertyDirty() const +{ + for( auto&& existingRenderer : mRenderer ) + { + if( existingRenderer->IsDirty() ) + { + return true; + } + } + + return mPropertyDirty; +} + } // namespace SceneGraph } // namespace Internal