Gittes-archive/new-horizons
2
0
Fork 0
mirror of https://github.com/Outer-Wilds-New-Horizons/new-horizons.git synced 2025-12-11 20:15:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

when trying to move a spiral back in bounds, if no solution is found, the spiral is mirrored and then attempted to be put in bounds again - this solves most cases of spirals being stuck out of bounds

Browse Source
This commit is contained in:
FreezeDriedMangoes 2023-01-26 23:54:07 -05:00
parent 179b94424c
commit a13b790145
1 changed files with 30 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
NewHorizons/Builder/Props/NomaiText/NomaiTextArcArranger.cs
View File

@ -294,25 +294,19 @@ namespace NewHorizons.Builder.Props
if (OutsideBounds(s1))
{
var start = s1._parentPointIndex;
var range = Mathf.Max(start-SpiralManipulator.MIN_PARENT_POINT, SpiralManipulator.MAX_PARENT_POINT-start);
var success = false;
for (var i = 1; i <= range; i++)
var originalMirror = s1.Mirrored;
var success = AttemptToPushSpiralInBounds(s1, start);
if (!success)
{
if (start-i >= SpiralManipulator.MIN_PARENT_POINT)
{
SpiralManipulator.PlaceChildOnParentPoint(s1, s1.parent, start-i);
if (!OutsideBounds(s1)) { success = true; break; }
}
if (start+i <= SpiralManipulator.MAX_PARENT_POINT)
{
SpiralManipulator.PlaceChildOnParentPoint(s1, s1.parent, start+i);
if (!OutsideBounds(s1)) { success = true; break; }
}
s1.Mirror(); // try flipping it if nothing worked with original mirror
success = AttemptToPushSpiralInBounds(s1, start);
}
if (!success)
{
// if we couldn't put it inside the bounds, put it back how we found it (this increases stability of the rest of the spirals)
if (s1.Mirrored != originalMirror) s1.Mirror();
SpiralManipulator.PlaceChildOnParentPoint(s1, s1.parent, start);
Debug.LogWarning("Unable to place spiral " + s1.gameObject.name + " within bounds.");
}
@ -324,6 +318,28 @@ namespace NewHorizons.Builder.Props
Debug.DrawRay(s1.transform.position, new Vector3(force.x, force.y, 0), Color.green);
}
}
private bool AttemptToPushSpiralInBounds(SpiralManipulator s1, int start)
{
var range = Mathf.Max(start-SpiralManipulator.MIN_PARENT_POINT, SpiralManipulator.MAX_PARENT_POINT-start);
for (var i = 1; i <= range; i++)
{
if (start-i >= SpiralManipulator.MIN_PARENT_POINT)
{
SpiralManipulator.PlaceChildOnParentPoint(s1, s1.parent, start-i);
if (!OutsideBounds(s1)) return true;
}
if (start+i <= SpiralManipulator.MAX_PARENT_POINT)
{
SpiralManipulator.PlaceChildOnParentPoint(s1, s1.parent, start+i);
if (!OutsideBounds(s1)) return true;
}
}
return false;
}
}
[ExecuteInEditMode]