summaryrefslogtreecommitdiff
path: root/scene/animation
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2018-07-18 16:24:33 +0200
committerRémi Verschelde <rverschelde@gmail.com>2018-07-18 16:27:03 +0200
commit7c9f7452f4fd775ff80dbdfc27a6bfa07a1e8fcc (patch)
tree008b7c8a8d90308a0f99587413b3b7633ba82e85 /scene/animation
parentce53876a444974d091da8a3ba77e16101ed2ff67 (diff)
Style: Format code with clang-format 6.0.1
Diffstat (limited to 'scene/animation')
-rw-r--r--scene/animation/animation_blend_space_1d.cpp3
-rw-r--r--scene/animation/animation_blend_space_1d.h1
-rw-r--r--scene/animation/animation_blend_space_2d.cpp3
-rw-r--r--scene/animation/animation_blend_space_2d.h1
4 files changed, 2 insertions, 6 deletions
diff --git a/scene/animation/animation_blend_space_1d.cpp b/scene/animation/animation_blend_space_1d.cpp
index d3d2870c3f..1bc9fa4b12 100644
--- a/scene/animation/animation_blend_space_1d.cpp
+++ b/scene/animation/animation_blend_space_1d.cpp
@@ -4,10 +4,9 @@ void AnimationNodeBlendSpace1D::set_tree(AnimationTree *p_player) {
AnimationRootNode::set_tree(p_player);
- for(int i=0;i<blend_points_used;i++) {
+ for (int i = 0; i < blend_points_used; i++) {
blend_points[i].node->set_tree(p_player);
}
-
}
void AnimationNodeBlendSpace1D::_validate_property(PropertyInfo &property) const {
diff --git a/scene/animation/animation_blend_space_1d.h b/scene/animation/animation_blend_space_1d.h
index 774894ef4b..d1ed4c6a1f 100644
--- a/scene/animation/animation_blend_space_1d.h
+++ b/scene/animation/animation_blend_space_1d.h
@@ -34,7 +34,6 @@ protected:
static void _bind_methods();
public:
-
virtual void set_tree(AnimationTree *p_player);
void add_blend_point(const Ref<AnimationRootNode> &p_node, float p_position, int p_at_index = -1);
diff --git a/scene/animation/animation_blend_space_2d.cpp b/scene/animation/animation_blend_space_2d.cpp
index 82db647124..bba25d64d9 100644
--- a/scene/animation/animation_blend_space_2d.cpp
+++ b/scene/animation/animation_blend_space_2d.cpp
@@ -4,12 +4,11 @@
void AnimationNodeBlendSpace2D::set_tree(AnimationTree *p_player) {
AnimationRootNode::set_tree(p_player);
- for(int i=0;i<blend_points_used;i++) {
+ for (int i = 0; i < blend_points_used; i++) {
blend_points[i].node->set_tree(p_player);
}
}
-
void AnimationNodeBlendSpace2D::add_blend_point(const Ref<AnimationRootNode> &p_node, const Vector2 &p_position, int p_at_index) {
ERR_FAIL_COND(blend_points_used >= MAX_BLEND_POINTS);
ERR_FAIL_COND(p_node.is_null());
diff --git a/scene/animation/animation_blend_space_2d.h b/scene/animation/animation_blend_space_2d.h
index 4778299df1..74d20b6013 100644
--- a/scene/animation/animation_blend_space_2d.h
+++ b/scene/animation/animation_blend_space_2d.h
@@ -47,7 +47,6 @@ protected:
static void _bind_methods();
public:
-
virtual void set_tree(AnimationTree *p_player);
void add_blend_point(const Ref<AnimationRootNode> &p_node, const Vector2 &p_position, int p_at_index = -1);