projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Fix for the cursor position with the arabic script." into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
renderers
/
renderer-factory-cache.h
diff --git
a/dali-toolkit/internal/controls/renderers/renderer-factory-cache.h
b/dali-toolkit/internal/controls/renderers/renderer-factory-cache.h
index
8bffd15
..
8d5b18e
100644
(file)
--- a/
dali-toolkit/internal/controls/renderers/renderer-factory-cache.h
+++ b/
dali-toolkit/internal/controls/renderers/renderer-factory-cache.h
@@
-1,8
+1,8
@@
-#ifndef
__DALI_TOOLKIT_RENDERER_FACTORY_CACHE_H__
-#define
__DALI_TOOLKIT_RENDERER_FACTORY_CACHE_H__
+#ifndef
DALI_TOOLKIT_RENDERER_FACTORY_CACHE_H
+#define
DALI_TOOLKIT_RENDERER_FACTORY_CACHE_H
/*
/*
- * Copyright (c) 201
5
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.
@@
-23,9
+23,9
@@
// EXTERNAL INCLUDES
#include <dali/public-api/math/uint-16-pair.h>
#include <dali/public-api/object/ref-object.h>
// EXTERNAL INCLUDES
#include <dali/public-api/math/uint-16-pair.h>
#include <dali/public-api/object/ref-object.h>
-#include <dali/
devel
-api/rendering/geometry.h>
-#include <dali/
devel-api/rendering/shad
er.h>
-#include <dali/
devel-api/rendering/render
er.h>
+#include <dali/
public
-api/rendering/geometry.h>
+#include <dali/
public-api/rendering/render
er.h>
+#include <dali/
public-api/rendering/shad
er.h>
#include <dali/devel-api/common/owner-container.h>
#include <dali/devel-api/object/weak-handle.h>
#include <dali/devel-api/common/owner-container.h>
#include <dali/devel-api/object/weak-handle.h>
@@
-109,6
+109,12
@@
public:
*/
void SaveShader( ShaderType type, Shader shader );
*/
void SaveShader( ShaderType type, Shader shader );
+ /*
+ * Greate the quad geometry.
+ * Quad geometry is shared by multiple kind of Renderer, so implement it in the factory-cache.
+ */
+ static Geometry CreateQuadGeometry();
+
/**
* Create the grid geometry.
* @param[in] gridSize The size of the grid.
/**
* Create the grid geometry.
* @param[in] gridSize The size of the grid.
@@
-225,4
+231,4
@@
private:
} // namespace Dali
} // namespace Dali
-#endif /
*__DALI_TOOLKIT_RENDERER_FACTORY_CACHE_H__ */
+#endif /
/ DALI_TOOLKIT_RENDERER_FACTORY_CACHE_H