X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Finternal%2Fupdate%2Fnodes%2Fnode.cpp;h=b3a9767c7e4a37f2849c852796179ca2be9b54db;hb=22bbf88067ca1c914055b2aa91f469760f12502f;hp=d78eaa391190a0e5cae95e48ae1e5ffd32b95f12;hpb=c6122991d434dc0a31787e61b21f059dbd72de37;p=platform%2Fcore%2Fuifw%2Fdali-core.git

diff --git a/dali/internal/update/nodes/node.cpp b/dali/internal/update/nodes/node.cpp
index d78eaa3..b3a9767 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) 2016 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,7 +21,6 @@
 // INTERNAL INCLUDES
 #include <dali/internal/common/internal-constants.h>
 #include <dali/internal/common/memory-pool-object-allocator.h>
-#include <dali/internal/update/node-attachments/node-attachment.h>
 #include <dali/internal/update/common/discard-queue.h>
 #include <dali/public-api/common/dali-common.h>
 #include <dali/public-api/common/constants.h>
@@ -50,32 +49,29 @@ Node* Node::New()
 }
 
 Node::Node()
-: mParentOrigin( ParentOrigin::DEFAULT ),
-  mAnchorPoint( AnchorPoint::DEFAULT ),
-  mSize(),     // zero initialized by default
-  mPosition(), // zero initialized by default
+: mTransformManager(0),
+  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( Vector3::ONE ),
+  mScale( TRANSFORM_PROPERTY_SCALE ),
   mVisible( true ),
   mColor( Color::WHITE ),
-  mWorldPosition(), // zero initialized 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
-  mWorldScale( Vector3::ONE ),
   mWorldMatrix(),
   mWorldColor( Color::WHITE ),
   mParent( NULL ),
   mExclusiveRenderTask( NULL ),
-  mAttachment( NULL ),
   mChildren(),
   mRegenerateUniformMap( 0 ),
   mDepth(0u),
   mDirtyFlags(AllFlags),
   mIsRoot( false ),
-  mInheritOrientation( true ),
-  mInheritScale( true ),
-  mIsActive( true ),
   mDrawMode( DrawMode::NORMAL ),
-  mPositionInheritanceMode( DEFAULT_POSITION_INHERITANCE_MODE ),
   mColorMode( DEFAULT_COLOR_MODE )
 {
   mUniformMapChanged[0] = 0u;
@@ -84,6 +80,10 @@ Node::Node()
 
 Node::~Node()
 {
+  if( mTransformId != INVALID_TRANSFORM_ID )
+  {
+    mTransformManager->RemoveTransform(mTransformId);
+  }
 }
 
 void Node::operator delete( void* ptr )
@@ -93,29 +93,29 @@ void Node::operator delete( void* ptr )
 
 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();
 }
 
-void Node::Attach( NodeAttachment& object )
+void Node::CreateTransform( SceneGraph::TransformManager* transformManager )
 {
-  DALI_ASSERT_DEBUG(!mAttachment);
-
-  object.SetParent(*this);
-
-  mAttachment = &object;
-  SetAllDirtyFlags();
-
-  if( mIsActive )
-  {
-    mAttachment->ConnectedToSceneGraph();
-  }
+  //Create a new transform
+  mTransformManager = transformManager;
+  mTransformId = 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 );
+
+  //Initialize all the input properties
+  mWorldPosition.Initialize( transformManager, mTransformId );
+  mWorldScale.Initialize( transformManager, mTransformId );
+  mWorldOrientation.Initialize( transformManager, mTransformId );
+  mWorldMatrix.Initialize( transformManager, mTransformId );
 }
 
 void Node::SetRoot(bool isRoot)
@@ -185,15 +185,9 @@ 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, std::set<Node*>& connectedNodes,  std::set<Node*>& disconnectedNodes )
+void Node::DisconnectChild( BufferIndex updateBufferIndex, Node& childNode )
 {
   DALI_ASSERT_ALWAYS( this != &childNode );
   DALI_ASSERT_ALWAYS( childNode.GetParent() == this );
@@ -214,7 +208,7 @@ void Node::DisconnectChild( BufferIndex updateBufferIndex, Node& childNode, std:
   }
   DALI_ASSERT_ALWAYS( NULL != found );
 
-  found->RecursiveDisconnectFromSceneGraph( updateBufferIndex, connectedNodes, disconnectedNodes );
+  found->RecursiveDisconnectFromSceneGraph( updateBufferIndex );
 }
 
 void Node::RemoveRenderer( Renderer* renderer )
