keith/ForgePatch
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity

Fixed joint hierarchy not being used fully in the animation system.

Browse source
This commit is contained in:
RainWarrior 2016-05-09 20:40:53 +03:00
parent d30aae862f
commit babd54bb87
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/main/java/net/minecraftforge/common/model/animation/Clips.java
View file

@ -282,11 +282,17 @@ public final class Clips
return Optional.absent(); return Optional.absent();
} }
IJoint joint = (IJoint)part.get(); IJoint joint = (IJoint)part.get();
if(!joint.getParent().isPresent()) TRSRTransformation jointTransform = clip.apply(joint).apply(time).compose(joint.getInvBindPose());
Optional<TRSRTransformation> parentTransform = Optional.absent();
if(joint.getParent().isPresent())
{ {
return Optional.of(clip.apply(joint).apply(time).compose(joint.getInvBindPose())); parentTransform = apply(Optional.of(joint.getParent().get()));
} }
return Optional.of(clip.apply(joint.getParent().get()).apply(time).compose(clip.apply(joint).apply(time)).compose(joint.getInvBindPose())); if(parentTransform.isPresent())
{
jointTransform = parentTransform.get().compose(jointTransform);
}
return Optional.of(jointTransform);
} }
}, clip.pastEvents(lastPollTime, time)); }, clip.pastEvents(lastPollTime, time));
} }