asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Style: Apply clang-format to animation_tree.cpp

Browse source 
Fixes issues introduced in c633b77 and de1ff22.
This commit is contained in:
Rémi Verschelde 2018-06-27 08:36:26 +02:00
parent de1ff22eae
commit be9731459a
1 changed files with 14 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
scene/animation/animation_tree.cpp
View file

@ -258,12 +258,10 @@ void AnimationNode::remove_input(int p_index) {
emit_changed(); emit_changed();
} }
void AnimationNode::_set_parent(Object *p_parent) { void AnimationNode::_set_parent(Object *p_parent) {
set_parent(Object::cast_to<AnimationNode>(p_parent)); set_parent(Object::cast_to<AnimationNode>(p_parent));
} }
void AnimationNode::set_parent(AnimationNode *p_parent) { void AnimationNode::set_parent(AnimationNode *p_parent) {
parent = p_parent; //do not use ref because parent contains children parent = p_parent; //do not use ref because parent contains children
if (get_script_instance()) { if (get_script_instance()) {
@ -735,7 +733,6 @@ void AnimationTree::_process_graph(float p_delta) {
{ //setup { //setup
process_pass++; process_pass++;
state.valid = true; state.valid = true;
@ -780,7 +777,6 @@ void AnimationTree::_process_graph(float p_delta) {
const AnimationNode::AnimationState &as = E->get(); const AnimationNode::AnimationState &as = E->get();
Ref<Animation> a = as.animation; Ref<Animation> a = as.animation;
float time = as.time; float time = as.time;
float delta = as.delta; float delta = as.delta;
@ -866,8 +862,6 @@ void AnimationTree::_process_graph(float p_delta) {
prev_time = 0; prev_time = 0;
} else { } else {
Vector3 loc; Vector3 loc;
Quat rot; Quat rot;
@ -1265,7 +1259,6 @@ NodePath AnimationTree::get_root_motion_track() const {
return root_motion_track; return root_motion_track;
} }
Transform AnimationTree::get_root_motion_transform() const { Transform AnimationTree::get_root_motion_transform() const {
return root_motion_transform; return root_motion_transform;
} }
@ -1294,8 +1287,6 @@ void AnimationTree::_bind_methods() {
ADD_PROPERTY(PropertyInfo(Variant::INT, "process_mode", PROPERTY_HINT_ENUM, "Physics,Idle"), "set_process_mode", "get_process_mode"); ADD_PROPERTY(PropertyInfo(Variant::INT, "process_mode", PROPERTY_HINT_ENUM, "Physics,Idle"), "set_process_mode", "get_process_mode");
ADD_GROUP("Root Motion", "root_motion_"); ADD_GROUP("Root Motion", "root_motion_");
ADD_PROPERTY(PropertyInfo(Variant::NODE_PATH, "root_motion_track"), "set_root_motion_track", "get_root_motion_track"); ADD_PROPERTY(PropertyInfo(Variant::NODE_PATH, "root_motion_track"), "set_root_motion_track", "get_root_motion_track");
} }
AnimationTree::AnimationTree() { AnimationTree::AnimationTree() {