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
Remove batching.
[platform/core/uifw/dali-core.git]
/
dali
/
internal
/
render
/
common
/
render-item.h
diff --git
a/dali/internal/render/common/render-item.h
b/dali/internal/render/common/render-item.h
index
bb3321e
..
5648ebd
100644
(file)
--- 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) 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.
@@
-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/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
{
namespace Dali
{
@@
-29,25
+30,24
@@
namespace Dali
namespace Internal
{
namespace Internal
{
-namespace
SceneGraph
+namespace
Render
{
{
-
class Renderer;
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.
/**
* Non-virtual destructor; RenderItem is not suitable as a base class.
@@
-55,42
+55,31
@@
public:
~RenderItem();
/**
~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 );
// 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
} // namespace Dali
-#endif //
__DALI_INTERNAL_SCENE_GRAPH_RENDER_ITEM_H__
+#endif //
DALI_INTERNAL_SCENE_GRAPH_RENDER_ITEM_H