diff --git a/NomaiVR/EffectFixes/LoopTransitionFix.cs b/NomaiVR/EffectFixes/LoopTransitionFix.cs index 6406e22..955a08d 100644 --- a/NomaiVR/EffectFixes/LoopTransitionFix.cs +++ b/NomaiVR/EffectFixes/LoopTransitionFix.cs @@ -56,7 +56,7 @@ namespace NomaiVR.EffectFixes var uplinkTrigger = Object.FindObjectOfType(); var statue = uplinkTrigger._lockOnTransform; var eye = statue.Find("Props_NOM_StatueHead/eyelid_mid"); - focus = new GameObject().transform; + focus = new GameObject("VrMemoryUplinkFocus").transform; focus.SetParent(eye, false); var streams = ____reverseStreams.transform; @@ -79,7 +79,7 @@ namespace NomaiVR.EffectFixes if (____screenTransform.parent == __instance.transform) { - parent = new GameObject().transform; + parent = new GameObject("VrFlashbackWrapper").transform; parent.position = __instance.transform.position; parent.rotation = __instance.transform.rotation; foreach (Transform child in __instance.transform) diff --git a/NomaiVR/EffectFixes/MapFix.cs b/NomaiVR/EffectFixes/MapFix.cs index 4a44ba9..375e9e2 100644 --- a/NomaiVR/EffectFixes/MapFix.cs +++ b/NomaiVR/EffectFixes/MapFix.cs @@ -19,7 +19,7 @@ namespace NomaiVR.EffectFixes var originalCamera = mapCameraTransform.GetComponent(); var originalOwCamera = mapCameraTransform.GetComponent(); - var newCamera = new GameObject().transform; + var newCamera = new GameObject("VrMapCamera").transform; newCamera.gameObject.SetActive(false); newCamera.parent = mapCameraTransform; newCamera.localPosition = Vector3.zero; diff --git a/NomaiVR/EffectFixes/ProjectionStoneCameraFix.cs b/NomaiVR/EffectFixes/ProjectionStoneCameraFix.cs index bb2da67..54755b9 100644 --- a/NomaiVR/EffectFixes/ProjectionStoneCameraFix.cs +++ b/NomaiVR/EffectFixes/ProjectionStoneCameraFix.cs @@ -19,7 +19,7 @@ namespace NomaiVR.EffectFixes var camera = ____slavePlatform.GetOwnedCamera().transform; if (camera.parent.name.Contains("Prefab_NOM_RemoteViewer")) { - var parent = new GameObject().transform; + var parent = new GameObject("VrProjectionStoneCameraParent").transform; parent.parent = ____playerHologram; parent.localPosition = new Vector3(0, -2.5f, 0); parent.localRotation = Quaternion.identity; diff --git a/NomaiVR/Hands/HandsController.cs b/NomaiVR/Hands/HandsController.cs index 110c70c..df547fd 100644 --- a/NomaiVR/Hands/HandsController.cs +++ b/NomaiVR/Hands/HandsController.cs @@ -28,7 +28,7 @@ namespace NomaiVR.Hands { if (SceneHelper.IsInTitle()) { - SetUpWrapperTittle(); + SetUpWrapperTitle(); } if (SceneHelper.IsInGame()) @@ -40,12 +40,12 @@ namespace NomaiVR.Hands SetUpHands(); } - private void SetUpWrapperTittle() + private void SetUpWrapperTitle() { var activeCamera = Locator.GetActiveCamera(); activeCamera.gameObject.SetActive(false); wrapper = activeCamera.transform.parent; - var cameraObject = new GameObject(); + var cameraObject = new GameObject("VrTitleCameraWrapper"); cameraObject.SetActive(false); cameraObject.tag = "MainCamera"; var camera = cameraObject.AddComponent(); @@ -72,7 +72,7 @@ namespace NomaiVR.Hands private void SetUpWrapperInGame() { - wrapper = new GameObject().transform; + wrapper = new GameObject("VrGameCameraWrapper").transform; wrapper.parent = Camera.main.transform.parent; wrapper.localRotation = Quaternion.identity; wrapper.localPosition = Camera.main.transform.localPosition; @@ -80,7 +80,7 @@ namespace NomaiVR.Hands private void SetUpHands() { - var right = new GameObject().AddComponent(); + var right = new GameObject("VrRightHand").AddComponent(); right.pose = SteamVR_Actions.default_RightHand; right.transform.parent = wrapper; right.transform.localPosition = Vector3.zero; @@ -92,7 +92,7 @@ namespace NomaiVR.Hands RightHand = right.transform; RightHandBehaviour = right; - var left = new GameObject().AddComponent(); + var left = new GameObject("VrLeftHand").AddComponent(); left.pose = SteamVR_Actions.default_LeftHand; left.transform.parent = wrapper; left.transform.localPosition = Vector3.zero; diff --git a/NomaiVR/NomaiVRModule.cs b/NomaiVR/NomaiVRModule.cs index 0b1be81..248db9f 100644 --- a/NomaiVR/NomaiVRModule.cs +++ b/NomaiVR/NomaiVRModule.cs @@ -51,7 +51,7 @@ namespace NomaiVR } Logs.WriteInfo($"Creating NomaiVR behaviour for {GetType().Name}"); - var gameObject = new GameObject(); + var gameObject = new GameObject($"VrModule-{GetType().Name}"); gameObject.AddComponent(); if (IsPersistent) diff --git a/NomaiVR/Player/PlayerBodyPosition.cs b/NomaiVR/Player/PlayerBodyPosition.cs index 426d698..5ccbdf1 100644 --- a/NomaiVR/Player/PlayerBodyPosition.cs +++ b/NomaiVR/Player/PlayerBodyPosition.cs @@ -53,8 +53,8 @@ namespace NomaiVR.Player { // Make an empty parent object for moving the camera around. playerCamera = Locator.GetPlayerCamera(); - cameraParent = new GameObject().transform; - playArea = new GameObject().transform; + cameraParent = new GameObject("VrCameraParent").transform; + playArea = new GameObject("VrPlayArea").transform; playArea.parent = Locator.GetPlayerTransform(); playArea.position = PlayerHelper.PlayerHead.position; playArea.rotation = PlayerHelper.PlayerHead.rotation; diff --git a/NomaiVR/ReusableBehaviours/Holdable.cs b/NomaiVR/ReusableBehaviours/Holdable.cs index 29ea9f5..822e1b9 100644 --- a/NomaiVR/ReusableBehaviours/Holdable.cs +++ b/NomaiVR/ReusableBehaviours/Holdable.cs @@ -75,9 +75,9 @@ namespace NomaiVR.ReusableBehaviours internal void Start() { - holdableTransform = new GameObject().transform; + holdableTransform = new GameObject("VrHoldable").transform; holdableTransform.localRotation = Quaternion.identity; - rotationTransform = new GameObject().transform; + rotationTransform = new GameObject("VrHoldableRotation").transform; rotationTransform.SetParent(holdableTransform, false); rotationTransform.localPosition = Vector3.zero; rotationTransform.localRotation = rotationOffset; diff --git a/NomaiVR/Ship/ShipLandingCamInteract.cs b/NomaiVR/Ship/ShipLandingCamInteract.cs index a96529a..323c43b 100644 --- a/NomaiVR/Ship/ShipLandingCamInteract.cs +++ b/NomaiVR/Ship/ShipLandingCamInteract.cs @@ -18,7 +18,7 @@ namespace NomaiVR.Ship base.Awake(); cockpitController = FindObjectOfType(); - var canvas = new GameObject().AddComponent(); + var canvas = new GameObject("VrLandingCamCanvas").AddComponent(); canvas.gameObject.AddComponent().GetShouldRender = () => ShouldRenderScreenText() && !cockpitController._landingCam.enabled; var canvasTransform = canvas.transform; @@ -27,7 +27,7 @@ namespace NomaiVR.Ship canvasTransform.localRotation = Quaternion.Euler(53.28f, 0, 0); canvasTransform.localScale = Vector3.one * 0.007f; - var landingText = new GameObject().AddComponent(); + var landingText = new GameObject("VrLandingCamText").AddComponent(); landingText.text = "LANDING CAMERA\n\ninteract with screen\nto activate"; landingText.color = new Color(1, 1, 1, 0.1f); landingText.alignment = TextAnchor.MiddleCenter; diff --git a/NomaiVR/Ship/ShipProbeInteract.cs b/NomaiVR/Ship/ShipProbeInteract.cs index afb8343..a368d6d 100644 --- a/NomaiVR/Ship/ShipProbeInteract.cs +++ b/NomaiVR/Ship/ShipProbeInteract.cs @@ -18,7 +18,7 @@ namespace NomaiVR.Ship base.Awake(); var probeCamDisplay = transform.Find("ProbeCamDisplay"); - var monitorText = new GameObject().AddComponent(); + var monitorText = new GameObject("VrShipProbeMonitorText").AddComponent(); monitorText.gameObject.AddComponent().GetShouldRender = ShouldRenderScreenText; monitorText.text = "PROBE LAUNCHER\n\ninteract with screen\nto activate"; monitorText.color = new Color(1, 1, 1, 0.1f); diff --git a/NomaiVR/Ship/ShipSignalscopeInteract.cs b/NomaiVR/Ship/ShipSignalscopeInteract.cs index 94d2bb2..3fc8336 100644 --- a/NomaiVR/Ship/ShipSignalscopeInteract.cs +++ b/NomaiVR/Ship/ShipSignalscopeInteract.cs @@ -21,7 +21,7 @@ namespace NomaiVR.Ship var sigScopeDisplay = transform.Find("SigScopeDisplay"); - var canvas = new GameObject().AddComponent(); + var canvas = new GameObject("VrShipSignalscopeCanvas").AddComponent(); canvas.gameObject.AddComponent().GetShouldRender = ShouldRenderScreenText; var canvasTransform = canvas.transform; @@ -30,7 +30,7 @@ namespace NomaiVR.Ship canvasTransform.localRotation = sigScopeDisplay.localRotation; canvasTransform.localScale = sigScopeDisplay.localScale; - var monitorText = new GameObject().AddComponent(); + var monitorText = new GameObject("VrShipSignalscopeText").AddComponent(); monitorText.text = "SIGNALSCOPE\n\ninteract with screen to activate"; monitorText.color = new Color(1, 1, 1, 0.1f); monitorText.alignment = TextAnchor.MiddleCenter; diff --git a/NomaiVR/UI/Dialogue.cs b/NomaiVR/UI/Dialogue.cs index d793ec9..69a9bbe 100644 --- a/NomaiVR/UI/Dialogue.cs +++ b/NomaiVR/UI/Dialogue.cs @@ -19,12 +19,13 @@ namespace NomaiVR.UI internal void Start() { + // TODO: Oof, shouldn't rely on GameObject.Find for this. canvasTransform = GameObject.Find("DialogueCanvas").transform; canvasTransform.localScale *= dialogeRenderSize; // Prevent dialogue box from flying off after a while. - canvasTransform.parent = new GameObject().transform; + canvasTransform.parent = new GameObject("VrDialogueWrapper").transform; canvasTransform.parent.gameObject.AddComponent().Target = Locator.GetPlayerTransform(); var canvas = canvasTransform.gameObject.GetComponent(); diff --git a/NomaiVR/UI/GesturePrompts.cs b/NomaiVR/UI/GesturePrompts.cs index 107bd75..9d42d45 100644 --- a/NomaiVR/UI/GesturePrompts.cs +++ b/NomaiVR/UI/GesturePrompts.cs @@ -36,7 +36,7 @@ namespace NomaiVR.UI private void SetUpCanvas() { - canvas = new GameObject().AddComponent(); + canvas = new GameObject("VrGesturePromptCanvas").AddComponent(); canvas.renderMode = RenderMode.WorldSpace; var followTarget = canvas.gameObject.AddComponent(); canvas.transform.localScale = Vector3.one * 0.0015f; @@ -58,7 +58,7 @@ namespace NomaiVR.UI var size = new Vector3(13f, 2f, 1); // Background that draws on top of everything; - var background = new GameObject().AddComponent(); + var background = new GameObject("VrGesturePromptBackground").AddComponent(); background.transform.SetParent(canvas.transform, false); background.transform.localScale = size; background.transform.localPosition = Vector3.forward; @@ -75,7 +75,7 @@ namespace NomaiVR.UI private void SetUpText() { - text = new GameObject().AddComponent(); + text = new GameObject("VrGesturePromptText").AddComponent(); text.color = Color.white; text.transform.SetParent(canvas.transform, false); text.fontSize = 50; diff --git a/NomaiVR/UI/HoldPrompts.cs b/NomaiVR/UI/HoldPrompts.cs index e089210..a5b724d 100644 --- a/NomaiVR/UI/HoldPrompts.cs +++ b/NomaiVR/UI/HoldPrompts.cs @@ -27,7 +27,7 @@ namespace NomaiVR.UI promptCanvas.transform.localPosition = Vector3.zero; promptCanvas.transform.localRotation = Quaternion.identity; - holdTransform = new GameObject().transform; + holdTransform = new GameObject("VrHoldPrompt").transform; HandsController.Behaviour.DominantHandBehaviour.Initialized += ParentToDominantHand; promptCanvas.transform.SetParent(holdTransform, false); diff --git a/NomaiVR/UI/Menus.cs b/NomaiVR/UI/Menus.cs index 6eac3d9..a76c2eb 100644 --- a/NomaiVR/UI/Menus.cs +++ b/NomaiVR/UI/Menus.cs @@ -88,7 +88,7 @@ namespace NomaiVR.UI flashbackCamera = FindObjectOfType().GetComponent(); if (!flashbackCameraParent) { - flashbackCameraParent = new GameObject().transform; + flashbackCameraParent = new GameObject("VrFlashbackCameraWrapper").transform; } if (flashbackCamera.transform.parent == null) {