shazbot/Spline-Importer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clean Up

Browse Source
This commit is contained in:
Josh4359 2023-09-18 19:37:24 -07:00
parent 92c59f4af3
commit 30e2fe07c5
3 changed files with 48 additions and 126 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

170
Runtime/SplinePlus.cs
View File

@ -14,22 +14,16 @@ namespace FrameJosh.SplineImporter
public void Evaluate(int splineIndex, float anchor, float distance, out float3 position, out quaternion rotation) public void Evaluate(int splineIndex, float anchor, float distance, out float3 position, out quaternion rotation)
{ {
float t = anchor + (distance / splineContainer.Spline.GetLength()); EvaluateSpline(splineContainer.Splines[splineIndex], deformContainer.Spline, anchor, distance, resolution, out position, out rotation);
if (deformContainer)
DeformSpline(splineIndex, t, out position, out rotation);
else
EvaluateSpline(splineIndex, t, out position, out rotation);
} }
public void Evaluate(float anchor, float distance, out float3 position, out quaternion rotation) public void Evaluate(int splineIndex, float anchor, float distance, out Vector3 position, out Quaternion rotation)
{ {
float t = anchor + (distance / splineContainer.CalculateLength()); Evaluate(splineIndex, anchor, distance, out float3 position1, out quaternion rotation1);
if (deformContainer) position = position1;
DeformSpline(t, out position, out rotation);
else rotation = rotation1;
EvaluateSpline(t, out position, out rotation);
} }
public void GetNearestPoint(int splineIndex, float3 point, out float3 position, out quaternion rotation, out float t) public void GetNearestPoint(int splineIndex, float3 point, out float3 position, out quaternion rotation, out float t)
@ -40,119 +34,80 @@ namespace FrameJosh.SplineImporter
t = 0; t = 0;
ISpline spline = splineContainer.Splines[splineIndex];
ISpline deform = deformContainer.Spline;
float nearestDistance = float.PositiveInfinity; float nearestDistance = float.PositiveInfinity;
for (int i = 0; i < splineContainer.Splines.Count; i++) int resolutionScale = (int)math.ceil(spline.GetLength()) * resolution;
for (float i = 0; i <= resolutionScale; i++)
{ {
int resolutionScale = Mathf.CeilToInt(splineContainer.Splines[i].GetLength()) * resolution; EvaluateSpline(spline, deform, i / resolutionScale, 0, resolution, out float3 thisPosition, out quaternion thisRotation);
for (float j = 0; j <= resolutionScale; j++) float thisDistance = math.distance(point, thisPosition);
if (thisDistance < nearestDistance)
{ {
Evaluate(i, j / resolutionScale, 0, out float3 thisPosition, out quaternion thisRotation); position = thisPosition;
float thisDistance = math.distance(point, thisPosition); rotation = thisRotation;
if (thisDistance < nearestDistance) t = i / resolutionScale;
{
position = thisPosition;
rotation = thisRotation; nearestDistance = thisDistance;
t = j / resolutionScale;
nearestDistance = thisDistance;
}
} }
} }
} }
public void GetNearestPoint(float3 point, out float3 position, out quaternion rotation) public void GetNearestPoint(int splineIndex, Vector3 point, out Vector3 position, out Quaternion rotation, out float t)
{ {
position = float3.zero; GetNearestPoint(splineIndex, point, out float3 position1, out quaternion rotation1, out t);
rotation = quaternion.identity; position = position1;
float nearestDistance = float.PositiveInfinity; rotation = rotation1;
}
for (int i = 0; i < splineContainer.Splines.Count; i++) static void EvaluateSpline(ISpline spline, ISpline deform, float anchor, float distance, int resolution, out float3 position, out quaternion rotation)
{
float t = anchor + (distance / spline.GetLength());
if (deform != null)
DeformSpline(spline, deform, t, resolution, out position, out rotation);
else
{ {
int resolutionScale = (int)math.ceil(splineContainer.Splines[i].GetLength()) * resolution; spline.Evaluate(t, out float3 position1, out float3 tangent, out float3 upVector);
for (float j = 0; j <= resolutionScale; j++) position = position1;
{
Evaluate(i, j / resolutionScale, 0, out float3 thisPosition, out quaternion thisRotation);
float thisDistance = math.distance(point, thisPosition); rotation = quaternion.LookRotation(tangent, upVector);
if (thisDistance < nearestDistance)
{
position = thisPosition;
rotation = thisRotation;
nearestDistance = thisDistance;
}
}
} }
} }
void EvaluateSpline(int splineIndex, float t, out float3 position, out quaternion rotation) static void DeformSpline(ISpline spline, ISpline deform, float t, int resolution, out float3 position, out quaternion rotation)
{ {
ScaledEvaluate(splineContainer, splineIndex, t, out float3 position1, out float3 tangent, out float3 upVector); int resolutionScale = (int)math.ceil(spline.GetLength()) * resolution;
position = position1; position = EvaluatePoint(spline, deform, t);
rotation = quaternion.LookRotation(tangent, upVector);
}
void EvaluateSpline(float t, out float3 position, out quaternion rotation)
{
splineContainer.Evaluate(t, out float3 position1, out float3 tangent, out float3 upVector);
position = position1;
rotation = quaternion.LookRotation(tangent, upVector);
}
void DeformSpline(int splineIndex, float t, out float3 position, out quaternion rotation)
{
int resolutionScale = (int)math.ceil(splineContainer.Splines[splineIndex].GetLength()) * resolution;
position = EvaluatePoint(splineIndex, t);
float t1 = math.clamp(t, 0, 1 - (1 / (float)resolutionScale)); float t1 = math.clamp(t, 0, 1 - (1 / (float)resolutionScale));
float3 position0 = EvaluatePoint(splineIndex, t1); float3 position0 = EvaluatePoint(spline, deform, t1);
float3 position1 = EvaluatePoint(splineIndex, t1 + (1 / (float)resolutionScale)); float3 position1 = EvaluatePoint(spline, deform, t1 + (1 / (float)resolutionScale));
float3 difference = position1 - position0; float3 difference = position1 - position0;
rotation = quaternion.LookRotationSafe(difference, math.up()); rotation = quaternion.LookRotationSafe(difference, math.up());
} }
void DeformSpline(float t, out float3 position, out quaternion rotation) static float3 EvaluatePoint(ISpline spline, ISpline deform, float t)
{ {
int resolutionScale = (int)math.ceil(splineContainer.CalculateLength()) * resolution; spline.Evaluate(t, out float3 position, out _, out _);
position = EvaluatePoint(t); deform.Evaluate(position.x / deform.GetLength(), out float3 deformPosition, out float3 deformTangent, out float3 deformUpVector);
float t1 = math.clamp(t, 0, 1 - (1 / (float)resolutionScale));
float3 position0 = EvaluatePoint(t1);
float3 position1 = EvaluatePoint(t1 + (1 / (float)resolutionScale));
float3 difference = position1 - position0;
rotation = quaternion.LookRotationSafe(difference, math.up());
}
float3 EvaluatePoint(int splineIndex, float t)
{
ScaledEvaluate(splineContainer, splineIndex, t, out float3 position, out _, out _);
ScaledEvaluate(deformContainer, 0, position.x / deformContainer.Spline.GetLength(), out float3 deformPosition, out float3 deformTangent, out float3 deformUpVector);
float3 right = math.normalize(math.cross(deformTangent, deformUpVector)); float3 right = math.normalize(math.cross(deformTangent, deformUpVector));
@ -161,39 +116,6 @@ namespace FrameJosh.SplineImporter
return deformPosition + (right * position.z) + (up * position.y); return deformPosition + (right * position.z) + (up * position.y);
} }
float3 EvaluatePoint(float t)
{
splineContainer.Evaluate(t, out float3 position, out _, out _);
ScaledEvaluate(deformContainer, 0, position.x / deformContainer.Spline.GetLength(), out float3 deformPosition, out float3 deformTangent, out float3 deformUpVector);
float3 right = math.normalize(math.cross(deformTangent, deformUpVector));
float3 up = math.normalize(deformUpVector);
return deformPosition + (right * position.z) + (up * position.y);
}
void ScaledEvaluate(SplineContainer splineContainer, int splineIndex, float t, out float3 position, out float3 tangent, out float3 upVector)
{
Spline spline = splineContainer.Splines[splineIndex];
if (spline == null)
{
splineContainer.Evaluate(t, out position, out tangent, out upVector);
return;
}
SplineUtility.Evaluate(splineContainer.Splines[splineIndex], t, out position, out tangent, out upVector);
position = splineContainer.transform.TransformPoint(position);
tangent = splineContainer.transform.TransformVector(tangent);
upVector = splineContainer.transform.TransformDirection(upVector);
}
void OnDrawGizmosSelected() void OnDrawGizmosSelected()
{ {
if (!splineContainer || !deformContainer) return; if (!splineContainer || !deformContainer) return;
@ -202,7 +124,7 @@ namespace FrameJosh.SplineImporter
for (int i = 0; i < splineContainer.Splines.Count; i++) for (int i = 0; i < splineContainer.Splines.Count; i++)
{ {
Evaluate(i, 0, 0, out float3 position, out _); Evaluate(0, 0, 0, out float3 position, out _);
float3 oldPosition = position; float3 oldPosition = position;
@ -210,7 +132,7 @@ namespace FrameJosh.SplineImporter
for (float j = 1; j <= gizmoResolution; j++) for (float j = 1; j <= gizmoResolution; j++)
{ {
Evaluate(i, j / gizmoResolution, 0, out position, out _); Evaluate(0, j / gizmoResolution, 0, out position, out _);
Gizmos.DrawLine(oldPosition, position); Gizmos.DrawLine(oldPosition, position);

2
Samples/SplineEvaluateDebug.cs
View File

@ -19,7 +19,7 @@ namespace FrameJosh.SplineImporter.Samples
{ {
if (!splinePlus) return; if (!splinePlus) return;
splinePlus.Evaluate(anchor, distance, out float3 position, out quaternion rotation); splinePlus.Evaluate(0, anchor, distance, out float3 position, out quaternion rotation);
transform.position = position; transform.position = position;

2
Samples/SplineNearestPointDebug.cs
View File

@ -13,7 +13,7 @@ namespace FrameJosh.SplineImporter.Samples
{ {
if (!splinePlus) return; if (!splinePlus) return;
splinePlus.GetNearestPoint(transform.position, out float3 position, out _); splinePlus.GetNearestPoint(0, transform.position, out float3 position, out _, out _);
Gizmos.DrawCube(position, Vector3.one * cubeSize); Gizmos.DrawCube(position, Vector3.one * cubeSize);
} }