Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

RootBoneの複数選択を実装 #13

Closed
wants to merge 2 commits into from
Closed

RootBoneの複数選択を実装 #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8d7a353
RootBoneの複数指定を実装
Feb 6, 2020
e31bfb9
RootBoneの複数指定実装により動作しなくなったAnimBPを修正
Feb 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified Content/KawaiiPhysicsSample/Chain/AnimBP_ChainKawaiiPhysics.uasset
View file
Open in desktop
Binary file not shown.
Binary file modified Content/KawaiiPhysicsSample/Chain/AnimBP_ChainKawaiiPhysicsCollision0.uasset
View file
Open in desktop
Binary file not shown.
Binary file modified Content/KawaiiPhysicsSample/Chain/AnimBP_ChainKawaiiPhysicsCollision1.uasset
View file
Open in desktop
Binary file not shown.
Binary file modified Content/KawaiiPhysicsSample/Chain/AnimBP_ChainKawaiiPhysicsCollision2.uasset
View file
Open in desktop
Binary file not shown.
Binary file modified Content/KawaiiPhysicsSample/GrayChan/AnimBP_GrayChanKawaiiPhysics.uasset
View file
Open in desktop
Binary file not shown.
Binary file modified Content/KawaiiPhysicsSample/GrayChan/AnimBP_GrayChanKawaiiPhysicsSkirt.uasset
View file
Open in desktop
Binary file not shown.
26 changes: 21 additions & 5 deletions Plugins/KawaiiPhysics/Source/KawaiiPhysics/Private/AnimNode_KawaiiPhysics.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,12 @@ void FAnimNode_KawaiiPhysics::EvaluateSkeletalControl_AnyThread(FComponentSpaceP
const FBoneContainer& BoneContainer = Output.Pose.GetPose().GetBoneContainer();
FTransform ComponentTransform = Output.AnimInstanceProxy->GetComponentTransform();

if (!RootBone.IsValidToEvaluate(BoneContainer))
for (auto& RootBone : RootBones)
{
return;
if (!RootBone.IsValidToEvaluate(BoneContainer))
{
return;
}
}

if (ModifyBones.Num() == 0)
Expand Down Expand Up @@ -124,12 +127,20 @@ void FAnimNode_KawaiiPhysics::EvaluateSkeletalControl_AnyThread(FComponentSpaceP

bool FAnimNode_KawaiiPhysics::IsValidToEvaluate(const USkeleton* Skeleton, const FBoneContainer& RequiredBones)
{
return RootBone.IsValidToEvaluate(RequiredBones);
bool value = false;
for (auto& RootBone : RootBones)
{
value |= RootBone.IsValidToEvaluate(RequiredBones);
}
return value;
}

void FAnimNode_KawaiiPhysics::InitializeBoneReferences(const FBoneContainer& RequiredBones)
{
RootBone.Initialize(RequiredBones);
for (auto& RootBone : RootBones)
{
RootBone.Initialize(RequiredBones);
}

for (auto& Bone : ModifyBones)
{
Expand Down Expand Up @@ -162,7 +173,10 @@ void FAnimNode_KawaiiPhysics::InitModifyBones(FComponentSpacePoseContext& Output
auto& RefSkeleton = Skeleton->GetReferenceSkeleton();

ModifyBones.Empty();
AddModifyBone(Output, BoneContainer, RefSkeleton, RefSkeleton.FindBoneIndex(RootBone.BoneName));
for (auto& RootBone : RootBones)
{
AddModifyBone(Output, BoneContainer, RefSkeleton, RefSkeleton.FindBoneIndex(RootBone.BoneName));
}
CalcBoneLength( ModifyBones[0], RefSkeleton.GetRefBonePose());
}

Expand Down Expand Up @@ -677,6 +691,8 @@ void FAnimNode_KawaiiPhysics::ApplySimuateResult(FComponentSpacePoseContext& Out
for (int i = 1; i < ModifyBones.Num(); ++i)
{
FKawaiiPhysicsModifyBone& Bone = ModifyBones[i];

if (Bone.ParentIndex == -1) continue;
FKawaiiPhysicsModifyBone& ParentBone = ModifyBones[Bone.ParentIndex];

if (ParentBone.ChildIndexs.Num() <= 1)
Expand Down
2 changes: 1 addition & 1 deletion Plugins/KawaiiPhysics/Source/KawaiiPhysics/Public/AnimNode_KawaiiPhysics.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ struct KAWAIIPHYSICS_API FAnimNode_KawaiiPhysics : public FAnimNode_SkeletalCont

public:
UPROPERTY(EditAnywhere, Category = ModifyTarget)
FBoneReference RootBone;
TArray<FBoneReference> RootBones;
UPROPERTY(EditAnywhere, Category = ModifyTarget)
TArray<FBoneReference> ExcludeBones;

Expand Down
5 changes: 4 additions & 1 deletion Plugins/KawaiiPhysics/Source/KawaiiPhysicsEd/Private/AnimGraphNode_KawaiiPhysics.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,10 @@ FText UAnimGraphNode_KawaiiPhysics::GetNodeTitle(ENodeTitleType::Type TitleType)
{
FFormatNamedArguments Args;
Args.Add(TEXT("ControllerDescription"), GetControllerDescription());
Args.Add(TEXT("RootBoneName"), FText::FromName(Node.RootBone.BoneName));
for (auto& RootBone : Node.RootBones)
{
Args.Add(TEXT("RootBoneName"), FText::FromName(RootBone.BoneName));
}

// FText::Format() is slow, so we cache this to save on performance
if (TitleType == ENodeTitleType::ListView || TitleType == ENodeTitleType::MenuTitle)
Expand Down