X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;ds=sidebyside;f=dali%2Finternal%2Fupdate%2Fnodes%2Fnode.cpp;h=68645261c18ca1293ffd94dd6a8d79b596fc6bb8;hb=453cdcc3281e1292b74155289df4bc66a4efa9a4;hp=5030a03f96d8b1c3726f2188fdac6a273803f003;hpb=0c1e9813ae1096bb8f31b8c8cd1d048180e39875;p=platform%2Fcore%2Fuifw%2Fdali-core.git diff --git a/dali/internal/update/nodes/node.cpp b/dali/internal/update/nodes/node.cpp index 5030a03..6864526 100644 --- a/dali/internal/update/nodes/node.cpp +++ b/dali/internal/update/nodes/node.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 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. @@ -25,14 +25,14 @@ #include #include -namespace //Unnamed namespace +namespace { //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; +// keep track of nodes alive, to ensure we have 0 when the process exits or DALi library is unloaded +int32_t gNodeCount = 0; // Called when the process is about to exit, Node count should be zero at this point. void __attribute__ ((destructor)) ShutDown(void) @@ -40,7 +40,7 @@ void __attribute__ ((destructor)) ShutDown(void) DALI_ASSERT_DEBUG( (gNodeCount == 0) && "Node memory leak"); } #endif -} +} // Unnamed namespace namespace Dali { @@ -51,13 +51,13 @@ 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 Node* Node::New() { - return new ( gNodeMemoryPool.AllocateRawThreadSafe() ) Node(); + return new ( gNodeMemoryPool.AllocateRawThreadSafe() ) Node; } void Node::Delete( Node* node ) @@ -79,30 +79,26 @@ void Node::Delete( Node* node ) } Node::Node() -: 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 - mScale( TRANSFORM_PROPERTY_SCALE ), +: mOrientation(), // Initialized to identity by default mVisible( true ), + mCulled( false ), mColor( Color::WHITE ), + mUpdateSizeHint( Vector3::ZERO ), 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 ), + mId( ++mNodeCounter ), + mParent( nullptr ), + mExclusiveRenderTask( nullptr ), mChildren(), mClippingDepth( 0u ), mScissorDepth( 0u ), mDepthIndex( 0u ), + mDirtyFlags( NodePropertyFlags::ALL ), mRegenerateUniformMap( 0 ), - mDirtyFlags( AllFlags ), mDrawMode( DrawMode::NORMAL ), mColorMode( DEFAULT_COLOR_MODE ), mClippingMode( ClippingMode::DISABLED ), @@ -116,14 +112,13 @@ Node::Node() #ifdef DEBUG_ENABLED gNodeCount++; #endif - } Node::~Node() { - if( mTransformId != INVALID_TRANSFORM_ID ) + if( mTransformManagerData.Id() != INVALID_TRANSFORM_ID ) { - mTransformManager->RemoveTransform(mTransformId); + mTransformManagerData.Manager()->RemoveTransform(mTransformManagerData.Id()); } #ifdef DEBUG_ENABLED @@ -137,28 +132,33 @@ void Node::OnDestroy() PropertyOwner::Destroy(); } +uint32_t Node::GetId() const +{ + return mId; +} + void Node::CreateTransform( SceneGraph::TransformManager* transformManager ) { //Create a new transform - mTransformManager = transformManager; - mTransformId = transformManager->CreateTransform(); + mTransformManagerData.mManager = transformManager; + mTransformManagerData.mId = transformManager->CreateTransform(); //Initialize all the animatable properties - mPosition.Initialize( transformManager, mTransformId ); - mScale.Initialize( transformManager, mTransformId ); - mOrientation.Initialize( transformManager, mTransformId ); - mSize.Initialize( transformManager, mTransformId ); - mParentOrigin.Initialize( transformManager, mTransformId ); - mAnchorPoint.Initialize( transformManager, mTransformId ); + mPosition.Initialize( &mTransformManagerData ); + mScale.Initialize( &mTransformManagerData ); + mOrientation.Initialize( &mTransformManagerData ); + mSize.Initialize( &mTransformManagerData ); + mParentOrigin.Initialize( &mTransformManagerData ); + mAnchorPoint.Initialize( &mTransformManagerData ); //Initialize all the input properties - mWorldPosition.Initialize( transformManager, mTransformId ); - mWorldScale.Initialize( transformManager, mTransformId ); - mWorldOrientation.Initialize( transformManager, mTransformId ); - mWorldMatrix.Initialize( transformManager, mTransformId ); + mWorldPosition.Initialize( &mTransformManagerData ); + mWorldScale.Initialize( &mTransformManagerData ); + mWorldOrientation.Initialize( &mTransformManagerData ); + mWorldMatrix.Initialize( &mTransformManagerData); //Set whether the position should use the anchor point - transformManager->SetPositionUsesAnchorPoint( mTransformId, mPositionUsesAnchorPoint ); + transformManager->SetPositionUsesAnchorPoint( mTransformManagerData.Id(), mPositionUsesAnchorPoint ); } void Node::SetRoot(bool isRoot) @@ -168,30 +168,35 @@ void Node::SetRoot(bool isRoot) mIsRoot = isRoot; } -void Node::AddUniformMapping( OwnerPointer< UniformPropertyMapping >& map ) +void Node::AddUniformMapping(const UniformPropertyMapping& map) { PropertyOwner::AddUniformMapping( map ); mRegenerateUniformMap = 2; } -void Node::RemoveUniformMapping( const std::string& uniformName ) +void Node::RemoveUniformMapping( const ConstString& uniformName ) { PropertyOwner::RemoveUniformMapping( uniformName ); mRegenerateUniformMap = 2; } +bool Node::IsAnimationPossible() const +{ + return mIsConnectedToSceneGraph; +} + void Node::PrepareRender( BufferIndex bufferIndex ) { - if(mRegenerateUniformMap != 0 ) + if( mRegenerateUniformMap != 0 ) { if( mRegenerateUniformMap == 2 ) { CollectedUniformMap& localMap = mCollectedUniformMap[ bufferIndex ]; localMap.Resize(0); - for( unsigned int i=0, count=mUniformMaps.Count(); iIsRoot() && NULL == childNode->GetParent() ); // Child should be disconnected + DALI_ASSERT_ALWAYS( IsRoot() || nullptr != mParent ); // Parent should be connected first + DALI_ASSERT_ALWAYS( !childNode->IsRoot() && nullptr == childNode->GetParent() ); // Child should be disconnected childNode->SetParent( *this ); @@ -236,7 +241,7 @@ void Node::DisconnectChild( BufferIndex updateBufferIndex, Node& childNode ) DALI_ASSERT_ALWAYS( childNode.GetParent() == this ); // Find the childNode and remove it - Node* found( NULL ); + Node* found( nullptr ); const NodeIter endIter = mChildren.End(); for ( NodeIter iter = mChildren.Begin(); iter != endIter; ++iter ) @@ -249,38 +254,39 @@ void Node::DisconnectChild( BufferIndex updateBufferIndex, Node& childNode ) break; // iter is no longer valid } } - DALI_ASSERT_ALWAYS( NULL != found ); + DALI_ASSERT_ALWAYS( nullptr != found ); 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 ) + if( mRenderer.Empty() ) { - mDirtyFlags |= TransformFlag; + mDirtyFlags |= NodePropertyFlags::TRANSFORM; + } + else + { + // Check that it has not been already added. + for( auto&& existingRenderer : mRenderer ) + { + if( existingRenderer == renderer ) + { + // Renderer is already in the list. + return; + } + } } mRenderer.PushBack( renderer ); } -void Node::RemoveRenderer( Renderer* renderer ) +void Node::RemoveRenderer( const Renderer* renderer ) { - unsigned int rendererCount( mRenderer.Size() ); - for( unsigned int i(0); i::type; + + return static_cast( static_cast( mDirtyFlags ) | + ( static_cast( parentFlags ) & static_cast( InheritedDirtyFlags ) ) ); +} - mDirtyFlags = NothingFlag; +void Node::ResetDirtyFlags( BufferIndex updateBufferIndex ) +{ + mDirtyFlags = NodePropertyFlags::NOTHING; } void Node::SetParent( Node& parentNode ) { DALI_ASSERT_ALWAYS(this != &parentNode); DALI_ASSERT_ALWAYS(!mIsRoot); - DALI_ASSERT_ALWAYS(mParent == NULL); + DALI_ASSERT_ALWAYS(mParent == nullptr); mParent = &parentNode; - if( mTransformId != INVALID_TRANSFORM_ID ) + if( mTransformManagerData.Id() != INVALID_TRANSFORM_ID ) { - mTransformManager->SetParent( mTransformId, parentNode.GetTransformId() ); + mTransformManagerData.Manager()->SetParent( mTransformManagerData.Id(), parentNode.GetTransformId() ); } } void Node::RecursiveDisconnectFromSceneGraph( BufferIndex updateBufferIndex ) { DALI_ASSERT_ALWAYS(!mIsRoot); - DALI_ASSERT_ALWAYS(mParent != NULL); + DALI_ASSERT_ALWAYS(mParent != nullptr); const NodeIter endIter = mChildren.End(); for ( NodeIter iter = mChildren.Begin(); iter != endIter; ++iter ) @@ -347,35 +360,19 @@ void Node::RecursiveDisconnectFromSceneGraph( BufferIndex updateBufferIndex ) PropertyOwner::DisconnectFromSceneGraph( updateBufferIndex ); // Remove back-pointer to parent - mParent = NULL; + mParent = nullptr; // Remove all child pointers mChildren.Clear(); - if( mTransformId != INVALID_TRANSFORM_ID ) + if( mTransformManagerData.Id() != INVALID_TRANSFORM_ID ) { - mTransformManager->SetParent( mTransformId, INVALID_TRANSFORM_ID ); + mTransformManagerData.Manager()->SetParent( mTransformManagerData.Id(), INVALID_TRANSFORM_ID ); } } } // 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