From e0ac4c8d992e74028efb7ff67b86427f1cf7059f Mon Sep 17 00:00:00 2001 From: Ferran Sole Date: Thu, 3 Dec 2015 10:17:17 +0000 Subject: [PATCH] Remove Node::ResolveVisibilty() Removed Node::ResolveVisibility() as it is no longer useful Change-Id: I7c1c89036f8cdf4324eb69735c6c08f4384cdf42 --- dali/internal/update/manager/update-algorithms.cpp | 5 +---- dali/internal/update/nodes/node.cpp | 26 ---------------------- dali/internal/update/nodes/node.h | 5 ----- 3 files changed, 1 insertion(+), 35 deletions(-) diff --git a/dali/internal/update/manager/update-algorithms.cpp b/dali/internal/update/manager/update-algorithms.cpp index b9384c6..e52bb9c 100644 --- a/dali/internal/update/manager/update-algorithms.cpp +++ b/dali/internal/update/manager/update-algorithms.cpp @@ -278,10 +278,7 @@ inline int UpdateNodesAndAttachments( Node& node, UpdateNodeWorldMatrix( node, nodeDirtyFlags, updateBufferIndex ); } - if( node.ResolveVisibility(updateBufferIndex) ) - { - node.PrepareRender( updateBufferIndex ); - } + node.PrepareRender( updateBufferIndex ); // if any child node has moved or had its sort modifier changed, layer is not clean and old frame cannot be reused diff --git a/dali/internal/update/nodes/node.cpp b/dali/internal/update/nodes/node.cpp index 013a7fa..9617333 100644 --- a/dali/internal/update/nodes/node.cpp +++ b/dali/internal/update/nodes/node.cpp @@ -113,32 +113,6 @@ void Node::SetRoot(bool isRoot) mIsRoot = isRoot; } -bool Node::ResolveVisibility( BufferIndex updateBufferIndex ) -{ - bool result = false; - const Vector4& color = GetWorldColor( updateBufferIndex ); - if( color.a > FULLY_TRANSPARENT ) // not fully transparent - { - const float MAX_NODE_SIZE = float(1u<<30); - const Vector3& size = GetSize( updateBufferIndex ); - if( ( size.width > Math::MACHINE_EPSILON_1000 ) && // width is greater than a very small number - ( size.height > Math::MACHINE_EPSILON_1000 ) ) // height is greater than a very small number - { - if( ( size.width < MAX_NODE_SIZE ) && // width is smaller than the maximum allowed size - ( size.height < MAX_NODE_SIZE ) ) // height is smaller than the maximum allowed size - { - result = true; - } - else - { - DALI_LOG_ERROR("Actor size should not be bigger than %f.\n", MAX_NODE_SIZE ); - DALI_LOG_ACTOR_TREE( mParent ); - } - } - } - return result; -} - void Node::AddUniformMapping( UniformPropertyMapping* map ) { PropertyOwner::AddUniformMapping( map ); diff --git a/dali/internal/update/nodes/node.h b/dali/internal/update/nodes/node.h index ba96d52..5d4d19e 100644 --- a/dali/internal/update/nodes/node.h +++ b/dali/internal/update/nodes/node.h @@ -866,11 +866,6 @@ public: } /** - * Check if the node is visible i.e Is not fully transparent and has valid size - */ - bool ResolveVisibility( BufferIndex updateBufferIndex ); - - /** * Set the world-matrix of a node, with scale + rotation + translation. * Scale and rotation are centered at the origin. * Translation is applied independently of the scale or rotatation axis. -- 2.7.4