Merge branch 'devel/master (1.1.2 ~ 1.1.7)' into tizen

[platform/core/uifw/dali-core.git] / dali / internal / render / common / render-item.cpp

diff --git a/dali/internal/render/common/render-item.cpp b/dali/internal/render/common/render-item.cpp
index c7eeab5..940872c 100644 (file)
--- a/dali/internal/render/common/render-item.cpp
+++ b/dali/internal/render/common/render-item.cpp
@@ -1,24 +1,25 @@
-//
-// Copyright (c) 2014 Samsung Electronics Co., Ltd.
-//
-// Licensed under the Flora License, Version 1.0 (the License);
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://floralicense.org/license/
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an AS IS BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
+/*
+ * Copyright (c) 2014 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
 
 // CLASS HEADER
 #include <dali/internal/render/common/render-item.h>
 
 // INTERNAL INCLUDES
-#include <dali/internal/render/renderers/scene-graph-renderer.h>
+#include <dali/internal/render/renderers/render-renderer.h>
 
 namespace Dali
 {
@@ -30,8 +31,10 @@ namespace SceneGraph
 {
 
 RenderItem::RenderItem()
-: mRenderer( NULL ),
-  mModelViewMatrix( false )
+: mModelViewMatrix( false ),
+  mRenderer( NULL ),
+  mDepthIndex(0),
+  mIsOpaque(true)
 {
 }
 
@@ -44,14 +47,19 @@ void RenderItem::Reset()
   mRenderer = NULL;
 }
 
-void RenderItem::SetRenderer( Renderer* renderer )
+void RenderItem::SetRenderer( Render::Renderer* renderer )
 {
   mRenderer = renderer;
 }
 
-const Renderer* RenderItem::GetRenderer() const
+void RenderItem::SetNode( Node* node )
 {
-  return mRenderer;
+  mNode = node;
+}
+
+Render::Renderer& RenderItem::GetRenderer() const
+{
+  return *mRenderer;
 }
 
 Matrix& RenderItem::GetModelViewMatrix()
@@ -64,6 +72,16 @@ const Matrix& RenderItem::GetModelViewMatrix() const
   return mModelViewMatrix;
 }
 
+void RenderItem::SetDepthIndex( int depthIndex )
+{
+  mDepthIndex = depthIndex;
+}
+
+void RenderItem::SetIsOpaque( bool isOpaque )
+{
+  mIsOpaque = isOpaque;
+}
+
 } // namespace SceneGraph
 
 } // namespace Internal