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

changed line endings

Browse Source
This commit is contained in:
FreezeDriedMangoes 2022-05-25 17:54:12 -04:00
parent c1369aab0b
commit 9639ab6a56
1 changed files with 231 additions and 231 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

462
NewHorizons/Builder/Props/DetailBuilder.cs
View File

@ -1,231 +1,231 @@
using NewHorizons.External.Configs; using NewHorizons.External.Configs;
using NewHorizons.External.Modules; using NewHorizons.External.Modules;
using NewHorizons.Handlers; using NewHorizons.Handlers;
using NewHorizons.Utility; using NewHorizons.Utility;
using OWML.Common; using OWML.Common;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using UnityEngine; using UnityEngine;
using Logger = NewHorizons.Utility.Logger; using Logger = NewHorizons.Utility.Logger;
namespace NewHorizons.Builder.Props namespace NewHorizons.Builder.Props
{ {
public static class DetailBuilder public static class DetailBuilder
{ {
private static Dictionary<PropModule.DetailInfo, GameObject> detailInfoToCorrespondingSpawnedGameObject = new Dictionary<PropModule.DetailInfo, GameObject>(); private static Dictionary<PropModule.DetailInfo, GameObject> detailInfoToCorrespondingSpawnedGameObject = new Dictionary<PropModule.DetailInfo, GameObject>();
public static GameObject GetSpawnedGameObjectByDetailInfo(PropModule.DetailInfo detail) public static GameObject GetSpawnedGameObjectByDetailInfo(PropModule.DetailInfo detail)
{ {
if (!detailInfoToCorrespondingSpawnedGameObject.ContainsKey(detail)) return null; if (!detailInfoToCorrespondingSpawnedGameObject.ContainsKey(detail)) return null;
return detailInfoToCorrespondingSpawnedGameObject[detail]; return detailInfoToCorrespondingSpawnedGameObject[detail];
} }
public static void Make(GameObject go, Sector sector, PlanetConfig config, IModBehaviour mod, PropModule.DetailInfo detail) public static void Make(GameObject go, Sector sector, PlanetConfig config, IModBehaviour mod, PropModule.DetailInfo detail)
{ {
GameObject detailGO = null; GameObject detailGO = null;
if (detail.assetBundle != null) if (detail.assetBundle != null)
{ {
var prefab = AssetBundleUtilities.LoadPrefab(detail.assetBundle, detail.path, mod); var prefab = AssetBundleUtilities.LoadPrefab(detail.assetBundle, detail.path, mod);
detailGO = MakeDetail(go, sector, prefab, detail.position, detail.rotation, detail.scale, detail.alignToNormal); detailGO = MakeDetail(go, sector, prefab, detail.position, detail.rotation, detail.scale, detail.alignToNormal);
} }
else if (detail.objFilePath != null) else if (detail.objFilePath != null)
{ {
try try
{ {
var prefab = mod.ModHelper.Assets.Get3DObject(detail.objFilePath, detail.mtlFilePath); var prefab = mod.ModHelper.Assets.Get3DObject(detail.objFilePath, detail.mtlFilePath);
AssetBundleUtilities.ReplaceShaders(prefab); AssetBundleUtilities.ReplaceShaders(prefab);
prefab.SetActive(false); prefab.SetActive(false);
detailGO = MakeDetail(go, sector, prefab, detail.position, detail.rotation, detail.scale, detail.alignToNormal); detailGO = MakeDetail(go, sector, prefab, detail.position, detail.rotation, detail.scale, detail.alignToNormal);
} }
catch (Exception e) catch (Exception e)
{ {
Logger.LogError($"Could not load 3d object {detail.objFilePath} with texture {detail.mtlFilePath} : {e.Message}"); Logger.LogError($"Could not load 3d object {detail.objFilePath} with texture {detail.mtlFilePath} : {e.Message}");
} }
} }
else detailGO = MakeDetail(go, sector, detail.path, detail.position, detail.rotation, detail.scale, detail.alignToNormal); else detailGO = MakeDetail(go, sector, detail.path, detail.position, detail.rotation, detail.scale, detail.alignToNormal);
if (detailGO != null && detail.removeChildren != null) if (detailGO != null && detail.removeChildren != null)
{ {
foreach (var childPath in detail.removeChildren) foreach (var childPath in detail.removeChildren)
{ {
var childObj = detailGO.transform.Find(childPath); var childObj = detailGO.transform.Find(childPath);
if (childObj != null) childObj.gameObject.SetActive(false); if (childObj != null) childObj.gameObject.SetActive(false);
else Logger.LogWarning($"Couldn't find {childPath}"); else Logger.LogWarning($"Couldn't find {childPath}");
} }
} }
if (detailGO != null && detail.removeComponents) if (detailGO != null && detail.removeComponents)
{ {
// Just swap all the children to a new game object // Just swap all the children to a new game object
var newDetailGO = new GameObject(detailGO.name); var newDetailGO = new GameObject(detailGO.name);
newDetailGO.transform.position = detailGO.transform.position; newDetailGO.transform.position = detailGO.transform.position;
newDetailGO.transform.parent = detailGO.transform.parent; newDetailGO.transform.parent = detailGO.transform.parent;
// Can't modify parents while looping through children bc idk // Can't modify parents while looping through children bc idk
var children = new List<Transform>(); var children = new List<Transform>();
foreach (Transform child in detailGO.transform) foreach (Transform child in detailGO.transform)
{ {
children.Add(child); children.Add(child);
} }
foreach (var child in children) foreach (var child in children)
{ {
child.parent = newDetailGO.transform; child.parent = newDetailGO.transform;
} }
GameObject.Destroy(detailGO); GameObject.Destroy(detailGO);
detailGO = newDetailGO; detailGO = newDetailGO;
} }
detailInfoToCorrespondingSpawnedGameObject[detail] = detailGO; detailInfoToCorrespondingSpawnedGameObject[detail] = detailGO;
} }
public static GameObject MakeDetail(GameObject go, Sector sector, string propToClone, MVector3 position, MVector3 rotation, float scale, bool alignWithNormal) public static GameObject MakeDetail(GameObject go, Sector sector, string propToClone, MVector3 position, MVector3 rotation, float scale, bool alignWithNormal)
{ {
var prefab = SearchUtilities.Find(propToClone); var prefab = SearchUtilities.Find(propToClone);
if (prefab == null) Logger.LogError($"Couldn't find detail {propToClone}"); if (prefab == null) Logger.LogError($"Couldn't find detail {propToClone}");
return MakeDetail(go, sector, prefab, position, rotation, scale, alignWithNormal); return MakeDetail(go, sector, prefab, position, rotation, scale, alignWithNormal);
} }
public static GameObject MakeDetail(GameObject planetGO, Sector sector, GameObject prefab, MVector3 position, MVector3 rotation, float scale, bool alignWithNormal) public static GameObject MakeDetail(GameObject planetGO, Sector sector, GameObject prefab, MVector3 position, MVector3 rotation, float scale, bool alignWithNormal)
{ {
if (prefab == null) return null; if (prefab == null) return null;
GameObject prop = prefab.InstantiateInactive(); GameObject prop = prefab.InstantiateInactive();
prop.transform.parent = sector?.transform ?? planetGO.transform; prop.transform.parent = sector?.transform ?? planetGO.transform;
prop.SetActive(false); prop.SetActive(false);
if (sector != null) sector.OnOccupantEnterSector += (SectorDetector sd) => OWAssetHandler.OnOccupantEnterSector(prop, sd, sector); if (sector != null) sector.OnOccupantEnterSector += (SectorDetector sd) => OWAssetHandler.OnOccupantEnterSector(prop, sd, sector);
OWAssetHandler.LoadObject(prop); OWAssetHandler.LoadObject(prop);
foreach (var component in prop.GetComponents<Component>().Concat(prop.GetComponentsInChildren<Component>())) foreach (var component in prop.GetComponents<Component>().Concat(prop.GetComponentsInChildren<Component>()))
{ {
// Enable all children or something // Enable all children or something
var enabledField = component?.GetType()?.GetField("enabled"); var enabledField = component?.GetType()?.GetField("enabled");
if (enabledField != null && enabledField.FieldType == typeof(bool)) Main.Instance.ModHelper.Events.Unity.FireOnNextUpdate(() => enabledField.SetValue(component, true)); if (enabledField != null && enabledField.FieldType == typeof(bool)) Main.Instance.ModHelper.Events.Unity.FireOnNextUpdate(() => enabledField.SetValue(component, true));
// Fix a bunch of sector stuff // Fix a bunch of sector stuff
if (sector != null) if (sector != null)
{ {
if (component is Sector s) if (component is Sector s)
{ {
s._parentSector = sector; s._parentSector = sector;
} }
// TODO: Make this work or smthng // TODO: Make this work or smthng
if (component is GhostIK ik) ik.enabled = false; if (component is GhostIK ik) ik.enabled = false;
if (component is GhostEffects effects) effects.enabled = false; if (component is GhostEffects effects) effects.enabled = false;
if (component is DarkMatterVolume) if (component is DarkMatterVolume)
{ {
var probeVisuals = component.gameObject.transform.Find("ProbeVisuals"); var probeVisuals = component.gameObject.transform.Find("ProbeVisuals");
if (probeVisuals != null) probeVisuals.gameObject.SetActive(true); if (probeVisuals != null) probeVisuals.gameObject.SetActive(true);
} }
if (component is SectoredMonoBehaviour behaviour) if (component is SectoredMonoBehaviour behaviour)
{ {
behaviour.SetSector(sector); behaviour.SetSector(sector);
} }
else else
{ {
var sectorField = component?.GetType()?.GetField("_sector"); var sectorField = component?.GetType()?.GetField("_sector");
if (sectorField != null && sectorField.FieldType == typeof(Sector)) Main.Instance.ModHelper.Events.Unity.FireOnNextUpdate(() => sectorField.SetValue(component, sector)); if (sectorField != null && sectorField.FieldType == typeof(Sector)) Main.Instance.ModHelper.Events.Unity.FireOnNextUpdate(() => sectorField.SetValue(component, sector));
} }
if (component is AnglerfishController angler) if (component is AnglerfishController angler)
{ {
try try
{ {
angler._chaseSpeed += OWPhysics.CalculateOrbitVelocity(planetGO.GetAttachedOWRigidbody(), planetGO.GetComponent<AstroObject>().GetPrimaryBody().GetAttachedOWRigidbody()).magnitude; angler._chaseSpeed += OWPhysics.CalculateOrbitVelocity(planetGO.GetAttachedOWRigidbody(), planetGO.GetComponent<AstroObject>().GetPrimaryBody().GetAttachedOWRigidbody()).magnitude;
} }
catch (Exception e) catch (Exception e)
{ {
Logger.LogError($"Couldn't update AnglerFish chase speed: {e.Message}"); Logger.LogError($"Couldn't update AnglerFish chase speed: {e.Message}");
} }
} }
// Fix slide reel // Fix slide reel
if (component is SlideCollectionContainer container) if (component is SlideCollectionContainer container)
{ {
sector.OnOccupantEnterSector.AddListener(_ => container.LoadStreamingTextures()); sector.OnOccupantEnterSector.AddListener(_ => container.LoadStreamingTextures());
} }
if (component is OWItemSocket socket) if (component is OWItemSocket socket)
{ {
socket._sector = sector; socket._sector = sector;
} }
// Fix vision torch // Fix vision torch
if (component is VisionTorchItem) if (component is VisionTorchItem)
{ {
(component as VisionTorchItem).enabled = true; (component as VisionTorchItem).enabled = true;
(component as VisionTorchItem).mindProjectorTrigger.enabled = true; (component as VisionTorchItem).mindProjectorTrigger.enabled = true;
(component as VisionTorchItem).mindSlideProjector._mindProjectorImageEffect = GameObject.Find("Player_Body/PlayerCamera").GetComponent<MindProjectorImageEffect>(); (component as VisionTorchItem).mindSlideProjector._mindProjectorImageEffect = GameObject.Find("Player_Body/PlayerCamera").GetComponent<MindProjectorImageEffect>();
} }
} }
else else
{ {
// Remove things that require sectors. Will just keep extending this as things pop up // Remove things that require sectors. Will just keep extending this as things pop up
if (component is FogLight or SectoredMonoBehaviour) if (component is FogLight or SectoredMonoBehaviour)
{ {
GameObject.DestroyImmediate(component); GameObject.DestroyImmediate(component);
continue; continue;
} }
} }
// Fix a bunch of stuff when done loading // Fix a bunch of stuff when done loading
Main.Instance.ModHelper.Events.Unity.RunWhen(() => Main.IsSystemReady, () => Main.Instance.ModHelper.Events.Unity.RunWhen(() => Main.IsSystemReady, () =>
{ {
try try
{ {
if (component is Animator animator) animator.enabled = true; if (component is Animator animator) animator.enabled = true;
else if (component is Collider collider) collider.enabled = true; else if (component is Collider collider) collider.enabled = true;
else if (component is Renderer renderer) renderer.enabled = true; else if (component is Renderer renderer) renderer.enabled = true;
else if (component is Shape shape) shape.enabled = true; else if (component is Shape shape) shape.enabled = true;
// If it's not a moving anglerfish make sure the anim controller is regular // If it's not a moving anglerfish make sure the anim controller is regular
else if (component is AnglerfishAnimController angler && angler.GetComponentInParent<AnglerfishController>() == null) else if (component is AnglerfishAnimController angler && angler.GetComponentInParent<AnglerfishController>() == null)
{ {
Logger.Log("Enabling anglerfish animation"); Logger.Log("Enabling anglerfish animation");
// Remove any reference to its angler // Remove any reference to its angler
if (angler._anglerfishController) if (angler._anglerfishController)
{ {
angler._anglerfishController.OnChangeAnglerState -= angler.OnChangeAnglerState; angler._anglerfishController.OnChangeAnglerState -= angler.OnChangeAnglerState;
angler._anglerfishController.OnAnglerTurn -= angler.OnAnglerTurn; angler._anglerfishController.OnAnglerTurn -= angler.OnAnglerTurn;
angler._anglerfishController.OnAnglerSuspended -= angler.OnAnglerSuspended; angler._anglerfishController.OnAnglerSuspended -= angler.OnAnglerSuspended;
angler._anglerfishController.OnAnglerUnsuspended -= angler.OnAnglerUnsuspended; angler._anglerfishController.OnAnglerUnsuspended -= angler.OnAnglerUnsuspended;
} }
angler.enabled = true; angler.enabled = true;
angler.OnChangeAnglerState(AnglerfishController.AnglerState.Lurking); angler.OnChangeAnglerState(AnglerfishController.AnglerState.Lurking);
} }
} }
catch (Exception e) catch (Exception e)
{ {
Logger.LogWarning($"Exception when modifying component [{component.GetType().Name}] on [{planetGO.name}] : {e.Message}, {e.StackTrace}"); Logger.LogWarning($"Exception when modifying component [{component.GetType().Name}] on [{planetGO.name}] : {e.Message}, {e.StackTrace}");
} }
}); });
} }
prop.transform.position = position == null ? planetGO.transform.position : planetGO.transform.TransformPoint((Vector3)position); prop.transform.position = position == null ? planetGO.transform.position : planetGO.transform.TransformPoint((Vector3)position);
Quaternion rot = rotation == null ? Quaternion.identity : Quaternion.Euler((Vector3)rotation); Quaternion rot = rotation == null ? Quaternion.identity : Quaternion.Euler((Vector3)rotation);
if (alignWithNormal) if (alignWithNormal)
{ {
// Apply the rotation after aligning it with normal // Apply the rotation after aligning it with normal
var up = planetGO.transform.InverseTransformPoint(prop.transform.position).normalized; var up = planetGO.transform.InverseTransformPoint(prop.transform.position).normalized;
prop.transform.rotation = Quaternion.FromToRotation(Vector3.up, up); prop.transform.rotation = Quaternion.FromToRotation(Vector3.up, up);
prop.transform.rotation *= rot; prop.transform.rotation *= rot;
} }
else else
{ {
prop.transform.rotation = planetGO.transform.TransformRotation(rot); prop.transform.rotation = planetGO.transform.TransformRotation(rot);
} }
prop.transform.localScale = scale != 0 ? Vector3.one * scale : prefab.transform.localScale; prop.transform.localScale = scale != 0 ? Vector3.one * scale : prefab.transform.localScale;
prop.SetActive(true); prop.SetActive(true);
return prop; return prop;
} }
} }
} }
>>>>>>> dev >>>>>>> dev