Removed code that needed private access to AnimationMixer.
This commit is contained in:
parent
f232c5f51a
commit
b754bc061f
@ -177,17 +177,13 @@ void SyncedAnimationGraph::_process_graph(double p_delta, bool p_update_only) {
|
|||||||
Animation::TrackType ttype = animation_track->type;
|
Animation::TrackType ttype = animation_track->type;
|
||||||
switch (ttype) {
|
switch (ttype) {
|
||||||
case Animation::TYPE_POSITION_3D: {
|
case Animation::TYPE_POSITION_3D: {
|
||||||
AnimationMixer::TrackCacheTransform *track_xform = memnew(AnimationMixer::TrackCacheTransform);
|
|
||||||
track_xform->type = Animation::TYPE_POSITION_3D;
|
|
||||||
track_xform->bone_idx = -1;
|
|
||||||
track_xform->skeleton_id = skeleton->get_instance_id();
|
|
||||||
NodePath path = animation->track_get_path(i);
|
NodePath path = animation->track_get_path(i);
|
||||||
|
|
||||||
double animation_time = Math::fposmod(current_time, animation->get_length());
|
double animation_time = Math::fposmod(current_time, animation->get_length());
|
||||||
if (path.get_subname_count() == 1) {
|
if (path.get_subname_count() == 1) {
|
||||||
|
|
||||||
int bone_idx = skeleton->find_bone(path.get_subname(0));
|
int bone_idx = skeleton->find_bone(path.get_subname(0));
|
||||||
if (bone_idx != -1) {
|
if (bone_idx != -1) {
|
||||||
track_xform->bone_idx = bone_idx;
|
|
||||||
Vector3 pos;
|
Vector3 pos;
|
||||||
animation->try_position_track_interpolate(i, animation_time, &pos);
|
animation->try_position_track_interpolate(i, animation_time, &pos);
|
||||||
skeleton->set_bone_pose_position(bone_idx, pos);
|
skeleton->set_bone_pose_position(bone_idx, pos);
|
||||||
@ -196,17 +192,12 @@ void SyncedAnimationGraph::_process_graph(double p_delta, bool p_update_only) {
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case Animation::TYPE_ROTATION_3D: {
|
case Animation::TYPE_ROTATION_3D: {
|
||||||
AnimationMixer::TrackCacheTransform *track_xform = memnew(AnimationMixer::TrackCacheTransform);
|
|
||||||
track_xform->type = Animation::TYPE_POSITION_3D;
|
|
||||||
track_xform->bone_idx = -1;
|
|
||||||
track_xform->skeleton_id = skeleton->get_instance_id();
|
|
||||||
NodePath path = animation->track_get_path(i);
|
NodePath path = animation->track_get_path(i);
|
||||||
|
|
||||||
double animation_time = Math::fposmod(current_time, animation->get_length());
|
double animation_time = Math::fposmod(current_time, animation->get_length());
|
||||||
if (path.get_subname_count() == 1) {
|
if (path.get_subname_count() == 1) {
|
||||||
int bone_idx = skeleton->find_bone(path.get_subname(0));
|
int bone_idx = skeleton->find_bone(path.get_subname(0));
|
||||||
if (bone_idx != -1) {
|
if (bone_idx != -1) {
|
||||||
track_xform->bone_idx = bone_idx;
|
|
||||||
Quaternion rot;
|
Quaternion rot;
|
||||||
animation->try_rotation_track_interpolate(i, animation_time, &rot);
|
animation->try_rotation_track_interpolate(i, animation_time, &rot);
|
||||||
skeleton->set_bone_pose_rotation(bone_idx, rot);
|
skeleton->set_bone_pose_rotation(bone_idx, rot);
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user