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

removed commented out code and dead code

Browse Source
This commit is contained in:
FreezeDriedMangoes 2023-01-28 19:19:59 -05:00
parent e9fb9f23f0
commit 4ecfe3d5c9
2 changed files with 7 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,9 +14,9 @@ namespace NewHorizons.Builder.Props
private static int MAX_MOVE_DISTANCE = 2;
public float maxX = 2.7f;//3;
public float minX = -2.7f;//-3;
public float maxY = 2.6f;//2.75f;
public float maxX = 2.7f;
public float minX = -2.7f;
public float maxY = 2.6f;
public float minY = -1f;
public void DrawBoundsWithDebugSpheres()
@ -166,13 +166,8 @@ namespace NewHorizons.Builder.Props
{
if (reverseToposortedSpirals == null) GenerateReverseToposort();
// TODO: fix LocationB not making spiral orange
Dictionary<SpiralManipulator, Vector2> childForces = new Dictionary<SpiralManipulator, Vector2>();
//Debug.Log(reverseToposortedSpirals.Count);
//Debug.Log( string.Join(", ", reverseToposortedSpirals.Select(hmslnk => hmslnk.gameObject.name) ) );
var index = -1;
foreach (var s1 in reverseToposortedSpirals) // treating the conversation like a tree datastructure, move "leaf" spirals first so that we can propogate their force up to the parents
{
@ -198,8 +193,6 @@ namespace NewHorizons.Builder.Props
if (s1 == s2) continue;
if (s1.parent == s2) continue;
if (s1 == s2.parent) continue;
//if (!Overlap(s1, s2)) continue;
// push away from other spirals
var f = (s2.center - s1.center);
@ -259,7 +252,7 @@ namespace NewHorizons.Builder.Props
var bestPointDistance = 99999999f;
for (var j = SpiralManipulator.MIN_PARENT_POINT; j < SpiralManipulator.MAX_PARENT_POINT; j++)
{
// skip this point if it's already occupied by ANOTHER spiral (if it's occupied by this spiral, DO count it)
// skip this point if it's already occupied by another spiral (if it's occupied by this spiral, don't skip it)
if (j != spiral._parentPointIndex && spiral.parent.occupiedParentPoints.Contains(j)) continue;
var point = parentPoints[j];

14
NewHorizons/Builder/Props/NomaiText/NomaiTextArcBuilder.cs
View File

@ -68,8 +68,6 @@ namespace NewHorizons.Builder.Props
.ToArray();
owNomaiTextLine._points = _points;
//owNomaiTextLine._state = NomaiTextLine.VisualState.HIDDEN;
//owNomaiTextLine._textLineLocation = NomaiText.Location.UNSPECIFIED;
owNomaiTextLine._active = true;
owNomaiTextLine._prebuilt = false;
@ -86,7 +84,6 @@ namespace NewHorizons.Builder.Props
public struct SpiralProfile {
// all of the Vector2 params here refer to a range of valid values
public string profileName;
public bool canMirror;
public Vector2 a;
public Vector2 b;
public Vector2 startS;
@ -101,7 +98,6 @@ namespace NewHorizons.Builder.Props
public static SpiralProfile adultSpiralProfile = new SpiralProfile() {
profileName="Adult",
canMirror = false, // we don't want to mirror the actual mesh itself anymore, we'll just mirror the game object using localScale.x
a = new Vector2(0.5f, 0.5f),
b = new Vector2(0.3f, 0.6f),
startS = new Vector2(342.8796f, 342.8796f),
@ -114,13 +110,10 @@ namespace NewHorizons.Builder.Props
uvScale = 4.9f,
};
// TODO: make a property called something like "sync random ranges" that makes a, b, etc, all be sampled with the same random number, isntead of being independently sampled
// This will allow child spirals to be set up to be more authentic
public static SpiralProfile childSpiralProfile = new SpiralProfile() {
profileName="Child",
canMirror = false, // we don't want to mirror the actual mesh itself anymore, we'll just mirror the game object using localScale.x
a = new Vector2(0.9f, 0.9f),
b = new Vector2(0.17f, 0.4f), //new Vector2(0.305f, 0.4f),
b = new Vector2(0.17f, 0.4f),
startS = new Vector2(342.8796f, 342.8796f),
endS = new Vector2(35f, 25f),
skeletonScale = 0.8f * new Vector2(0.01f, 0.01f),
@ -141,7 +134,6 @@ namespace NewHorizons.Builder.Props
// I think this'll do it
public static SpiralProfile strangerSpiralProfile = new SpiralProfile() {
profileName="Stranger",
canMirror = false,
a = new Vector2(0.9f, 0.9f), // this value doesn't really matter for this
b = new Vector2(5f, 5f),
startS = new Vector2(1.8505f, 1.8505f),
@ -169,8 +161,8 @@ namespace NewHorizons.Builder.Props
public int numSkeletonPoints = 51; // seems to be Mobius' default
public float innerWidth = 0.001f; // width at the tip
public float outerWidth = 0.05f; //0.107f; // width at the base
public float uvScale = 4.9f; //2.9f;
public float outerWidth = 0.05f; // width at the base
public float uvScale = 4.9f;
private float baseUVScale = 1f / 300f;
public float uvOffset = 0;