From 5dbf1809c6e3e905b94b8764e99491e608122261 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Sun, 5 Mar 2017 16:44:50 +0100 Subject: A Whole New World (clang-format edition) I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code --- scene/animation/animation_cache.cpp | 206 +++++++++++++++--------------------- 1 file changed, 85 insertions(+), 121 deletions(-) (limited to 'scene/animation/animation_cache.cpp') diff --git a/scene/animation/animation_cache.cpp b/scene/animation/animation_cache.cpp index 960356d9cf..93fbde519e 100644 --- a/scene/animation/animation_cache.cpp +++ b/scene/animation/animation_cache.cpp @@ -28,8 +28,6 @@ /*************************************************************************/ #include "animation_cache.h" - - void AnimationCache::_node_exit_tree(Node *p_node) { //it is one shot, so it disconnects upon arrival @@ -38,47 +36,41 @@ void AnimationCache::_node_exit_tree(Node *p_node) { connected_nodes.erase(p_node); - for(int i=0;iget()->disconnect("tree_exited",this,"_node_exit_tree"); + connected_nodes.front()->get()->disconnect("tree_exited", this, "_node_exit_tree"); connected_nodes.erase(connected_nodes.front()); } path_cache.clear(); - cache_valid=false; - cache_dirty=true; + cache_valid = false; + cache_dirty = true; } - void AnimationCache::_update_cache() { - cache_valid=false; + cache_valid = false; ERR_FAIL_COND(!root); ERR_FAIL_COND(!root->is_inside_tree()); ERR_FAIL_COND(animation.is_null()); - for(int i=0;iget_track_count();i++) { - - + for (int i = 0; i < animation->get_track_count(); i++) { NodePath np = animation->track_get_path(i); @@ -86,146 +78,127 @@ void AnimationCache::_update_cache() { if (!node) { path_cache.push_back(Path()); - ERR_EXPLAIN("Invalid Track Path in Animation: "+np); + ERR_EXPLAIN("Invalid Track Path in Animation: " + np); ERR_CONTINUE(!node); } - Path path; Ref res; if (np.get_subname_count()) { - - if (animation->track_get_type(i)==Animation::TYPE_TRANSFORM) { + if (animation->track_get_type(i) == Animation::TYPE_TRANSFORM) { path_cache.push_back(Path()); - ERR_EXPLAIN("Transform tracks can't have a subpath: "+np); - ERR_CONTINUE(animation->track_get_type(i)==Animation::TYPE_TRANSFORM); - + ERR_EXPLAIN("Transform tracks can't have a subpath: " + np); + ERR_CONTINUE(animation->track_get_type(i) == Animation::TYPE_TRANSFORM); } RES res; - for(int j=0;jget(np.get_subname(j)) : res->get(np.get_subname(j)); + for (int j = 0; j < np.get_subname_count(); j++) { + res = j == 0 ? node->get(np.get_subname(j)) : res->get(np.get_subname(j)); if (res.is_null()) break; - } if (res.is_null()) { path_cache.push_back(Path()); - ERR_EXPLAIN("Invalid Track SubPath in Animation: "+np); + ERR_EXPLAIN("Invalid Track SubPath in Animation: " + np); ERR_CONTINUE(res.is_null()); } - path.resource=res; - path.object=res.ptr(); + path.resource = res; + path.object = res.ptr(); } else { - - if (animation->track_get_type(i)==Animation::TYPE_TRANSFORM) { + if (animation->track_get_type(i) == Animation::TYPE_TRANSFORM) { StringName property = np.get_property(); String ps = property; - Spatial *sp = node->cast_to(); if (!sp) { path_cache.push_back(Path()); - ERR_EXPLAIN("Transform track not of type Spatial: "+np); + ERR_EXPLAIN("Transform track not of type Spatial: " + np); ERR_CONTINUE(!sp); } - if (ps!="") { + if (ps != "") { Skeleton *sk = node->cast_to(); if (!sk) { path_cache.push_back(Path()); - ERR_EXPLAIN("Property defined in Transform track, but not a Skeleton!: "+np); + ERR_EXPLAIN("Property defined in Transform track, but not a Skeleton!: " + np); ERR_CONTINUE(!sk); } int idx = sk->find_bone(ps); - if (idx==-1) { + if (idx == -1) { path_cache.push_back(Path()); - ERR_EXPLAIN("Property defined in Transform track, but not a Skeleton Bone!: "+np); - ERR_CONTINUE(idx==-1); - + ERR_EXPLAIN("Property defined in Transform track, but not a Skeleton Bone!: " + np); + ERR_CONTINUE(idx == -1); } - path.bone_idx=idx; - path.skeleton=sk; - + path.bone_idx = idx; + path.skeleton = sk; } - path.spatial=sp; - + path.spatial = sp; } - path.node=node; - path.object=node; - + path.node = node; + path.object = node; } - if (animation->track_get_type(i)==Animation::TYPE_VALUE) { + if (animation->track_get_type(i) == Animation::TYPE_VALUE) { - if (np.get_property().operator String()=="") { + if (np.get_property().operator String() == "") { path_cache.push_back(Path()); - ERR_EXPLAIN("Value Track lacks property: "+np); - ERR_CONTINUE(np.get_property().operator String()==""); - + ERR_EXPLAIN("Value Track lacks property: " + np); + ERR_CONTINUE(np.get_property().operator String() == ""); } - path.property=np.get_property(); + path.property = np.get_property(); - } else if (animation->track_get_type(i)==Animation::TYPE_METHOD) { + } else if (animation->track_get_type(i) == Animation::TYPE_METHOD) { - if (np.get_property().operator String()!="") { + if (np.get_property().operator String() != "") { path_cache.push_back(Path()); - ERR_EXPLAIN("Method Track has property: "+np); - ERR_CONTINUE(np.get_property().operator String()!=""); - + ERR_EXPLAIN("Method Track has property: " + np); + ERR_CONTINUE(np.get_property().operator String() != ""); } - } - - path.valid=true; + path.valid = true; path_cache.push_back(path); if (!connected_nodes.has(path.node)) { connected_nodes.insert(path.node); - path.node->connect("tree_exited",this,"_node_exit_tree",Node::make_binds(path.node),CONNECT_ONESHOT); + path.node->connect("tree_exited", this, "_node_exit_tree", Node::make_binds(path.node), CONNECT_ONESHOT); } - - - } - - - cache_dirty=false; - cache_valid=true; + cache_dirty = false; + cache_valid = true; } -void AnimationCache::set_track_transform(int p_idx,const Transform& p_transform) { +void AnimationCache::set_track_transform(int p_idx, const Transform &p_transform) { if (cache_dirty) _update_cache(); ERR_FAIL_COND(!cache_valid); - ERR_FAIL_INDEX(p_idx,path_cache.size()); + ERR_FAIL_INDEX(p_idx, path_cache.size()); Path &p = path_cache[p_idx]; if (!p.valid) return; @@ -234,47 +207,42 @@ void AnimationCache::set_track_transform(int p_idx,const Transform& p_transform) ERR_FAIL_COND(!p.spatial); if (p.skeleton) { - p.skeleton->set_bone_pose(p.bone_idx,p_transform); + p.skeleton->set_bone_pose(p.bone_idx, p_transform); } else { p.spatial->set_transform(p_transform); } - } -void AnimationCache::set_track_value(int p_idx,const Variant& p_value) { +void AnimationCache::set_track_value(int p_idx, const Variant &p_value) { if (cache_dirty) _update_cache(); ERR_FAIL_COND(!cache_valid); - ERR_FAIL_INDEX(p_idx,path_cache.size()); + ERR_FAIL_INDEX(p_idx, path_cache.size()); Path &p = path_cache[p_idx]; if (!p.valid) return; ERR_FAIL_COND(!p.object); - p.object->set(p.property,p_value); + p.object->set(p.property, p_value); } - -void AnimationCache::call_track(int p_idx,const StringName& p_method,const Variant** p_args,int p_argcount,Variant::CallError &r_error) { +void AnimationCache::call_track(int p_idx, const StringName &p_method, const Variant **p_args, int p_argcount, Variant::CallError &r_error) { if (cache_dirty) _update_cache(); - ERR_FAIL_COND(!cache_valid); - ERR_FAIL_INDEX(p_idx,path_cache.size()); + ERR_FAIL_INDEX(p_idx, path_cache.size()); Path &p = path_cache[p_idx]; if (!p.valid) return; ERR_FAIL_COND(!p.object); - p.object->call(p_method,p_args,p_argcount,r_error); - + p.object->call(p_method, p_args, p_argcount, r_error); } - void AnimationCache::set_all(float p_time, float p_delta) { if (cache_dirty) @@ -283,104 +251,100 @@ void AnimationCache::set_all(float p_time, float p_delta) { ERR_FAIL_COND(!cache_valid); int tc = animation->get_track_count(); - for(int i=0;itrack_get_type(i)) { + switch (animation->track_get_type(i)) { case Animation::TYPE_TRANSFORM: { - Vector3 loc,scale; + Vector3 loc, scale; Quat rot; - animation->transform_track_interpolate(i,p_time,&loc,&rot,&scale); - Transform tr( Basis(rot), loc ); + animation->transform_track_interpolate(i, p_time, &loc, &rot, &scale); + Transform tr(Basis(rot), loc); tr.basis.scale(scale); - set_track_transform(i,tr); - + set_track_transform(i, tr); } break; case Animation::TYPE_VALUE: { - if (animation->value_track_get_update_mode(i)==Animation::UPDATE_CONTINUOUS || (animation->value_track_get_update_mode(i)==Animation::UPDATE_DISCRETE && p_delta==0)) { - Variant v = animation->value_track_interpolate(i,p_time); - set_track_value(i,v); + if (animation->value_track_get_update_mode(i) == Animation::UPDATE_CONTINUOUS || (animation->value_track_get_update_mode(i) == Animation::UPDATE_DISCRETE && p_delta == 0)) { + Variant v = animation->value_track_interpolate(i, p_time); + set_track_value(i, v); } else { List indices; - animation->value_track_get_key_indices(i,p_time,p_delta,&indices); + animation->value_track_get_key_indices(i, p_time, p_delta, &indices); - for(List::Element *E=indices.front();E;E=E->next()) { + for (List::Element *E = indices.front(); E; E = E->next()) { - Variant v = animation->track_get_key_value(i,E->get()); - set_track_value(i,v); + Variant v = animation->track_get_key_value(i, E->get()); + set_track_value(i, v); } - } } break; case Animation::TYPE_METHOD: { List indices; - animation->method_track_get_key_indices(i,p_time,p_delta,&indices); + animation->method_track_get_key_indices(i, p_time, p_delta, &indices); - for(List::Element *E=indices.front();E;E=E->next()) { + for (List::Element *E = indices.front(); E; E = E->next()) { - Vector args = animation->method_track_get_params(i,E->get()); - StringName name = animation->method_track_get_name(i,E->get()); + Vector args = animation->method_track_get_params(i, E->get()); + StringName name = animation->method_track_get_name(i, E->get()); Variant::CallError err; if (!args.size()) { - call_track(i,name,NULL,0,err); + call_track(i, name, NULL, 0, err); } else { - Vector argptrs; + Vector argptrs; argptrs.resize(args.size()); - for(int j=0;j& p_animation) { +void AnimationCache::set_animation(const Ref &p_animation) { _clear_cache(); if (animation.is_valid()) - animation->disconnect("changed",this,"_animation_changed"); + animation->disconnect("changed", this, "_animation_changed"); - animation=p_animation; + animation = p_animation; if (animation.is_valid()) - animation->connect("changed",this,"_animation_changed"); + animation->connect("changed", this, "_animation_changed"); } void AnimationCache::_bind_methods() { - ClassDB::bind_method(D_METHOD("_node_exit_tree"),&AnimationCache::_node_exit_tree); - ClassDB::bind_method(D_METHOD("_animation_changed"),&AnimationCache::_animation_changed); + ClassDB::bind_method(D_METHOD("_node_exit_tree"), &AnimationCache::_node_exit_tree); + ClassDB::bind_method(D_METHOD("_animation_changed"), &AnimationCache::_animation_changed); } -void AnimationCache::set_root(Node* p_root) { +void AnimationCache::set_root(Node *p_root) { _clear_cache(); - root=p_root; + root = p_root; } AnimationCache::AnimationCache() { - root=NULL; - cache_dirty=true; - cache_valid=false; + root = NULL; + cache_dirty = true; + cache_valid = false; } -- cgit v1.2.3