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

disabled and stopped development on some bonus features of the text placer, added mirroring to spirals

Browse Source
This commit is contained in:
FreezeDriedMangoes 2022-06-02 21:12:22 -04:00
parent 6d62d2cebf
commit ac09945b8d
3 changed files with 106 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
NewHorizons/Builder/Props/NomaiTextBuilder.cs
View File

@ -345,7 +345,7 @@ namespace NewHorizons.Builder.Props
{ {
GameObject arc; GameObject arc;
var type = arcInfo != null ? arcInfo.type : PropModule.NomaiTextArcInfo.NomaiTextArcType.Adult; var type = arcInfo != null ? arcInfo.type : PropModule.NomaiTextArcInfo.NomaiTextArcType.Adult;
var variation = 0; var variation = arcInfo.variation;
switch (type) switch (type)
{ {
case PropModule.NomaiTextArcInfo.NomaiTextArcType.Child: case PropModule.NomaiTextArcInfo.NomaiTextArcType.Child:
@ -368,6 +368,7 @@ namespace NewHorizons.Builder.Props
arc = _arcPrefabs[variation].InstantiateInactive(); arc = _arcPrefabs[variation].InstantiateInactive();
break; break;
} }
arcInfo.variation = variation;
arc.transform.parent = conversationZone.transform; arc.transform.parent = conversationZone.transform;
arc.GetComponent<NomaiTextLine>()._prebuilt = false; arc.GetComponent<NomaiTextLine>()._prebuilt = false;
@ -379,6 +380,8 @@ namespace NewHorizons.Builder.Props
else arc.transform.localPosition = new Vector3(a.position.x, a.position.y, 0); else arc.transform.localPosition = new Vector3(a.position.x, a.position.y, 0);
arc.transform.localRotation = Quaternion.Euler(0, 0, a.zRotation); arc.transform.localRotation = Quaternion.Euler(0, 0, a.zRotation);
if (a.mirror) arc.transform.localScale = new Vector3(-1, 1, 1);
} }
// Try auto I guess // Try auto I guess
else else

4
NewHorizons/External/Modules/PropModule.cs vendored
View File

@ -455,6 +455,10 @@ namespace NewHorizons.External.Modules
[EnumMember(Value = @"stranger")] Stranger = 2 [EnumMember(Value = @"stranger")] Stranger = 2
} }
/// <summary>
/// Whether to flip the spiral from left-curling to right-curling or vice versa.
/// </summary>
public bool mirror;
/// <summary> /// <summary>
/// The local position of this object on the wall. /// The local position of this object on the wall.

127
NewHorizons/Utility/DebugMenu/DebugMenuNomaiText.cs
View File

