X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Finternal%2Frender%2Fcommon%2Frender-item.h;h=5648ebd5a98d7a60919a9d21a30117a087de15c1;hb=09a4ac29b536cd57fc8c25ae586021acfce69c08;hp=85c6fb95c33b270bd20d1ede8147d4f89d1b544a;hpb=2415d4f81cf9784289d4a7afbbc8b19cda2e105f;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 85c6fb9..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.
@@ -38,19 +38,14 @@ class Renderer;
 namespace SceneGraph
 {
 
-class RenderItem;
-
-typedef std::vector< RenderItem > RendererItemContainer;
-
 /**
- * A render-item is a renderer & modelView matrix pair.
+ * A RenderItem contains all the data needed for rendering
  */
-class RenderItem
+struct RenderItem
 {
-public:
-
   /**
    * Construct a new RenderItem
+   * @return A pointer to a new RenderItem.
    */
   static RenderItem* New();
 
@@ -62,97 +57,18 @@ public:
   /**
    * Overriden delete operator.
    * Deletes the RenderItem from its global memory pool
+   * @param[in] A pointer to the RenderItem to delete.
    */
   void operator delete( void* ptr );
 
-  /**
-   * Reset the render-item.
-   */
-  void Reset();
-
-  /**
-   * Retrieve the renderer.
-   * @return The renderer.
-   */
-  Render::Renderer& GetRenderer() const;
-
-  /**
-   * Set the renderer
-   * @param[in] renderer The renderer
-   */
-  void SetRenderer( Render::Renderer* renderer );
-
-  /**
-   * Set the node
-   * @param[in] node The node
-   */
-  void SetNode( Node* node );
-
-  /**
-   * Retrieve the node
-   * @return The node
-   */
-  const Node& GetNode() const
-  {
-    return *mNode;
-  }
-  /**
-   * Retrieve the modelView matrix.
-   * @return The modelView matrix.
-   */
-  Matrix& GetModelViewMatrix();
-
-  /**
-   * Retrieve the modelView matrix.
-   * @return The modelView matrix.
-   */
-  const Matrix& GetModelViewMatrix() const;
-
-  /**
-   * Retrieve the depth index
-   */
-  int GetDepthIndex() const
-  {
-    return mDepthIndex;
-  }
-
-  /**
-   * Set the depth index
-   */
-  void SetDepthIndex( int depthIndex );
-
-  /**
-   * Set if the RenderItem is opaque
-   * @param[in] isOpaque true if the RenderItem is opaque, false otherwise
-   */
-  void SetIsOpaque( bool isOpaque );
-
-  /**
-   * Check if the RenderItem is opaque
-   * @return True if it is opaque, false otherwise
-   */
-  bool IsOpaque() const
-  {
-    return mIsOpaque;
-  }
-
-  /**
-   * Sets the size of the render item
-   * @param[in] size The size of the render item
-   */
-  void SetSize( const Vector3& size)
-  {
-    mSize = size;
-  }
-
-  /**
-   * Retrives the size of the render item
-   * @return The size of the render item
-   */
-  const Vector3& GetSize() const
-  {
-    return mSize;
-  }
+  Matrix            mModelMatrix;
+  Matrix            mModelViewMatrix;
+  Vector3           mSize;
+  Render::Renderer* mRenderer;
+  Node*             mNode;
+  const void*       mTextureSet;        //< Used for sorting only
+  int               mDepthIndex;
+  bool              mIsOpaque:1;
 
 private:
 
@@ -165,12 +81,6 @@ private:
   RenderItem( const RenderItem& item );
   RenderItem& operator = ( const RenderItem& item );
 
-  Matrix            mModelViewMatrix;
-  Vector3           mSize;
-  Render::Renderer* mRenderer;
-  Node*             mNode;
-  int               mDepthIndex;
-  bool              mIsOpaque:1;
 };
 
 } // namespace SceneGraph
@@ -179,4 +89,4 @@ private:
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_SCENE_GRAPH_RENDER_ITEM_H__
+#endif // DALI_INTERNAL_SCENE_GRAPH_RENDER_ITEM_H