summaryrefslogtreecommitdiff
path: root/scene/animation
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2017-01-07 18:25:37 -0300
committerJuan Linietsky <reduzio@gmail.com>2017-01-07 18:26:38 -0300
commit2ab83e1abbf5ee6d00e16056a9e9394114026f28 (patch)
tree7efbb375cc4d00d8e8589fcf1b6a1303bec5df2d /scene/animation
parent2a38a5eaa844043b846e03d6655f84caf8a31e74 (diff)
Memory pool vectors (DVector) have been enormously simplified in code, and renamed to PoolVector
Diffstat (limited to 'scene/animation')
-rw-r--r--scene/animation/animation_player.h4
-rw-r--r--scene/animation/animation_tree_player.cpp4
-rw-r--r--scene/animation/animation_tree_player.h2
3 files changed, 5 insertions, 5 deletions
diff --git a/scene/animation/animation_player.h b/scene/animation/animation_player.h
index c03762549b..94955bec60 100644
--- a/scene/animation/animation_player.h
+++ b/scene/animation/animation_player.h
@@ -208,11 +208,11 @@ private:
void _node_removed(Node *p_node);
// bind helpers
- DVector<String> _get_animation_list() const {
+ PoolVector<String> _get_animation_list() const {
List<StringName> animations;
get_animation_list(&animations);
- DVector<String> ret;
+ PoolVector<String> ret;
while(animations.size()) {
ret.push_back( animations.front()->get());
diff --git a/scene/animation/animation_tree_player.cpp b/scene/animation/animation_tree_player.cpp
index 2ed8e52615..4df37af7a1 100644
--- a/scene/animation/animation_tree_player.cpp
+++ b/scene/animation/animation_tree_player.cpp
@@ -1740,11 +1740,11 @@ NodePath AnimationTreePlayer::get_master_player() const{
return master;
}
-DVector<String> AnimationTreePlayer::_get_node_list() {
+PoolVector<String> AnimationTreePlayer::_get_node_list() {
List<StringName> nl;
get_node_list(&nl);
- DVector<String> ret;
+ PoolVector<String> ret;
ret.resize(nl.size());
int idx=0;
for(List<StringName>::Element *E=nl.front();E;E=E->next()) {
diff --git a/scene/animation/animation_tree_player.h b/scene/animation/animation_tree_player.h
index 6d9db5dc63..ae2fe8c2bb 100644
--- a/scene/animation/animation_tree_player.h
+++ b/scene/animation/animation_tree_player.h
@@ -282,7 +282,7 @@ private:
Track* _find_track(const NodePath& p_path);
void _recompute_caches();
void _recompute_caches(const StringName& p_node);
- DVector<String> _get_node_list();
+ PoolVector<String> _get_node_list();
void _compute_weights(float *p_fallback_weight, HashMap<NodePath,float> *p_weights, float p_coeff, const HashMap<NodePath,bool> *p_filter = NULL, float p_filtered_coeff = 0);