@ -49,6 +49,7 @@ namespace NewHorizons.Utility.DebugMenu
public int parentID; public int parentID;
public int pointOnParent = -1; public int pointOnParent = -1;
public SpiralMetadata parent;
} }
List<ConversationMetadata> conversations = new List<ConversationMetadata>(); List<ConversationMetadata> conversations = new List<ConversationMetadata>();
@ -242,30 +243,36 @@ namespace NewHorizons.Utility.DebugMenu
// spiral controls // spiral controls
GUILayout.Label("Spiral"); GUILayout.Label("Spiral");
GUILayout.Label("Type");
GUILayout.BeginHorizontal(); // TODO: implement disabled feature: change spiral type and variation
GUI.enabled = spiralMeta.spiral.type != NomaiTextArcInfo.NomaiTextArcType.Adult; //GUILayout.Label("Type");
if (GUILayout.Button("Adult")) { spiralMeta.spiral.type = NomaiTextArcInfo.NomaiTextArcType.Adult; changed = true; } // GUILayout.BeginHorizontal();
GUI.enabled = spiralMeta.spiral.type != NomaiTextArcInfo.NomaiTextArcType.Child; // GUI.enabled = spiralMeta.spiral.type != NomaiTextArcInfo.NomaiTextArcType.Adult;
if (GUILayout.Button("Child")) { spiralMeta.spiral.type = NomaiTextArcInfo.NomaiTextArcType.Child; changed = true; } // if (GUILayout.Button("Adult")) { spiralMeta.spiral.type = NomaiTextArcInfo.NomaiTextArcType.Adult; changed = true; }
GUI.enabled = spiralMeta.spiral.type != NomaiTextArcInfo.NomaiTextArcType.Stranger; // GUI.enabled = spiralMeta.spiral.type != NomaiTextArcInfo.NomaiTextArcType.Child;
if (GUILayout.Button("Stranger")) { spiralMeta.spiral.type = NomaiTextArcInfo.NomaiTextArcType.Stranger; changed = true; } // if (GUILayout.Button("Child")) { spiralMeta.spiral.type = NomaiTextArcInfo.NomaiTextArcType.Child; changed = true; }
GUI.enabled = true; // GUI.enabled = spiralMeta.spiral.type != NomaiTextArcInfo.NomaiTextArcType.Stranger;
GUILayout.EndHorizontal(); // if (GUILayout.Button("Stranger")) { spiralMeta.spiral.type = NomaiTextArcInfo.NomaiTextArcType.Stranger; changed = true; }
// GUI.enabled = true;
// GUILayout.EndHorizontal();
GUILayout.Label("Variation"); //GUILayout.Label("Variation");
GUILayout.BeginHorizontal(); // GUILayout.BeginHorizontal();
var varietyCount = GetVarietyCountForType(spiralMeta.spiral.type); // var varietyCount = GetVarietyCountForType(spiralMeta.spiral.type);
if (GUILayout.Button("Reroll variation")) // if (GUILayout.Button("Reroll variation"))
{ // {
spiralMeta.spiral.variation = UnityEngine.Random.Range(0, varietyCount); // spiralMeta.spiral.variation = UnityEngine.Random.Range(0, varietyCount);
} // }
GUI.enabled = true; // GUI.enabled = true;
GUILayout.EndHorizontal(); // GUILayout.EndHorizontal();
var shouldBeInManual = spiralMeta.parentID < 0 || GUILayout.Toggle(spiralMeta.pointOnParent < 0, "Manual Positioning");
if ( shouldBeInManual && spiralMeta.pointOnParent >= 0) spiralMeta.pointOnParent = -1; // TODO: debug disabled feature: place spiral point on parent
if (!shouldBeInManual && spiralMeta.pointOnParent < 0 ) spiralMeta.pointOnParent = 0; //var shouldBeInManual = spiralMeta.parentID < 0 || GUILayout.Toggle(spiralMeta.pointOnParent < 0, "Manual Positioning");
//if ( shouldBeInManual && spiralMeta.pointOnParent >= 0) spiralMeta.pointOnParent = -1;
//if (!shouldBeInManual && spiralMeta.pointOnParent < 0 ) spiralMeta.pointOnParent = 0;
var shouldBeInManual = true;
if (shouldBeInManual) if (shouldBeInManual)
{ {
@ -312,9 +319,23 @@ namespace NewHorizons.Utility.DebugMenu
} }
else else
{ {
// var newPointOnParent = GUI.HorizontalSlider(); // stepped horizontal slider var parent = GetParent(spiralMeta);
// if new value, set spiral GO positioning (and spiral's x/y/theta) var numPoints = 10; // parent.spiralGo.GetComponent<NomaiTextLine>()._points.Count();
// UpdateChildPositions()
var newPointOnParent = Mathf.RoundToInt(GUILayout.HorizontalSlider(spiralMeta.pointOnParent, 0, numPoints)); // stepped horizontal slider
if (spiralMeta.pointOnParent != newPointOnParent)
{
spiralMeta.pointOnParent = newPointOnParent;
UpdateSpiralLocationByPointOnParent(spiralMeta);
}
}
var newMirror = GUILayout.Toggle(spiralMeta.spiral.mirror, "Mirror");
if (newMirror != spiralMeta.spiral.mirror)
{
spiralMeta.spiral.mirror = newMirror;
spiralMeta.spiralGo.transform.localScale = new Vector3(newMirror ? -1 : 1, 1, 1);
} }
GUILayout.EndVertical(); GUILayout.EndVertical();
GUILayout.Space(5); GUILayout.Space(5);
@ -345,17 +366,65 @@ namespace NewHorizons.Utility.DebugMenu
GUILayout.EndScrollView(); GUILayout.EndScrollView();
} }
private SpiralMetadata GetParent(SpiralMetadata child)
{
if (child.parent != null || child.parentID < 0) return child.parent;
ConversationMetadata convoMeta = conversations.Where(m => m.conversation == child.conversation).First();
SpiralMetadata parentSpiralMeta = convoMeta.spirals.Where(potentialParentMeta => potentialParentMeta.id == child.id).First();
child.parent = parentSpiralMeta;
return child.parent;
}
private void UpdateSpiralLocationByPointOnParent(SpiralMetadata spiralMetadata, bool updateChildren = true)
{
Logger.Log("Updating spiral " + spiralMetadata.id);
Logger.Log("Setting point on parent " + spiralMetadata.pointOnParent);
if (spiralMetadata.pointOnParent < 0) return;
SpiralMetadata parentSpiralMeta = GetParent(spiralMetadata);
var parentPoints = parentSpiralMeta.spiralGo.GetComponent<NomaiTextLine>()._points;
Logger.Log("got parent and parent points");
var prevPointOnParent = parentPoints[Mathf.Max(0, spiralMetadata.pointOnParent-1)];
var nextPointOnParent = parentPoints[Mathf.Min(parentPoints.Count()-1, spiralMetadata.pointOnParent+1)];
var delta = nextPointOnParent - prevPointOnParent;
var parentTangent = Mathf.Rad2Deg * Mathf.Atan2(delta.y, delta.x);
var newRotationRelativeToParent = parentTangent + 90;
spiralMetadata.spiral.zRotation = parentSpiralMeta.spiral.zRotation + newRotationRelativeToParent;
Logger.Log("got zRotation: " + newRotationRelativeToParent + " -=- " + spiralMetadata.spiral.zRotation);
var pointOnParent = parentPoints[spiralMetadata.pointOnParent];
var selfBasePoint = spiralMetadata.spiralGo.GetComponent<NomaiTextLine>()._points[0];
var newPointRelativeToParent = -selfBasePoint + pointOnParent;
spiralMetadata.spiral.position = parentSpiralMeta.spiral.position + new Vector2(newPointRelativeToParent.x, newPointRelativeToParent.y);
Logger.Log("got position " + newPointRelativeToParent + " -=- " + spiralMetadata.spiral.position);
spiralMetadata.spiralGo.transform.localPosition = new Vector3(spiralMetadata.spiral.position.x, spiralMetadata.spiral.position.y, 0);
spiralMetadata.spiralGo.transform.localEulerAngles = new Vector3(0, 0, spiralMetadata.spiral.zRotation);
if (updateChildren) UpdateChildrenLocations(spiralMetadata);
}
private void UpdateChildrenLocations(SpiralMetadata parentSprialMetadata) private void UpdateChildrenLocations(SpiralMetadata parentSprialMetadata)
{ {
Logger.Log("updating children");
ConversationMetadata convoMeta = conversations.Where(m => m.conversation == parentSprialMetadata.conversation).First(); ConversationMetadata convoMeta = conversations.Where(m => m.conversation == parentSprialMetadata.conversation).First();
Logger.Log("got convo meta");
convoMeta.spirals convoMeta.spirals
.Where(spiralMeta => spiralMeta.parentID == parentSprialMetadata.id) .Where(spiralMeta => spiralMeta.parentID == parentSprialMetadata.id && spiralMeta.id != parentSprialMetadata.id)
.ToList() .ToList()
.ForEach(spiralMeta => { .ForEach(spiralMeta => {
if (spiralMeta.pointOnParent == -1) return; // this spiral is positioned manually if (spiralMeta.pointOnParent == -1) return; // this spiral is positioned manually, skip
// TODO: set x, y, and theta of spiralMeta based on spiralMeta.pointOnParent and parentSprialMetadata's x,y,theta UpdateSpiralLocationByPointOnParent(spiralMeta);
UpdateChildrenLocations(spiralMeta);
}); });
} }