X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Finternal%2Fupdate%2Fnodes%2Fnode.cpp;h=aa7f77735afa053565bb3cafa190998f26f0a9e3;hb=0643c768fd100bd7ffb522e3358b88d075bc1d2e;hp=e1d5847027b85ae92d9bc1f9443852ed2fc1e9ac;hpb=8db12323a058de407621a1f796379ab8893897b7;p=platform%2Fcore%2Fuifw%2Fdali-core.git diff --git a/dali/internal/update/nodes/node.cpp b/dali/internal/update/nodes/node.cpp index e1d5847..aa7f777 100644 --- a/dali/internal/update/nodes/node.cpp +++ b/dali/internal/update/nodes/node.cpp @@ -1,5 +1,5 @@ /* - * 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. @@ -21,15 +21,25 @@ // INTERNAL INCLUDES #include #include -#include #include #include #include namespace //Unnamed namespace { -//Memory pool used to allocate new nodes. Memory used by this pool will be released when shutting down DALi +//Memory pool used to allocate new nodes. Memory used by this pool will be released when process dies +// or DALI library is unloaded Dali::Internal::MemoryPoolObjectAllocator gNodeMemoryPool; +#ifdef DEBUG_ENABLED +// keep track of nodes created / deleted, to ensure we have 0 when the process exits or DALi library is unloaded +int gNodeCount =0; + +// Called when the process is about to exit, Node count should be zero at this point. +void __attribute__ ((destructor)) ShutDown(void) +{ +DALI_ASSERT_DEBUG( (gNodeCount == 0) && "Node memory leak"); +} +#endif } namespace Dali @@ -44,40 +54,69 @@ namespace SceneGraph const PositionInheritanceMode Node::DEFAULT_POSITION_INHERITANCE_MODE( INHERIT_PARENT_POSITION ); const ColorMode Node::DEFAULT_COLOR_MODE( USE_OWN_MULTIPLY_PARENT_ALPHA ); + Node* Node::New() { return new ( gNodeMemoryPool.AllocateRawThreadSafe() ) Node(); } +void Node::Delete( Node* node ) +{ + // check we have a node not a layer + if( !node->mIsLayer ) + { + // Manually call the destructor + node->~Node(); + + // Mark the memory it used as free in the memory pool + gNodeMemoryPool.FreeThreadSafe( node ); + } + else + { + // not in the pool, just delete it. + delete node; + } +} + Node::Node() -: mTransformManager(0), +: mTransformManager( NULL ), mTransformId( INVALID_TRANSFORM_ID ), mParentOrigin( TRANSFORM_PROPERTY_PARENT_ORIGIN ), mAnchorPoint( TRANSFORM_PROPERTY_ANCHOR_POINT ), - mSize(TRANSFORM_PROPERTY_SIZE), // zero initialized by default - mPosition(TRANSFORM_PROPERTY_POSITION), // zero initialized by default - mOrientation(), // initialized to identity by default + mSize( TRANSFORM_PROPERTY_SIZE ), // Zero initialized by default + mPosition( TRANSFORM_PROPERTY_POSITION ), // Zero initialized by default + mOrientation(), // Initialized to identity by default mScale( TRANSFORM_PROPERTY_SCALE ), mVisible( true ), mColor( Color::WHITE ), - mWorldPosition(TRANSFORM_PROPERTY_WORLD_POSITION, Vector3(0.0f,0.0f,0.0f)), // zero initialized by default - mWorldScale( TRANSFORM_PROPERTY_WORLD_SCALE, Vector3(1.0f,1.0f,1.0f) ), - mWorldOrientation(), // initialized to identity by default + mWorldPosition( TRANSFORM_PROPERTY_WORLD_POSITION, Vector3( 0.0f,0.0f,0.0f ) ), // Zero initialized by default + mWorldScale( TRANSFORM_PROPERTY_WORLD_SCALE, Vector3( 1.0f,1.0f,1.0f ) ), + mWorldOrientation(), // Initialized to identity by default mWorldMatrix(), mWorldColor( Color::WHITE ), + mClippingSortModifier( 0u ), mParent( NULL ), mExclusiveRenderTask( NULL ), - mAttachment( NULL ), mChildren(), + mClippingDepth( 0u ), + mScissorDepth( 0u ), + mDepthIndex( 0u ), mRegenerateUniformMap( 0 ), - mDepth(0u), - mDirtyFlags(AllFlags), - mIsRoot( false ), + mDirtyFlags( AllFlags ), mDrawMode( DrawMode::NORMAL ), - mColorMode( DEFAULT_COLOR_MODE ) + mColorMode( DEFAULT_COLOR_MODE ), + mClippingMode( ClippingMode::DISABLED ), + mIsRoot( false ), + mIsLayer( false ), + mPositionUsesAnchorPoint( true ) { mUniformMapChanged[0] = 0u; mUniformMapChanged[1] = 0u; + +#ifdef DEBUG_ENABLED + gNodeCount++; +#endif + } Node::~Node() @@ -86,21 +125,14 @@ Node::~Node() { mTransformManager->RemoveTransform(mTransformId); } -} -void Node::operator delete( void* ptr ) -{ - gNodeMemoryPool.FreeThreadSafe( static_cast( ptr ) ); +#ifdef DEBUG_ENABLED + gNodeCount--; +#endif } void Node::OnDestroy() { - // Node attachments should be notified about the disconnection. - if ( mAttachment ) - { - mAttachment->OnDestroy(); - } - // Animators, Constraints etc. should be disconnected from the child's properties. PropertyOwner::Destroy(); } @@ -124,18 +156,9 @@ void Node::CreateTransform( SceneGraph::TransformManager* transformManager ) mWorldScale.Initialize( transformManager, mTransformId ); mWorldOrientation.Initialize( transformManager, mTransformId ); mWorldMatrix.Initialize( transformManager, mTransformId ); -} - -void Node::Attach( NodeAttachment& object ) -{ - DALI_ASSERT_DEBUG(!mAttachment); - - object.SetParent(*this); - mAttachment = &object; - SetAllDirtyFlags(); - - mAttachment->ConnectedToSceneGraph(); + //Set whether the position should use the anchor point + transformManager->SetPositionUsesAnchorPoint( mTransformId, mPositionUsesAnchorPoint ); } void Node::SetRoot(bool isRoot) @@ -145,7 +168,7 @@ void Node::SetRoot(bool isRoot) mIsRoot = isRoot; } -void Node::AddUniformMapping( UniformPropertyMapping* map ) +void Node::AddUniformMapping( OwnerPointer< UniformPropertyMapping >& map ) { PropertyOwner::AddUniformMapping( map ); mRegenerateUniformMap = 2; @@ -205,12 +228,6 @@ void Node::ConnectChild( Node* childNode ) // Inform property observers of new connection childNode->ConnectToSceneGraph(); - - // Inform child node attachment that the node has been added to the stage - if( childNode->mAttachment ) - { - childNode->mAttachment->ConnectedToSceneGraph(); - } } void Node::DisconnectChild( BufferIndex updateBufferIndex, Node& childNode ) @@ -237,6 +254,29 @@ void Node::DisconnectChild( BufferIndex updateBufferIndex, Node& childNode ) found->RecursiveDisconnectFromSceneGraph( updateBufferIndex ); } +void Node::AddRenderer( Renderer* renderer ) +{ + // Check that it has not been already added. + unsigned int rendererCount( mRenderer.Size() ); + for( unsigned int i(0); i < rendererCount; ++i ) + { + if( mRenderer[i] == renderer ) + { + // Renderer is already in the list. + return; + } + } + + // If it is the first renderer added, make sure the world transform will be calculated + // in the next update as world transform is not computed if node has no renderers. + if( rendererCount == 0 ) + { + mDirtyFlags |= TransformFlag; + } + + mRenderer.PushBack( renderer ); +} + void Node::RemoveRenderer( Renderer* renderer ) { unsigned int rendererCount( mRenderer.Size() ); @@ -270,22 +310,18 @@ int Node::GetDirtyFlags() const return flags; } -void Node::ResetDefaultProperties( BufferIndex updateBufferIndex ) +void Node::ResetDirtyFlags( BufferIndex updateBufferIndex ) { - mVisible.ResetToBaseValue( updateBufferIndex ); - mColor.ResetToBaseValue( updateBufferIndex ); - mDirtyFlags = NothingFlag; } -void Node::SetParent(Node& parentNode) +void Node::SetParent( Node& parentNode ) { DALI_ASSERT_ALWAYS(this != &parentNode); DALI_ASSERT_ALWAYS(!mIsRoot); DALI_ASSERT_ALWAYS(mParent == NULL); mParent = &parentNode; - mDepth = mParent->GetDepth() + 1u; if( mTransformId != INVALID_TRANSFORM_ID ) { @@ -309,17 +345,10 @@ void Node::RecursiveDisconnectFromSceneGraph( BufferIndex updateBufferIndex ) // Remove back-pointer to parent mParent = NULL; - mDepth = 0u; // Remove all child pointers mChildren.Clear(); - // Inform child node attachment that the node has been removed from the stage - if( mAttachment ) - { - mAttachment->DisconnectedFromSceneGraph(); - } - if( mTransformId != INVALID_TRANSFORM_ID ) { mTransformManager->SetParent( mTransformId, INVALID_TRANSFORM_ID ); @@ -328,6 +357,22 @@ void Node::RecursiveDisconnectFromSceneGraph( BufferIndex updateBufferIndex ) } // namespace SceneGraph +template <> +void OwnerPointer::Reset() +{ + if( mObject != NULL ) + { + Dali::Internal::SceneGraph::Node::Delete( mObject ); + mObject = NULL; + } +} + } // namespace Internal +template <> +void OwnerContainer::Delete(Dali::Internal::SceneGraph::Node* pointer) +{ + Dali::Internal::SceneGraph::Node::Delete( pointer ); +} + } // namespace Dali