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
Simplifying UniformMap updating
[platform/core/uifw/dali-core.git]
/
dali
/
internal
/
update
/
common
/
uniform-map.h
diff --git
a/dali/internal/update/common/uniform-map.h
b/dali/internal/update/common/uniform-map.h
index
0a505de
..
f625169
100644
(file)
--- a/
dali/internal/update/common/uniform-map.h
+++ b/
dali/internal/update/common/uniform-map.h
@@
-22,8
+22,10
@@
#include <string>
// INTERNAL INCLUDES
#include <string>
// INTERNAL INCLUDES
+#include <dali/public-api/common/dali-vector.h>
+
#include <dali/devel-api/common/hash.h>
#include <dali/devel-api/common/hash.h>
-#include <dali/devel-api/common/owner-container.h>
+
#include <dali/internal/common/const-string.h>
namespace Dali
#include <dali/internal/common/const-string.h>
namespace Dali
@@
-82,8
+84,7
@@
public:
/**
* The UniformMap class is used to map uniform names to property values. It is available
/**
* The UniformMap class is used to map uniform names to property values. It is available
- * in all of the classes responsible for rendering:
- * Actor, Renderer, Geometry, TextureSet, Shader.
+ * in the following rendering classes: Node, Renderer, Shader.
*
* It can be observed for changes to the mapping table.
*/
*
* It can be observed for changes to the mapping table.
*/
@@
-147,6
+148,14
@@
public:
*/
const UniformPropertyMapping& operator[](SizeType index) const;
*/
const UniformPropertyMapping& operator[](SizeType index) const;
+ /**
+ * Return the change counter
+ */
+ inline std::size_t GetChangeCounter() const
+ {
+ return mChangeCounter;
+ }
+
private:
/**
* Helper to call the observers when the mappings have changed
private:
/**
* Helper to call the observers when the mappings have changed
@@
-159,9
+168,9
@@
private:
using Observers = Dali::Vector<Observer*>;
using ObserversIter = Observers::Iterator;
using Observers = Dali::Vector<Observer*>;
using ObserversIter = Observers::Iterator;
- UniformMapContainer mUniformMaps; //
Owner
container of uniform maps
-
- Observers mObservers;
+ UniformMapContainer mUniformMaps; //
/<
container of uniform maps
+ Observers mObservers;
+ std::size_t mChangeCounter{0u}; ///< Counter that is incremented when the map changes
};
} // namespace SceneGraph
};
} // namespace SceneGraph