Update effector base and push apart effector

This commit is contained in:
Misaki
2024-09-16 22:17:03 +09:00
parent 8374938734
commit 1c39403cbf
12 changed files with 167 additions and 103 deletions

View File

@@ -5,11 +5,10 @@ namespace Misaki.ArtTool
{
public static partial class Distribution
{
public static void SplineDistribution(int index, int pointSize, float splineLength, float4x4 splineWorldMatrix, SplineDistributionSetting setting, out float4x4 localMatrix, out bool isValid)
public static void SplineDistribution(int index, int pointSize, SplineDistributionSetting setting, out float4x4 localMatrix, out bool isValid)
{
var pointIndex = index + setting.indexOffset;
if (pointIndex > pointSize)
{
localMatrix = float4x4.zero;
@@ -23,7 +22,7 @@ namespace Misaki.ArtTool
if (setting.isSpacingMode)
{
t = (pointIndex * setting.spacing) / splineLength;
t = (pointIndex * setting.spacing) / setting.splineLength;
}
else
{
@@ -34,7 +33,7 @@ namespace Misaki.ArtTool
{
var localRotation = quaternion.LookRotationSafe(normal, upVector);
localMatrix = math.mul(splineWorldMatrix, float4x4.TRS(position, localRotation, new float3(1.0f)));
localMatrix = math.mul(setting.splineWorldMatrix, float4x4.TRS(position, localRotation, new float3(1.0f)));
isValid = true;
}
else