@@ -234,21 +228,6 @@ int Node::GetDirtyFlags() const
 {
   // get initial dirty flags, they are reset ResetDefaultProperties, but setters may have made the node dirty already
   int flags = mDirtyFlags;
-  const bool sizeFlag = mSize.IsClean();
-
-  if ( !(flags & TransformFlag) )
-  {
-    // Check whether the transform related properties have changed
-    if( !sizeFlag            ||
-        !mPosition.IsClean() ||
-        !mOrientation.IsClean() ||
-        !mScale.IsClean()    ||
-        mParentOrigin.InputChanged() || // parent origin and anchor point rarely change
-        mAnchorPoint.InputChanged() )
-    {
-      flags |= TransformFlag;
-    }
-  }
 
   // Check whether the visible property has changed
   if ( !mVisible.IsClean() )
@@ -262,25 +241,11 @@ int Node::GetDirtyFlags() const
     flags |= ColorFlag;
   }
 
-  // Check whether the size property has changed
-  if ( !sizeFlag )
-  {
-    flags |= SizeFlag;
-   }
-
   return flags;
 }
 
 void Node::ResetDefaultProperties( BufferIndex updateBufferIndex )
 {
-  // clear dirty flags in parent origin & anchor point
-  mParentOrigin.Clear();
-  mAnchorPoint.Clear();
-  // Reset default properties
-  mSize.ResetToBaseValue( updateBufferIndex );
-  mPosition.ResetToBaseValue( updateBufferIndex );
-  mOrientation.ResetToBaseValue( updateBufferIndex );
-  mScale.ResetToBaseValue( updateBufferIndex );
   mVisible.ResetToBaseValue( updateBufferIndex );
   mColor.ResetToBaseValue( updateBufferIndex );
 
@@ -295,9 +260,14 @@ void Node::SetParent(Node& parentNode)
 
   mParent = &parentNode;
   mDepth = mParent->GetDepth() + 1u;
+
+  if( mTransformId != INVALID_TRANSFORM_ID )
+  {
+    mTransformManager->SetParent( mTransformId, parentNode.GetTransformId() );
+  }
 }
 
-void Node::RecursiveDisconnectFromSceneGraph( BufferIndex updateBufferIndex, std::set<Node*>& connectedNodes,  std::set<Node*>& disconnectedNodes )
+void Node::RecursiveDisconnectFromSceneGraph( BufferIndex updateBufferIndex )
 {
   DALI_ASSERT_ALWAYS(!mIsRoot);
   DALI_ASSERT_ALWAYS(mParent != NULL);
@@ -305,7 +275,7 @@ void Node::RecursiveDisconnectFromSceneGraph( BufferIndex updateBufferIndex, std
   const NodeIter endIter = mChildren.End();
   for ( NodeIter iter = mChildren.Begin(); iter != endIter; ++iter )
   {
-    (*iter)->RecursiveDisconnectFromSceneGraph( updateBufferIndex, connectedNodes, disconnectedNodes );
+    (*iter)->RecursiveDisconnectFromSceneGraph( updateBufferIndex );
   }
 
   // Animators, Constraints etc. should be disconnected from the child's properties.
@@ -318,16 +288,10 @@ void Node::RecursiveDisconnectFromSceneGraph( BufferIndex updateBufferIndex, std
   // Remove all child pointers
   mChildren.Clear();
 
-  // Inform child node attachment that the node has been removed from the stage
-  if( mAttachment )
+  if( mTransformId != INVALID_TRANSFORM_ID )
   {
-    mAttachment->DisconnectedFromSceneGraph();
+    mTransformManager->SetParent( mTransformId, INVALID_TRANSFORM_ID );
   }
-
-  // Move into disconnectedNodes
-  std::set<Node*>::size_type removed = connectedNodes.erase( this );
-  DALI_ASSERT_ALWAYS( removed );
-  disconnectedNodes.insert( this );
 }
 
 } // namespace SceneGraph