limb spacing

Author: turanszkij

Content/Documentation/ScriptingAPI-Documentation.md

@@ -1528,6 +1528,10 @@ Describes a Collider object.
 - SetRagdollHeadSize(float value) -- Control the overall size of the ragdoll head (default: 1)
 - GetRagdollFatness() : float
 - GetRagdollHeadSize() : float
+- SetArmSpacing(float value) -- dynamically modify arm spacing after animation (negative: pull together, positive: push apart)
+- GetArmSpacing() : float
+- SetLegSpacing(float value) -- dynamically modify leg spacing after animation (negative: pull together, positive: push apart)
+- GetLegSpacing() : float
 
 ```lua
 [outer] HumanoidBone = {
@@ -1542,11 +1546,11 @@ Describes a Collider object.
 	Jaw = 8,
 	LeftUpperLeg = 9,	-- included in ragdoll
 	LeftLowerLeg = 10,	-- included in ragdoll
-	LeftFoot = 11,
+	LeftFoot = 11,		-- included in ragdoll
 	LeftToes = 12,
 	RightUpperLeg = 13,	-- included in ragdoll
 	RightLowerLeg = 14,	-- included in ragdoll
-	RightFoot = 15,
+	RightFoot = 15,		-- included in ragdoll
 	RightToes = 16,
 	LeftShoulder = 17,
 	LeftUpperArm = 18,	-- included in ragdoll

Editor/HumanoidWindow.cpp

@@ -149,6 +149,20 @@ void HumanoidWindow::Create(EditorComponent* _editor)
 	}));
 	AddWidget(&ragdollHeadSizeSlider);
 
+	armSpacingSlider.Create(-1, 1, 0, 100, "Arm spacing: ");
+	armSpacingSlider.SetTooltip("Adjust distance between arms.");
+	armSpacingSlider.OnSlide(forEachSelected([](auto humanoid, auto args) {
+		humanoid->arm_spacing = args.fValue;
+	}));
+	AddWidget(&armSpacingSlider);
+
+	legSpacingSlider.Create(-1, 1, 0, 100, "Leg spacing: ");
+	legSpacingSlider.SetTooltip("Adjust distance between legs.");
+	legSpacingSlider.OnSlide(forEachSelected([](auto humanoid, auto args) {
+		humanoid->leg_spacing = args.fValue;
+	}));
+	AddWidget(&legSpacingSlider);
+
 	boneList.Create("Bones: ");
 	boneList.OnSelect([&](wi::gui::EventArgs args) {
 
@@ -314,6 +328,8 @@ void HumanoidWindow::SetEntity(Entity entity)
 			eyeRotSpeedSlider.SetValue(humanoid->eye_rotation_speed);
 			ragdollFatnessSlider.SetValue(humanoid->ragdoll_fatness);
 			ragdollHeadSizeSlider.SetValue(humanoid->ragdoll_headsize);
+			armSpacingSlider.SetValue(humanoid->arm_spacing);
+			legSpacingSlider.SetValue(humanoid->leg_spacing);
 
 			Entity bone = humanoid->bones[size_t(HumanoidComponent::HumanoidBone::Head)];
 			const TransformComponent* transform = scene.transforms.GetComponent(bone);
@@ -597,6 +613,8 @@ void HumanoidWindow::ResizeLayout()
 	layout.add(headSizeSlider);
 	layout.add(ragdollFatnessSlider);
 	layout.add(ragdollHeadSizeSlider);
+	layout.add(armSpacingSlider);
+	layout.add(legSpacingSlider);
 
 	layout.jump();
 

Editor/HumanoidWindow.h

@@ -28,6 +28,8 @@ class HumanoidWindow : public wi::gui::Window
 	wi::gui::Slider headSizeSlider;
 	wi::gui::Slider ragdollFatnessSlider;
 	wi::gui::Slider ragdollHeadSizeSlider;
+	wi::gui::Slider armSpacingSlider;
+	wi::gui::Slider legSpacingSlider;
 	wi::gui::TreeList boneList;
 
 	void ResizeLayout() override;

WickedEngine/wiScene.cpp

@@ -3490,6 +3490,8 @@ namespace wi::scene
 			}
 		});
 
+		wi::jobsystem::Wait(ctx); // sync needed when there is IK on character arm/leg, and also arm/leg spacing!
+
 		wi::jobsystem::Dispatch(ctx, (uint32_t)humanoids.GetCount(), 1, [this, &recompute_hierarchy](wi::jobsystem::JobArgs args) {
 			Entity humanoidEntity = humanoids.GetEntity(args.jobIndex);
 			HumanoidComponent& humanoid = humanoids[args.jobIndex];
@@ -3614,6 +3616,35 @@ namespace wi::scene
 
 				}
 			}
+
+			if (humanoid.arm_spacing != 0.0f)
+			{
+				recompute_hierarchy.store(true);
+				size_t left_arm = transforms.GetIndex(humanoid.bones[(size_t)HumanoidComponent::HumanoidBone::LeftUpperArm]);
+				size_t right_arm = transforms.GetIndex(humanoid.bones[(size_t)HumanoidComponent::HumanoidBone::RightUpperArm]);
+				if (left_arm != ~0ull)
+				{
+					transforms_temp[left_arm].Rotate(XMQuaternionRotationNormal(FORWARD, -humanoid.arm_spacing * XM_PIDIV4));
+				}
+				if (right_arm != ~0ull)
+				{
+					transforms_temp[right_arm].Rotate(XMQuaternionRotationNormal(FORWARD, humanoid.arm_spacing * XM_PIDIV4));
+				}
+			}
+			if (humanoid.leg_spacing != 0.0f)
+			{
+				recompute_hierarchy.store(true);
+				size_t left_leg = transforms.GetIndex(humanoid.bones[(size_t)HumanoidComponent::HumanoidBone::LeftUpperLeg]);
+				size_t right_leg = transforms.GetIndex(humanoid.bones[(size_t)HumanoidComponent::HumanoidBone::RightUpperLeg]);
+				if (left_leg != ~0ull)
+				{
+					transforms_temp[left_leg].Rotate(XMQuaternionRotationNormal(FORWARD, -humanoid.leg_spacing * XM_PIDIV4));
+				}
+				if (right_leg != ~0ull)
+				{
+					transforms_temp[right_leg].Rotate(XMQuaternionRotationNormal(FORWARD, humanoid.leg_spacing * XM_PIDIV4));
+				}
+			}
 		});
 
 		wi::jobsystem::Wait(ctx);

WickedEngine/wiScene.h

@@ -56,7 +56,7 @@ namespace wi::scene
 		wi::ecs::ComponentManager<ColliderComponent>& colliders = componentLibrary.Register<ColliderComponent>("wi::scene::Scene::colliders", 2); // version = 2
 		wi::ecs::ComponentManager<ScriptComponent>& scripts = componentLibrary.Register<ScriptComponent>("wi::scene::Scene::scripts");
 		wi::ecs::ComponentManager<ExpressionComponent>& expressions = componentLibrary.Register<ExpressionComponent>("wi::scene::Scene::expressions");
-		wi::ecs::ComponentManager<HumanoidComponent>& humanoids = componentLibrary.Register<HumanoidComponent>("wi::scene::Scene::humanoids", 2); // version = 2
+		wi::ecs::ComponentManager<HumanoidComponent>& humanoids = componentLibrary.Register<HumanoidComponent>("wi::scene::Scene::humanoids", 3); // version = 3
 		wi::ecs::ComponentManager<wi::terrain::Terrain>& terrains = componentLibrary.Register<wi::terrain::Terrain>("wi::scene::Scene::terrains", 5); // version = 5
 		wi::ecs::ComponentManager<wi::Sprite>& sprites = componentLibrary.Register<wi::Sprite>("wi::scene::Scene::sprites", 2); // version = 2
 		wi::ecs::ComponentManager<wi::SpriteFont>& fonts = componentLibrary.Register<wi::SpriteFont>("wi::scene::Scene::fonts");

WickedEngine/wiScene_BindLua.cpp

@@ -7506,6 +7506,10 @@ Luna<HumanoidComponent_BindLua>::FunctionType HumanoidComponent_BindLua::methods
 	lunamethod(HumanoidComponent_BindLua, SetRagdollHeadSize),
 	lunamethod(HumanoidComponent_BindLua, GetRagdollFatness),
 	lunamethod(HumanoidComponent_BindLua, GetRagdollHeadSize),
+	lunamethod(HumanoidComponent_BindLua, SetArmSpacing),
+	lunamethod(HumanoidComponent_BindLua, GetArmSpacing),
+	lunamethod(HumanoidComponent_BindLua, SetLegSpacing),
+	lunamethod(HumanoidComponent_BindLua, GetLegSpacing),
 	{ NULL, NULL }
 };
 Luna<HumanoidComponent_BindLua>::PropertyType HumanoidComponent_BindLua::properties[] = {
@@ -7643,6 +7647,42 @@ int HumanoidComponent_BindLua::GetRagdollHeadSize(lua_State* L)
 	wi::lua::SSetFloat(L, component->ragdoll_headsize);
 	return 1;
 }
+int HumanoidComponent_BindLua::SetArmSpacing(lua_State* L)
+{
+	int argc = wi::lua::SGetArgCount(L);
+	if (argc > 0)
+	{
+		component->arm_spacing = wi::lua::SGetFloat(L, 1);
+	}
+	else
+	{
+		wi::lua::SError(L, "SetArmSpacing(float value) not enough arguments!");
+	}
+	return 0;
+}
+int HumanoidComponent_BindLua::GetArmSpacing(lua_State* L)
+{
+	wi::lua::SSetFloat(L, component->arm_spacing);
+	return 1;
+}
+int HumanoidComponent_BindLua::SetLegSpacing(lua_State* L)
+{
+	int argc = wi::lua::SGetArgCount(L);
+	if (argc > 0)
+	{
+		component->leg_spacing = wi::lua::SGetFloat(L, 1);
+	}
+	else
+	{
+		wi::lua::SError(L, "SetLegSpacing(float value) not enough arguments!");
+	}
+	return 0;
+}
+int HumanoidComponent_BindLua::GetLegSpacing(lua_State* L)
+{
+	wi::lua::SSetFloat(L, component->leg_spacing);
+	return 1;
+}
 
 
 

WickedEngine/wiScene_BindLua.h

@@ -1870,6 +1870,10 @@ namespace wi::lua::scene
 		int SetRagdollHeadSize(lua_State* L);
 		int GetRagdollFatness(lua_State* L);
 		int GetRagdollHeadSize(lua_State* L);
+		int SetArmSpacing(lua_State* L);
+		int GetArmSpacing(lua_State* L);
+		int SetLegSpacing(lua_State* L);
+		int GetLegSpacing(lua_State* L);
 	};
 
 	class DecalComponent_BindLua

WickedEngine/wiScene_Components.cpp

@@ -174,6 +174,12 @@ namespace wi::scene
 
 		XMStoreFloat4(&rotation_local, quat);
 	}
+	void TransformComponent::RotateRollPitchYaw(const XMVECTOR& value)
+	{
+		XMFLOAT3 v;
+		XMStoreFloat3(&v, value);
+		RotateRollPitchYaw(v);
+	}
 	void TransformComponent::Rotate(const XMFLOAT4& quaternion)
 	{
 		SetDirty();

WickedEngine/wiScene_Components.h

@@ -95,6 +95,7 @@ namespace wi::scene
 		void Translate(const XMFLOAT3& value);
 		void Translate(const XMVECTOR& value);
 		void RotateRollPitchYaw(const XMFLOAT3& value);
+		void RotateRollPitchYaw(const XMVECTOR& value);
 		void Rotate(const XMFLOAT4& quaternion);
 		void Rotate(const XMVECTOR& quaternion);
 		void Scale(const XMFLOAT3& value);
@@ -2297,6 +2298,9 @@ namespace wi::scene
 
 		wi::ecs::Entity lookAtEntity = wi::ecs::INVALID_ENTITY; // lookAt can be fixed to specific entity
 
+		float arm_spacing = 0;
+		float leg_spacing = 0;
+
 		// Non-serialized attributes:
 		XMFLOAT3 lookAt = {}; // lookAt target pos, can be set by user
 		XMFLOAT4 lookAtDeltaRotationState_Head = XMFLOAT4(0, 0, 0, 1);

WickedEngine/wiScene_Serializers.cpp

@@ -2401,6 +2401,12 @@ namespace wi::scene
 			{
 				SerializeEntity(archive, lookAtEntity, seri);
 			}
+
+			if (seri.GetVersion() >= 3)
+			{
+				archive >> arm_spacing;
+				archive >> leg_spacing;
+			}
 		}
 		else
 		{
@@ -2426,6 +2432,12 @@ namespace wi::scene
 			{
 				SerializeEntity(archive, lookAtEntity, seri);
 			}
+
+			if (seri.GetVersion() >= 3)
+			{
+				archive << arm_spacing;
+				archive << leg_spacing;
+			}
 		}
 	}
 	void MetadataComponent::Serialize(wi::Archive& archive, EntitySerializer& seri)