X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Finternal%2Frender%2Fcommon%2Frender-item.h;h=5648ebd5a98d7a60919a9d21a30117a087de15c1;hb=09a4ac29b536cd57fc8c25ae586021acfce69c08;hp=bb3321e79cb19092b4a73b593dc3b72683e3a478;hpb=df59eea2434495c32414fcf9ffafe4cb7dff5324;p=platform%2Fcore%2Fuifw%2Fdali-core.git

diff --git a/dali/internal/render/common/render-item.h b/dali/internal/render/common/render-item.h
index bb3321e..5648ebd 100644
--- a/dali/internal/render/common/render-item.h
+++ b/dali/internal/render/common/render-item.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_SCENE_GRAPH_RENDER_ITEM_H__
-#define __DALI_INTERNAL_SCENE_GRAPH_RENDER_ITEM_H__
+#ifndef DALI_INTERNAL_SCENE_GRAPH_RENDER_ITEM_H
+#define DALI_INTERNAL_SCENE_GRAPH_RENDER_ITEM_H
 
 /*
- * 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.
@@ -22,6 +22,7 @@
 #include <dali/public-api/common/vector-wrapper.h>
 #include <dali/public-api/actors/layer.h>
 #include <dali/public-api/math/matrix.h>
+#include <dali/internal/update/nodes/node.h>
 
 namespace Dali
 {
@@ -29,25 +30,24 @@ namespace Dali
 namespace Internal
 {
 
-namespace SceneGraph
+namespace Render
 {
-
 class Renderer;
-class RenderItem;
+}
 
-typedef std::vector< RenderItem > RendererItemContainer;
+namespace SceneGraph
+{
 
 /**
- * A render-item is a renderer & modelView matrix pair.
+ * A RenderItem contains all the data needed for rendering
  */
-class RenderItem
+struct RenderItem
 {
-public:
-
   /**
-   * Create a new render-item.
+   * Construct a new RenderItem
+   * @return A pointer to a new RenderItem.
    */
-  RenderItem();
+  static RenderItem* New();
 
   /**
    * Non-virtual destructor; RenderItem is not suitable as a base class.
@@ -55,42 +55,31 @@ public:
   ~RenderItem();
 
   /**
-   * Reset the render-item.
-   */
-  void Reset();
-
-  /**
-   * Retrieve the renderer.
-   * @return The renderer.
+   * Overriden delete operator.
+   * Deletes the RenderItem from its global memory pool
+   * @param[in] A pointer to the RenderItem to delete.
    */
-  const Renderer* GetRenderer() const;
+  void operator delete( void* ptr );
 
-  /**
-   * Set the renderer
-   * @param[in] renderer The renderer
-   */
-  void SetRenderer( Renderer* renderer );
+  Matrix            mModelMatrix;
+  Matrix            mModelViewMatrix;
+  Vector3           mSize;
+  Render::Renderer* mRenderer;
+  Node*             mNode;
+  const void*       mTextureSet;        //< Used for sorting only
+  int               mDepthIndex;
+  bool              mIsOpaque:1;
 
-  /**
-   * Retrieve the modelView matrix.
-   * @return The modelView matrix.
-   */
-  Matrix& GetModelViewMatrix();
+private:
 
   /**
-   * Retrieve the modelView matrix.
-   * @return The modelView matrix.
+   * Private constructor. See RenderItem::New
    */
-  const Matrix& GetModelViewMatrix() const;
-
-private:
+  RenderItem();
 
   // RenderItems should not be copied as they are heavy
   RenderItem( const RenderItem& item );
-  RenderItem& operator=( const RenderItem& item );
-
-  Renderer* mRenderer;
-  Matrix mModelViewMatrix;
+  RenderItem& operator = ( const RenderItem& item );
 
 };
 
@@ -100,4 +89,4 @@ private:
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_SCENE_GRAPH_RENDER_ITEM_H__
+#endif // DALI_INTERNAL_SCENE_GRAPH_RENDER_ITEM_H