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

Make option to generate mesh colliders

Browse Source
This commit is contained in:
Nick J. Connors 2022-01-20 00:38:56 -05:00
parent f3a0378217
commit dd68fabf1c
3 changed files with 38 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
NewHorizons/Builder/Props/PropBuilder.cs
View File

@ -58,7 +58,7 @@ namespace NewHorizons.Builder.Props
return MakeDetail(go, sector, prefab, position, rotation, scale, alignWithNormal); return MakeDetail(go, sector, prefab, position, rotation, scale, alignWithNormal);
} }
public static GameObject MakeDetail(GameObject go, Sector sector, GameObject prefab, MVector3 position, MVector3 rotation, float scale, bool alignWithNormal, bool snapToSurface = false) public static GameObject MakeDetail(GameObject go, Sector sector, GameObject prefab, MVector3 position, MVector3 rotation, float scale, bool alignWithNormal, bool snapToSurface, bool generateColliders)
{ {
if (prefab == null) return null; if (prefab == null) return null;
@ -80,9 +80,21 @@ namespace NewHorizons.Builder.Props
sector.OnOccupantEnterSector += ((SectorDetector sd) => StreamingManager.LoadStreamingAssets(assetBundle)); sector.OnOccupantEnterSector += ((SectorDetector sd) => StreamingManager.LoadStreamingAssets(assetBundle));
} }
foreach(var component in prop.GetComponents<SectoredMonoBehaviour>()) foreach(var component in prop.GetComponents<Component>().Concat(prop.GetComponentsInChildren<Component>()))
{ {
component.SetSector(sector); // Enable all children or something
var enabledField = component.GetType().GetField("enabled");
if (enabledField != null && enabledField.FieldType == typeof(bool)) enabledField.SetValue(component, true);
// TODO: Make this work or smthng
if (component is GhostIK) (component as GhostIK).enabled = false;
if (component is GhostEffects) (component as GhostEffects).enabled = false;
if(component is SectoredMonoBehaviour)
{
(component as SectoredMonoBehaviour).SetSector(sector);
}
if (component is AnglerfishController) if (component is AnglerfishController)
{ {
try try
@ -94,21 +106,16 @@ namespace NewHorizons.Builder.Props
Logger.LogError($"Couldn't update AnglerFish chase speed: {e.Message}"); Logger.LogError($"Couldn't update AnglerFish chase speed: {e.Message}");
} }
} }
}
foreach (var component in prop.GetComponentsInChildren<SectoredMonoBehaviour>()) // Mesh colliders
if (generateColliders)
{ {
component.SetSector(sector); if(component is MeshFilter && component.gameObject.GetComponent<MeshCollider>() == null)
}
foreach (var component in prop.GetComponentsInChildren<Component>())
{ {
// TODO: Make this work or smthng var mc = component.gameObject.AddComponent<MeshCollider>();
if (component is GhostIK) (component as GhostIK).enabled = false; mc.sharedMesh = (component as MeshFilter).mesh;
if(component is GhostEffects) (component as GhostEffects).enabled = false; }
}
var enabledField = component.GetType().GetField("enabled");
if(enabledField != null && enabledField.FieldType == typeof(bool)) enabledField.SetValue(component, true);
} }

2
NewHorizons/External/PropModule.cs vendored
View File

@ -21,6 +21,7 @@ namespace NewHorizons.External
public MVector3 offset; public MVector3 offset;
public MVector3 rotation; public MVector3 rotation;
public float scale { get; set; } = 1f; public float scale { get; set; } = 1f;
public bool generateColliders = false;
} }
public class DetailInfo public class DetailInfo
@ -33,6 +34,7 @@ namespace NewHorizons.External
public MVector3 rotation; public MVector3 rotation;
public float scale { get; set; } = 1f; public float scale { get; set; } = 1f;
public bool alignToNormal; public bool alignToNormal;
public bool generateColliders = false;
} }
public class GeyserInfo public class GeyserInfo

10
NewHorizons/schema.json
View File

@ -660,6 +660,11 @@
"scale": { "scale": {
"type": "number", "type": "number",
"default": 1 "default": 1
},
"generateColliders": {
"type": "bool",
"default": false,
"description": "For each mesh filter found here should we make a mesh collider?"
} }
} }
} }
@ -723,6 +728,11 @@
"type": "boolean", "type": "boolean",
"description": "Do we override rotation and try to automatically align this object to stand upright on the body's surface?", "description": "Do we override rotation and try to automatically align this object to stand upright on the body's surface?",
"default": false "default": false
},
"generateColliders": {
"type": "bool",
"default": false,
"description": "For each mesh filter found here should we make a mesh collider?"
} }
} }
} }