projects
/
platform
/
core
/
uifw
/
dali-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[Tizen] Add codes for Dali Windows Backend
[platform/core/uifw/dali-core.git]
/
dali
/
internal
/
update
/
nodes
/
node.cpp
diff --git
a/dali/internal/update/nodes/node.cpp
b/dali/internal/update/nodes/node.cpp
old mode 100644
(file)
new mode 100755
(executable)
index
aa7f777
..
48feb8d
--- a/
dali/internal/update/nodes/node.cpp
+++ b/
dali/internal/update/nodes/node.cpp
@@
-55,9
+55,9
@@
const PositionInheritanceMode Node::DEFAULT_POSITION_INHERITANCE_MODE( INHERIT_P
const ColorMode Node::DEFAULT_COLOR_MODE( USE_OWN_MULTIPLY_PARENT_ALPHA );
const ColorMode Node::DEFAULT_COLOR_MODE( USE_OWN_MULTIPLY_PARENT_ALPHA );
-Node* Node::New()
+Node* Node::New(
unsigned int id
)
{
{
- return new ( gNodeMemoryPool.AllocateRawThreadSafe() ) Node();
+ return new ( gNodeMemoryPool.AllocateRawThreadSafe() ) Node(
id
);
}
void Node::Delete( Node* node )
}
void Node::Delete( Node* node )
@@
-78,7
+78,7
@@
void Node::Delete( Node* node )
}
}
}
}
-Node::Node()
+Node::Node(
unsigned int id
)
: mTransformManager( NULL ),
mTransformId( INVALID_TRANSFORM_ID ),
mParentOrigin( TRANSFORM_PROPERTY_PARENT_ORIGIN ),
: mTransformManager( NULL ),
mTransformId( INVALID_TRANSFORM_ID ),
mParentOrigin( TRANSFORM_PROPERTY_PARENT_ORIGIN ),
@@
-95,6
+95,7
@@
Node::Node()
mWorldMatrix(),
mWorldColor( Color::WHITE ),
mClippingSortModifier( 0u ),
mWorldMatrix(),
mWorldColor( Color::WHITE ),
mClippingSortModifier( 0u ),
+ mId( id ),
mParent( NULL ),
mExclusiveRenderTask( NULL ),
mChildren(),
mParent( NULL ),
mExclusiveRenderTask( NULL ),
mChildren(),
@@
-357,22
+358,6
@@
void Node::RecursiveDisconnectFromSceneGraph( BufferIndex updateBufferIndex )
} // namespace SceneGraph
} // namespace SceneGraph
-template <>
-void OwnerPointer<Dali::Internal::SceneGraph::Node>::Reset()
-{
- if( mObject != NULL )
- {
- Dali::Internal::SceneGraph::Node::Delete( mObject );
- mObject = NULL;
- }
-}
-
} // namespace Internal
} // namespace Internal
-template <>
-void OwnerContainer<Dali::Internal::SceneGraph::Node*>::Delete(Dali::Internal::SceneGraph::Node* pointer)
-{
- Dali::Internal::SceneGraph::Node::Delete( pointer );
-}
-
} // namespace Dali
} // namespace Dali