SPARK-inc · wxuefei · Aug 29, 2024
diff --git a/...Plugins/SPCRJointDynamics/Source/SPCRJointDynamics/Private/AnimNode_SPCRJointDynamics.cpp b/...Plugins/SPCRJointDynamics/Source/SPCRJointDynamics/Private/AnimNode_SPCRJointDynamics.cpp
@@ -977,7 +977,6 @@ void FAnimNode_SPCRJointDynamics::UpdateSurfaceCollision(float CollisionSubDelta
 							OutPointOnCollider += ColliderToEndVec * (CEDotCI / LineDot);
 							FVector TowardsCollider = OutPointOnCollider - OutIntersectionPoint;
 							return TowardsCollider.SizeSquared() <= OutRadius * OutRadius;
-							return false;
 						}
 					}
 				}
@@ -1884,7 +1883,7 @@ void FAnimNode_SPCRJointDynamics::DebugDrawConstraints()
 	// 拘束のデバッグ表示
 	if (bDebugDrawConstraints)
 	{
-		FFunctionGraphTask::CreateAndDispatchWhenReady([=]()
+		FFunctionGraphTask::CreateAndDispatchWhenReady([=,this]()
 			{
 				for (int32 iConstraint = 0; iConstraint < _Constraints.Num(); ++iConstraint)
 				{
@@ -1916,7 +1915,7 @@ void FAnimNode_SPCRJointDynamics::DebugDrawSurfaceCollision()
 {
 	if (bDebugDrawSurfaceCollision)
 	{
-		FFunctionGraphTask::CreateAndDispatchWhenReady([=]()
+		FFunctionGraphTask::CreateAndDispatchWhenReady([=, this]()
 			{
 				for (int32 iConstraint = 0; iConstraint < _SurfaceConstraints.Num(); ++iConstraint)
 				{

diff --git a/...ct/Plugins/SPCRJointDynamics/Source/SPCRJointDynamics/Public/AnimNode_SPCRJointDynamics.h b/...ct/Plugins/SPCRJointDynamics/Source/SPCRJointDynamics/Public/AnimNode_SPCRJointDynamics.h
@@ -88,7 +88,7 @@ struct SPCRJOINTDYNAMICS_API FSPCRCurveZero
 	GENERATED_USTRUCT_BODY()
 
 	UPROPERTY(EditAnywhere, Category = Curve)
-	class UCurveFloat* Curve;
+	class UCurveFloat* Curve = nullptr;
 
 	UPROPERTY(EditAnywhere, Category = Curve)
 	float Power = 0.0f;
@@ -382,7 +382,7 @@ struct SPCRJOINTDYNAMICS_API FAnimNode_SPCRJointDynamics : public FAnimNode_Skel
 	TArray<FSPCRJointDynamicsBody> Bodies;
 
 	UPROPERTY(EditAnywhere, Category = Link, meta = (AlwaysAsPin))
-	USPCRJointDynamicsComponent* jointDynamicsComponent;
+	USPCRJointDynamicsComponent* jointDynamicsComponent= nullptr;
 
 	UPROPERTY(EditAnywhere, Category = Limit)
 	bool bLimitAngle = false;

diff --git a/...ject/Plugins/SPCRJointDynamics/Source/SPCRJointDynamicsEd/Private/SPCRJointDynamicsEd.cpp b/...ject/Plugins/SPCRJointDynamics/Source/SPCRJointDynamicsEd/Private/SPCRJointDynamicsEd.cpp
@@ -30,7 +30,8 @@ IMPLEMENT_MODULE(FSPCRJointDynamicsEd, SPCRJointDynamicsEd)
 //======================================================================================
 void FSPCRJointDynamicsEd::StartupModule()
 {
-	FEditorModeRegistry::Get().RegisterMode<SPCRJointDynamics_Editor>(SPCRJointDynamics_Editor::REGISTER_MODE_ID, LOCTEXT("SPCRJointDynamics_Editor", "SPCR Joint Dynamics"), FSlateIcon(), false);
+	FEditorModeRegistry::Get().RegisterMode<SPCRJointDynamics_Editor>(SPCRJointDynamics_Editor::REGISTER_MODE_ID, 
+		LOCTEXT("SPCRJointDynamics_Editor", "SPCR Joint Dynamics"), FSlateIcon(), false);
 }
 
 void FSPCRJointDynamicsEd::ShutdownModule()

diff --git a/...Plugins/SPCRJointDynamics/Source/SPCRJointDynamicsEd/Private/SPCRJointDynamics_Editor.cpp b/...Plugins/SPCRJointDynamics/Source/SPCRJointDynamicsEd/Private/SPCRJointDynamics_Editor.cpp
@@ -317,3 +317,9 @@ FSPCRJointDynamicsBody* SPCRJointDynamics_Editor::GetCurrColliderGraphNode()
 	return &SPCRAnimGraphNode->Node.Bodies[SelectedColliderIndex];
 }
 
+bool SPCRJointDynamics_Editor::SupportsPoseWatch() {
+	return false;
+}
+void SPCRJointDynamics_Editor::RegisterPoseWatchedNode(UAnimGraphNode_Base* InEditorNode, FAnimNode_Base* InRuntimeNode) {
+
+}
diff --git a/...ins/SPCRJointDynamics/Source/SPCRJointDynamicsEd/Private/SPCRJointDynamics_EditorBase.cpp b/...ins/SPCRJointDynamics/Source/SPCRJointDynamicsEd/Private/SPCRJointDynamics_EditorBase.cpp
@@ -18,7 +18,7 @@ IMPLEMENT_HIT_PROXY(HSPCRColliderHitProxy, HHitProxy);
 SPCRJointDynamics_EditorBase::SPCRJointDynamics_EditorBase()
 	:AnimGraphNode(nullptr),
 	RuntimeNode(nullptr),
-	CurrentWidgetMode(FWidget::EWidgetMode::WM_Translate),
+	CurrentWidgetMode(UE::Widget::EWidgetMode::WM_Translate),
 	SelectedColliderIndex(SPCR_INVALID_COLLIDER_INDEX)
 {
 }
@@ -39,20 +39,20 @@ ECoordSystem SPCRJointDynamics_EditorBase::GetWidgetCoordinateSystem() const
 	return ECoordSystem::COORD_None;
 }
 
-FWidget::EWidgetMode SPCRJointDynamics_EditorBase::GetWidgetMode() const
+UE::Widget::EWidgetMode SPCRJointDynamics_EditorBase::GetWidgetMode() const
 {
 	if (IsValidColliderIndex())
 		return CurrentWidgetMode;
 	else
-		return FWidget::EWidgetMode::WM_None;
+		return UE::Widget::EWidgetMode::WM_None;
 }
 
-FWidget::EWidgetMode SPCRJointDynamics_EditorBase::ChangeToNextWidgetMode(FWidget::EWidgetMode CurWidgetMode)
+UE::Widget::EWidgetMode SPCRJointDynamics_EditorBase::ChangeToNextWidgetMode(UE::Widget::EWidgetMode CurWidgetMode)
 {
-	return FWidget::EWidgetMode::WM_None;
+	return UE::Widget::EWidgetMode::WM_None;
 }
 
-bool SPCRJointDynamics_EditorBase::SetWidgetMode(FWidget::EWidgetMode InWidgetMode)
+bool SPCRJointDynamics_EditorBase::SetWidgetMode(UE::Widget::EWidgetMode InWidgetMode)
 {
 	if (AnimGraphNode != nullptr)
 	{
@@ -166,15 +166,15 @@ bool SPCRJointDynamics_EditorBase::HandleClick(FEditorViewportClient* InViewport
 		if (spcrColliderHitProxy != nullptr)
 		{
 			SelectedColliderIndex = spcrColliderHitProxy->ColliderIndex;
-			CurrentWidgetMode = FWidget::EWidgetMode::WM_Translate;
+			CurrentWidgetMode = UE::Widget::EWidgetMode::WM_Translate;
 			isValid = true;
 		}
 	}
 
 	if(!isValid)
 	{
 		SelectedColliderIndex = SPCR_INVALID_COLLIDER_INDEX;
-		CurrentWidgetMode = FWidget::EWidgetMode::WM_None;
+		CurrentWidgetMode = UE::Widget::EWidgetMode::WM_None;
 	}
 
 	SetWidgetMode(CurrentWidgetMode);
@@ -188,13 +188,13 @@ bool SPCRJointDynamics_EditorBase::InputDelta(FEditorViewportClient* InViewportC
 
 	if (IsValidColliderIndex() && CurrentAxis != EAxisList::Type::None)
 	{
-		const FWidget::EWidgetMode WidgetMode = InViewportClient->GetWidgetMode();
+		const UE::Widget::EWidgetMode WidgetMode = InViewportClient->GetWidgetMode();
 
-		if (WidgetMode != FWidget::EWidgetMode::WM_None)
+		if (WidgetMode != UE::Widget::EWidgetMode::WM_None)
 		{
-			const bool IsTranslate = WidgetMode == FWidget::EWidgetMode::WM_Translate;
-			const bool IsRotation = WidgetMode == FWidget::EWidgetMode::WM_Rotate;
-			const bool IsScale = WidgetMode == FWidget::EWidgetMode::WM_Scale;
+			const bool IsTranslate = WidgetMode == UE::Widget::EWidgetMode::WM_Translate;
+			const bool IsRotation = WidgetMode == UE::Widget::EWidgetMode::WM_Rotate;
+			const bool IsScale = WidgetMode == UE::Widget::EWidgetMode::WM_Scale;
 
 			if (IsTranslate)
 			{

diff --git a/...ct/Plugins/SPCRJointDynamics/Source/SPCRJointDynamicsEd/Public/SPCRJointDynamics_Editor.h b/...ct/Plugins/SPCRJointDynamics/Source/SPCRJointDynamicsEd/Public/SPCRJointDynamics_Editor.h
@@ -46,6 +46,9 @@ class SPCRJOINTDYNAMICSED_API SPCRJointDynamics_Editor : public SPCRJointDynamic
 	virtual bool GetCustomDrawingCoordinateSystem(FMatrix& InMatrix, void* InData) override;
 	virtual void DrawHUD(FEditorViewportClient* ViewportClient, FViewport* Viewport, const FSceneView* View, FCanvas* Canvas) override;
 
+	virtual bool SupportsPoseWatch();
+	virtual void RegisterPoseWatchedNode(UAnimGraphNode_Base* InEditorNode, FAnimNode_Base* InRuntimeNode);
+
 private:
 	void RenderCapculeColliders(FPrimitiveDrawInterface* PDI, FSPCRJointDynamicsBody& OutCollider, const int ColliderIndex, const FTransform& BoneTransform, const float Radius, const float Height);
 	void RenderSphereColliders(FPrimitiveDrawInterface* PDI, FSPCRJointDynamicsBody& OutCollider, const int ColliderIndex, const FTransform& BoneTransform, const float Radius);

diff --git a/...lugins/SPCRJointDynamics/Source/SPCRJointDynamicsEd/Public/SPCRJointDynamics_EditorBase.h b/...lugins/SPCRJointDynamics/Source/SPCRJointDynamicsEd/Public/SPCRJointDynamics_EditorBase.h
@@ -51,9 +51,9 @@ class SPCRJOINTDYNAMICSED_API SPCRJointDynamics_EditorBase : public IAnimNodeEdi
 
 	//--------------IAnimNodeEditMode interface
 	virtual ECoordSystem GetWidgetCoordinateSystem() const override;
-	virtual FWidget::EWidgetMode GetWidgetMode() const override;
-	virtual FWidget::EWidgetMode ChangeToNextWidgetMode(FWidget::EWidgetMode CurWidgetMode) override;
-	virtual bool SetWidgetMode(FWidget::EWidgetMode InWidgetMode) override;
+	virtual UE::Widget::EWidgetMode GetWidgetMode() const override;
+	virtual UE::Widget::EWidgetMode ChangeToNextWidgetMode(UE::Widget::EWidgetMode CurWidgetMode) override;
+	virtual bool SetWidgetMode(UE::Widget::EWidgetMode InWidgetMode) override;
 	virtual FName GetSelectedBone() const override;
 	virtual void DoTranslation(FVector& InTranslation) override;
 	virtual void DoRotation(FRotator& InRotation) override;
@@ -86,7 +86,7 @@ class SPCRJOINTDYNAMICSED_API SPCRJointDynamics_EditorBase : public IAnimNodeEdi
 	class UAnimGraphNode_Base* AnimGraphNode;
 	struct FAnimNode_Base* RuntimeNode;
 
-	FWidget::EWidgetMode CurrentWidgetMode;
+	UE::Widget::EWidgetMode CurrentWidgetMode;
 
 	int SelectedColliderIndex;
 };
diff --git a/MyProject/Plugins/SPCRJointDynamics/Source/SPCRJointDynamicsEd/SPCRJointDynamicsEd.Build.cs b/MyProject/Plugins/SPCRJointDynamics/Source/SPCRJointDynamicsEd/SPCRJointDynamicsEd.Build.cs
@@ -28,6 +28,8 @@ public SPCRJointDynamicsEd(ReadOnlyTargetRules Target) : base(Target)
             "Engine",
             "InputCore",
             "SPCRJointDynamics",
+            "AnimationEditMode",
+            "EditorFramework"
         });
         PublicDependencyModuleNames.AddRange(new string[] {
             "Core",