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
Revert "[Tizen] Add codes for Dali Windows Backend"
[platform/core/uifw/dali-core.git]
/
dali
/
internal
/
update
/
nodes
/
scene-graph-layer.cpp
diff --git
a/dali/internal/update/nodes/scene-graph-layer.cpp
b/dali/internal/update/nodes/scene-graph-layer.cpp
index
3d0e5e5
..
46bb14c
100644
(file)
--- a/
dali/internal/update/nodes/scene-graph-layer.cpp
+++ b/
dali/internal/update/nodes/scene-graph-layer.cpp
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 201
4
Samsung Electronics Co., Ltd.
+ * Copyright (c) 201
6
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.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-17,13
+17,11
@@
// CLASS HEADER
#include <dali/internal/update/nodes/scene-graph-layer.h>
// CLASS HEADER
#include <dali/internal/update/nodes/scene-graph-layer.h>
+#include <dali/internal/event/actors/layer-impl.h>
// INTERNAL INCLUDES
#include <dali/public-api/common/dali-common.h>
// INTERNAL INCLUDES
#include <dali/public-api/common/dali-common.h>
-
-using namespace std;
-
namespace Dali
{
namespace Dali
{
@@
-35,17
+33,23
@@
namespace SceneGraph
SceneGraph::Layer* Layer::New()
{
SceneGraph::Layer* Layer::New()
{
+ // Layers are currently heap allocated, unlike Nodes which are in a memory pool
+ // However Node::Delete( layer ) will correctly delete a layer / node depending on type
return new Layer();
}
Layer::Layer()
return new Layer();
}
Layer::Layer()
-: mSortFunction(
Dali
::Layer::ZValue ),
+: mSortFunction(
Internal
::Layer::ZValue ),
mClippingBox( 0,0,0,0 ),
mClippingBox( 0,0,0,0 ),
- mLastCamera(0),
+ mLastCamera( NULL ),
+ mBehavior( Dali::Layer::LAYER_2D ),
mIsClipping( false ),
mIsClipping( false ),
- mDepthTestDisabled(
fals
e ),
+ mDepthTestDisabled(
tru
e ),
mIsDefaultSortFunction( true )
{
mIsDefaultSortFunction( true )
{
+ // set a flag the node to say this is a layer
+ mIsLayer = true;
+
// layer starts off dirty
mAllChildTransformsClean[ 0 ] = false;
mAllChildTransformsClean[ 1 ] = false;
// layer starts off dirty
mAllChildTransformsClean[ 0 ] = false;
mAllChildTransformsClean[ 1 ] = false;
@@
-60,7
+64,7
@@
void Layer::SetSortFunction( Dali::Layer::SortFunctionType function )
if( mSortFunction != function )
{
// is a custom sort function used
if( mSortFunction != function )
{
// is a custom sort function used
- if( function !=
Dali
::Layer::ZValue )
+ if( function !=
Internal
::Layer::ZValue )
{
mIsDefaultSortFunction = false;
}
{
mIsDefaultSortFunction = false;
}
@@
-86,6
+90,11
@@
void Layer::SetClippingBox(const Dali::ClippingBox& box)
mClippingBox.Set(box.x, box.y, box.width, box.height);
}
mClippingBox.Set(box.x, box.y, box.width, box.height);
}
+void Layer::SetBehavior( Dali::Layer::Behavior behavior )
+{
+ mBehavior = behavior;
+}
+
void Layer::SetDepthTestDisabled( bool disable )
{
mDepthTestDisabled = disable;
void Layer::SetDepthTestDisabled( bool disable )
{
mDepthTestDisabled = disable;
@@
-96,8
+105,23
@@
bool Layer::IsDepthTestDisabled() const
return mDepthTestDisabled;
}
return mDepthTestDisabled;
}
+void Layer::ClearRenderables()
+{
+ colorRenderables.Clear();
+ overlayRenderables.Clear();
+}
+
} // namespace SceneGraph
} // namespace SceneGraph
+template <>
+void OwnerPointer<Dali::Internal::SceneGraph::Layer>::Reset()
+{
+ if( mObject != NULL )
+ {
+ Dali::Internal::SceneGraph::Node::Delete( mObject );
+ mObject = NULL;
+ }
+}
} // namespace Internal
} // namespace Dali
} // namespace Internal
} // namespace Dali