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

4.22: fixed compile errors #9

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

4.22: fixed compile errors #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
118 changes: 54 additions & 64 deletions IKDemo.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,20 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
# Visual Studio 15
VisualStudioVersion = 15.0.25807.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Engine", "Engine", "{5CCC8CDF-14A9-4578-8D3D-56004EECFC73}"
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Engine", "Engine", "{83F2CE1D-0C7F-4AB1-892E-65EB4D55C515}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Games", "Games", "{A055AC74-B3E0-438F-A353-B3D72A13A5DD}"
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Games", "Games", "{C0924C14-69DB-41A6-BFB4-81E5C2B338E9}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UE4", "Intermediate\ProjectFiles\UE4.vcxproj", "{E16070D8-1034-4BB0-9A8A-D99907C06FCC}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IKDemo", "Intermediate\ProjectFiles\IKDemo.vcxproj", "{0AF26342-D869-4FD1-89C1-6EEA0AF1DB2E}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IKDemo", "Intermediate\ProjectFiles\IKDemo.vcxproj", "{148AC403-810C-4DA7-AF13-CA45F16D3460}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UE4", "Intermediate\ProjectFiles\UE4.vcxproj", "{6C6326EC-1804-4FEF-B999-06775E2C990A}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Visualizers", "Visualizers", "{C9A29A60-3554-45A5-A78F-3F49A5C6AD0A}"
ProjectSection(SolutionItems) = preProject
E:\Epic Games\UE_4.22\Engine\Extras\VisualStudioDebugging\UE4.natvis = E:\Epic Games\UE_4.22\Engine\Extras\VisualStudioDebugging\UE4.natvis
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand All @@ -30,68 +35,53 @@ Global
Shipping|Win64 = Shipping|Win64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{E16070D8-1034-4BB0-9A8A-D99907C06FCC}.DebugGame Editor|HTML5.ActiveCfg = BuiltWithUnrealBuildTool|Win32
{E16070D8-1034-4BB0-9A8A-D99907C06FCC}.DebugGame Editor|HTML5.Build.0 = BuiltWithUnrealBuildTool|Win32
{E16070D8-1034-4BB0-9A8A-D99907C06FCC}.DebugGame Editor|Win32.ActiveCfg = BuiltWithUnrealBuildTool|Win32
{E16070D8-1034-4BB0-9A8A-D99907C06FCC}.DebugGame Editor|Win32.Build.0 = BuiltWithUnrealBuildTool|Win32
{E16070D8-1034-4BB0-9A8A-D99907C06FCC}.DebugGame Editor|Win64.ActiveCfg = BuiltWithUnrealBuildTool|Win32
{E16070D8-1034-4BB0-9A8A-D99907C06FCC}.DebugGame Editor|Win64.Build.0 = BuiltWithUnrealBuildTool|Win32
{E16070D8-1034-4BB0-9A8A-D99907C06FCC}.DebugGame|HTML5.ActiveCfg = BuiltWithUnrealBuildTool|Win32
{E16070D8-1034-4BB0-9A8A-D99907C06FCC}.DebugGame|HTML5.Build.0 = BuiltWithUnrealBuildTool|Win32
{E16070D8-1034-4BB0-9A8A-D99907C06FCC}.DebugGame|Win32.ActiveCfg = BuiltWithUnrealBuildTool|Win32
{E16070D8-1034-4BB0-9A8A-D99907C06FCC}.DebugGame|Win32.Build.0 = BuiltWithUnrealBuildTool|Win32
{E16070D8-1034-4BB0-9A8A-D99907C06FCC}.DebugGame|Win64.ActiveCfg = BuiltWithUnrealBuildTool|Win32
{E16070D8-1034-4BB0-9A8A-D99907C06FCC}.DebugGame|Win64.Build.0 = BuiltWithUnrealBuildTool|Win32
{E16070D8-1034-4BB0-9A8A-D99907C06FCC}.Development Editor|HTML5.ActiveCfg = BuiltWithUnrealBuildTool|Win32
{E16070D8-1034-4BB0-9A8A-D99907C06FCC}.Development Editor|HTML5.Build.0 = BuiltWithUnrealBuildTool|Win32
{E16070D8-1034-4BB0-9A8A-D99907C06FCC}.Development Editor|Win32.ActiveCfg = BuiltWithUnrealBuildTool|Win32
{E16070D8-1034-4BB0-9A8A-D99907C06FCC}.Development Editor|Win32.Build.0 = BuiltWithUnrealBuildTool|Win32
{E16070D8-1034-4BB0-9A8A-D99907C06FCC}.Development Editor|Win64.ActiveCfg = BuiltWithUnrealBuildTool|Win32
{E16070D8-1034-4BB0-9A8A-D99907C06FCC}.Development Editor|Win64.Build.0 = BuiltWithUnrealBuildTool|Win32
{E16070D8-1034-4BB0-9A8A-D99907C06FCC}.Development|HTML5.ActiveCfg = BuiltWithUnrealBuildTool|Win32
{E16070D8-1034-4BB0-9A8A-D99907C06FCC}.Development|HTML5.Build.0 = BuiltWithUnrealBuildTool|Win32
{E16070D8-1034-4BB0-9A8A-D99907C06FCC}.Development|Win32.ActiveCfg = BuiltWithUnrealBuildTool|Win32
{E16070D8-1034-4BB0-9A8A-D99907C06FCC}.Development|Win32.Build.0 = BuiltWithUnrealBuildTool|Win32
{E16070D8-1034-4BB0-9A8A-D99907C06FCC}.Development|Win64.ActiveCfg = BuiltWithUnrealBuildTool|Win32
{E16070D8-1034-4BB0-9A8A-D99907C06FCC}.Development|Win64.Build.0 = BuiltWithUnrealBuildTool|Win32
{E16070D8-1034-4BB0-9A8A-D99907C06FCC}.Shipping|HTML5.ActiveCfg = BuiltWithUnrealBuildTool|Win32
{E16070D8-1034-4BB0-9A8A-D99907C06FCC}.Shipping|HTML5.Build.0 = BuiltWithUnrealBuildTool|Win32
{E16070D8-1034-4BB0-9A8A-D99907C06FCC}.Shipping|Win32.ActiveCfg = BuiltWithUnrealBuildTool|Win32
{E16070D8-1034-4BB0-9A8A-D99907C06FCC}.Shipping|Win32.Build.0 = BuiltWithUnrealBuildTool|Win32
{E16070D8-1034-4BB0-9A8A-D99907C06FCC}.Shipping|Win64.ActiveCfg = BuiltWithUnrealBuildTool|Win32
{E16070D8-1034-4BB0-9A8A-D99907C06FCC}.Shipping|Win64.Build.0 = BuiltWithUnrealBuildTool|Win32
{148AC403-810C-4DA7-AF13-CA45F16D3460}.DebugGame Editor|HTML5.ActiveCfg = HTML5_DebugGame_Editor|Win32
{148AC403-810C-4DA7-AF13-CA45F16D3460}.DebugGame Editor|Win32.ActiveCfg = DebugGame_Editor|Win32
{148AC403-810C-4DA7-AF13-CA45F16D3460}.DebugGame Editor|Win64.ActiveCfg = DebugGame_Editor|x64
{148AC403-810C-4DA7-AF13-CA45F16D3460}.DebugGame Editor|Win64.Build.0 = DebugGame_Editor|x64
{148AC403-810C-4DA7-AF13-CA45F16D3460}.DebugGame|HTML5.ActiveCfg = HTML5_DebugGame_Game|Win32
{148AC403-810C-4DA7-AF13-CA45F16D3460}.DebugGame|HTML5.Build.0 = HTML5_DebugGame_Game|Win32
{148AC403-810C-4DA7-AF13-CA45F16D3460}.DebugGame|Win32.ActiveCfg = DebugGame_Game|Win32
{148AC403-810C-4DA7-AF13-CA45F16D3460}.DebugGame|Win32.Build.0 = DebugGame_Game|Win32
{148AC403-810C-4DA7-AF13-CA45F16D3460}.DebugGame|Win64.ActiveCfg = DebugGame_Game|x64
{148AC403-810C-4DA7-AF13-CA45F16D3460}.DebugGame|Win64.Build.0 = DebugGame_Game|x64
{148AC403-810C-4DA7-AF13-CA45F16D3460}.Development Editor|HTML5.ActiveCfg = HTML5_Development_Editor|Win32
{148AC403-810C-4DA7-AF13-CA45F16D3460}.Development Editor|Win32.ActiveCfg = Development_Editor|Win32
{148AC403-810C-4DA7-AF13-CA45F16D3460}.Development Editor|Win64.ActiveCfg = Development_Editor|x64
{148AC403-810C-4DA7-AF13-CA45F16D3460}.Development Editor|Win64.Build.0 = Development_Editor|x64
{148AC403-810C-4DA7-AF13-CA45F16D3460}.Development|HTML5.ActiveCfg = HTML5_Development_Game|Win32
{148AC403-810C-4DA7-AF13-CA45F16D3460}.Development|HTML5.Build.0 = HTML5_Development_Game|Win32
{148AC403-810C-4DA7-AF13-CA45F16D3460}.Development|Win32.ActiveCfg = Development_Game|Win32
{148AC403-810C-4DA7-AF13-CA45F16D3460}.Development|Win32.Build.0 = Development_Game|Win32
{148AC403-810C-4DA7-AF13-CA45F16D3460}.Development|Win64.ActiveCfg = Development_Game|x64
{148AC403-810C-4DA7-AF13-CA45F16D3460}.Development|Win64.Build.0 = Development_Game|x64
{148AC403-810C-4DA7-AF13-CA45F16D3460}.Shipping|HTML5.ActiveCfg = HTML5_Shipping_Game|Win32
{148AC403-810C-4DA7-AF13-CA45F16D3460}.Shipping|HTML5.Build.0 = HTML5_Shipping_Game|Win32
{148AC403-810C-4DA7-AF13-CA45F16D3460}.Shipping|Win32.ActiveCfg = Shipping_Game|Win32
{148AC403-810C-4DA7-AF13-CA45F16D3460}.Shipping|Win32.Build.0 = Shipping_Game|Win32
{148AC403-810C-4DA7-AF13-CA45F16D3460}.Shipping|Win64.ActiveCfg = Shipping_Game|x64
{148AC403-810C-4DA7-AF13-CA45F16D3460}.Shipping|Win64.Build.0 = Shipping_Game|x64
{0AF26342-D869-4FD1-89C1-6EEA0AF1DB2E}.DebugGame Editor|HTML5.ActiveCfg = Invalid|Win32
{0AF26342-D869-4FD1-89C1-6EEA0AF1DB2E}.DebugGame Editor|Win32.ActiveCfg = Invalid|Win32
{0AF26342-D869-4FD1-89C1-6EEA0AF1DB2E}.DebugGame Editor|Win64.ActiveCfg = DebugGame_Editor|x64
{0AF26342-D869-4FD1-89C1-6EEA0AF1DB2E}.DebugGame Editor|Win64.Build.0 = DebugGame_Editor|x64
{0AF26342-D869-4FD1-89C1-6EEA0AF1DB2E}.DebugGame|HTML5.ActiveCfg = HTML5_DebugGame|Win32
{0AF26342-D869-4FD1-89C1-6EEA0AF1DB2E}.DebugGame|HTML5.Build.0 = HTML5_DebugGame|Win32
{0AF26342-D869-4FD1-89C1-6EEA0AF1DB2E}.DebugGame|Win32.ActiveCfg = DebugGame|Win32
{0AF26342-D869-4FD1-89C1-6EEA0AF1DB2E}.DebugGame|Win32.Build.0 = DebugGame|Win32
{0AF26342-D869-4FD1-89C1-6EEA0AF1DB2E}.DebugGame|Win64.ActiveCfg = DebugGame|x64
{0AF26342-D869-4FD1-89C1-6EEA0AF1DB2E}.DebugGame|Win64.Build.0 = DebugGame|x64
{0AF26342-D869-4FD1-89C1-6EEA0AF1DB2E}.Development Editor|HTML5.ActiveCfg = Invalid|Win32
{0AF26342-D869-4FD1-89C1-6EEA0AF1DB2E}.Development Editor|Win32.ActiveCfg = Invalid|Win32
{0AF26342-D869-4FD1-89C1-6EEA0AF1DB2E}.Development Editor|Win64.ActiveCfg = Development_Editor|x64
{0AF26342-D869-4FD1-89C1-6EEA0AF1DB2E}.Development Editor|Win64.Build.0 = Development_Editor|x64
{0AF26342-D869-4FD1-89C1-6EEA0AF1DB2E}.Development|HTML5.ActiveCfg = HTML5_Development|Win32
{0AF26342-D869-4FD1-89C1-6EEA0AF1DB2E}.Development|HTML5.Build.0 = HTML5_Development|Win32
{0AF26342-D869-4FD1-89C1-6EEA0AF1DB2E}.Development|Win32.ActiveCfg = Development|Win32
{0AF26342-D869-4FD1-89C1-6EEA0AF1DB2E}.Development|Win32.Build.0 = Development|Win32
{0AF26342-D869-4FD1-89C1-6EEA0AF1DB2E}.Development|Win64.ActiveCfg = Development|x64
{0AF26342-D869-4FD1-89C1-6EEA0AF1DB2E}.Development|Win64.Build.0 = Development|x64
{0AF26342-D869-4FD1-89C1-6EEA0AF1DB2E}.Shipping|HTML5.ActiveCfg = HTML5_Shipping|Win32
{0AF26342-D869-4FD1-89C1-6EEA0AF1DB2E}.Shipping|HTML5.Build.0 = HTML5_Shipping|Win32
{0AF26342-D869-4FD1-89C1-6EEA0AF1DB2E}.Shipping|Win32.ActiveCfg = Shipping|Win32
{0AF26342-D869-4FD1-89C1-6EEA0AF1DB2E}.Shipping|Win32.Build.0 = Shipping|Win32
{0AF26342-D869-4FD1-89C1-6EEA0AF1DB2E}.Shipping|Win64.ActiveCfg = Shipping|x64
{0AF26342-D869-4FD1-89C1-6EEA0AF1DB2E}.Shipping|Win64.Build.0 = Shipping|x64
{6C6326EC-1804-4FEF-B999-06775E2C990A}.DebugGame Editor|HTML5.ActiveCfg = BuiltWithUnrealBuildTool|Win32
{6C6326EC-1804-4FEF-B999-06775E2C990A}.DebugGame Editor|Win32.ActiveCfg = BuiltWithUnrealBuildTool|Win32
{6C6326EC-1804-4FEF-B999-06775E2C990A}.DebugGame Editor|Win64.ActiveCfg = BuiltWithUnrealBuildTool|Win32
{6C6326EC-1804-4FEF-B999-06775E2C990A}.DebugGame|HTML5.ActiveCfg = BuiltWithUnrealBuildTool|Win32
{6C6326EC-1804-4FEF-B999-06775E2C990A}.DebugGame|Win32.ActiveCfg = BuiltWithUnrealBuildTool|Win32
{6C6326EC-1804-4FEF-B999-06775E2C990A}.DebugGame|Win64.ActiveCfg = BuiltWithUnrealBuildTool|Win32
{6C6326EC-1804-4FEF-B999-06775E2C990A}.Development Editor|HTML5.ActiveCfg = BuiltWithUnrealBuildTool|Win32
{6C6326EC-1804-4FEF-B999-06775E2C990A}.Development Editor|Win32.ActiveCfg = BuiltWithUnrealBuildTool|Win32
{6C6326EC-1804-4FEF-B999-06775E2C990A}.Development Editor|Win64.ActiveCfg = BuiltWithUnrealBuildTool|Win32
{6C6326EC-1804-4FEF-B999-06775E2C990A}.Development|HTML5.ActiveCfg = BuiltWithUnrealBuildTool|Win32
{6C6326EC-1804-4FEF-B999-06775E2C990A}.Development|Win32.ActiveCfg = BuiltWithUnrealBuildTool|Win32
{6C6326EC-1804-4FEF-B999-06775E2C990A}.Development|Win64.ActiveCfg = BuiltWithUnrealBuildTool|Win32
{6C6326EC-1804-4FEF-B999-06775E2C990A}.Shipping|HTML5.ActiveCfg = BuiltWithUnrealBuildTool|Win32
{6C6326EC-1804-4FEF-B999-06775E2C990A}.Shipping|Win32.ActiveCfg = BuiltWithUnrealBuildTool|Win32
{6C6326EC-1804-4FEF-B999-06775E2C990A}.Shipping|Win64.ActiveCfg = BuiltWithUnrealBuildTool|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{E16070D8-1034-4BB0-9A8A-D99907C06FCC} = {5CCC8CDF-14A9-4578-8D3D-56004EECFC73}
{148AC403-810C-4DA7-AF13-CA45F16D3460} = {A055AC74-B3E0-438F-A353-B3D72A13A5DD}
{6C6326EC-1804-4FEF-B999-06775E2C990A} = {83F2CE1D-0C7F-4AB1-892E-65EB4D55C515}
{0AF26342-D869-4FD1-89C1-6EEA0AF1DB2E} = {C0924C14-69DB-41A6-BFB4-81E5C2B338E9}
EndGlobalSection
EndGlobal
2 changes: 1 addition & 1 deletion IKDemo.uproject
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"FileVersion": 3,
"EngineAssociation": "4.20",
"EngineAssociation": "4.22",
"Category": "",
"Description": "",
"Modules": [
Expand Down
2 changes: 1 addition & 1 deletion Plugins/rtik/Source/rtik/Public/IK/AnimNode_HumanoidArmTorsoAdjust.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,6 @@ struct RTIK_API FAnimNode_HumanoidArmTorsoAdjust : public FAnimNode_SkeletalCont
:
Mode(EHumanoidArmTorsoIKMode::IK_Human_ArmTorso_Disabled),
bEnableDebugDraw(false),
DeltaTime(0.0f),
Precision(0.001f),
MaxIterations(10),
bEnable(true),
Expand All @@ -189,6 +188,7 @@ struct RTIK_API FAnimNode_HumanoidArmTorsoAdjust : public FAnimNode_SkeletalCont
LeftArmWorldTarget(FVector(0.0f, 0.0f, 0.0f)),
RightArmWorldTarget(FVector(0.0f, 0.0f, 0.0f)),
EffectorRotationSource(EBoneRotationSource::BRS_KeepComponentSpaceRotation),
DeltaTime(0.0f),
LastEffectorOffset(0.0f, 0.0f, 0.0f),
LastRotationOffset(FQuat::Identity)
{ }
Expand Down
6 changes: 3 additions & 3 deletions Plugins/rtik/Source/rtik/Public/IK/AnimNode_HumanoidFootRotationController.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,11 @@ struct RTIK_API FAnimNode_HumanoidFootRotationController : public FAnimNode_Skel

FAnimNode_HumanoidFootRotationController()
:
RotationSlerpSpeed(20.0f),
bInterpolateRotation(true),
bEnableDebugDraw(false),
DeltaTime(0.0f),
LastRotationOffset(FQuat::Identity),
RotationSlerpSpeed(20.0f),
bInterpolateRotation(true)
LastRotationOffset(FQuat::Identity)
{ }

// FAnimNode_SkeletalControlBase Interface
Expand Down
4 changes: 2 additions & 2 deletions Plugins/rtik/Source/rtik/Public/IK/AnimNode_HumanoidLegIK.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,9 +116,8 @@ struct RTIK_API FAnimNode_HumanoidLegIK : public FAnimNode_SkeletalControlBase

FAnimNode_HumanoidLegIK()
:
bEnableDebugDraw(false),
DeltaTime(0.0f),
FootTargetWorld(FVector(0.0f, 0.0f, 0.0f)),
bEnableDebugDraw(false),
Precision(0.001f),
MaxIterations(10),
bEnable(true),
Expand All @@ -127,6 +126,7 @@ struct RTIK_API FAnimNode_HumanoidLegIK : public FAnimNode_SkeletalControlBase
EffectorRotationSource(EBoneRotationSource::BRS_KeepComponentSpaceRotation),
EffectorVelocity(300.0f),
bEffectorMovesInstantly(false),
DeltaTime(0.0f),
LastEffectorOffset(0.0f, 0.0f, 0.0f)
{ }

Expand Down
6 changes: 3 additions & 3 deletions Plugins/rtik/Source/rtik/Public/IK/AnimNode_HumanoidPelvisHeightAdjustment.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,11 +61,11 @@ struct RTIK_API FAnimNode_HumanoidPelvisHeightAdjustment : public FAnimNode_Skel

FAnimNode_HumanoidPelvisHeightAdjustment()
:
DeltaTime(0.0f),
LastPelvisOffset(0.0f, 0.0f, 0.0f),
PelvisAdjustVelocity(150.0f),
MaxPelvisAdjustSize(50.0),
bEnableDebugDraw(false)
bEnableDebugDraw(false),
DeltaTime(0.0f),
LastPelvisOffset(0.0f, 0.0f, 0.0f)
{ }

// FAnimNode_SkeletalControlBase Interface
Expand Down
4 changes: 2 additions & 2 deletions Plugins/rtik/Source/rtik/Public/IK/AnimNode_IKHumanoidLegTrace.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ struct RTIK_API FAnimNode_IKHumanoidLegTrace : public FAnimNode_SkeletalControlB

FAnimNode_IKHumanoidLegTrace()
:
bEnableDebugDraw(false),
MaxPelvisAdjustSize(40.0f)
MaxPelvisAdjustSize(40.0f),
bEnableDebugDraw(false)
{ }

protected:
Expand Down
4 changes: 2 additions & 2 deletions Plugins/rtik/Source/rtik/Public/IK/HumanoidIK.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ struct RTIK_API FHumanoidLegChain : public FIKModChain
:
FootRadius(10.0f),
ToeRadius(5.0f),
TotalChainLength(0.0f),
MaxFootRotationDegrees(30.0f),
bInitOk(false),
MaxFootRotationDegrees(30.0f)
TotalChainLength(0.0f)
{ }

// Distance between the bottom of the shin bone and the bottom surface of the foot
Expand Down