diff --git a/NomaiVR/Assets/AssetLoader.cs b/NomaiVR/Assets/AssetLoader.cs index 33b6877..a327863 100644 --- a/NomaiVR/Assets/AssetLoader.cs +++ b/NomaiVR/Assets/AssetLoader.cs @@ -124,7 +124,7 @@ namespace NomaiVR.Assets return JsonConvert.DeserializeObject(File.ReadAllText(fullPath)); } - private T LoadAsset(AssetBundle bundle, string prefabName) where T : UnityEngine.Object + private T LoadAsset(AssetBundle bundle, string prefabName) where T : Object { return bundle.LoadAsset($"assets/{prefabName}"); } diff --git a/NomaiVR/Assets/ShaderLoader.cs b/NomaiVR/Assets/ShaderLoader.cs index 246fcf3..a16f5ef 100644 --- a/NomaiVR/Assets/ShaderLoader.cs +++ b/NomaiVR/Assets/ShaderLoader.cs @@ -30,7 +30,7 @@ namespace NomaiVR.Assets return shaderCache[shaderName]; } - public static Shader GetShader(string shaderName) => ShaderLoader.Instance.GetCachedShader(shaderName); - public static void LoadBundle(AssetBundle bundle) => ShaderLoader.Instance.LoadAllFromBundle(bundle); + public static Shader GetShader(string shaderName) => Instance.GetCachedShader(shaderName); + public static void LoadBundle(AssetBundle bundle) => Instance.LoadAllFromBundle(bundle); } } diff --git a/NomaiVR/EffectFixes/FogFix.cs b/NomaiVR/EffectFixes/FogFix.cs index a4f875c..a82885b 100644 --- a/NomaiVR/EffectFixes/FogFix.cs +++ b/NomaiVR/EffectFixes/FogFix.cs @@ -27,12 +27,12 @@ namespace NomaiVR.EffectFixes { public override void ApplyPatches() { - Prefix(nameof(PlanetaryFogController.ResetFogSettings), nameof(Patch.PatchResetFog)); - Prefix(nameof(PlanetaryFogController.UpdateFogSettings), nameof(Patch.PatchUpdateFog)); - Prefix(nameof(FogOverrideVolume.OverrideFogSettings), nameof(Patch.PatchOverrideFog)); - Prefix(nameof(PlanetaryFogImageEffect.OnRenderImage), nameof(Patch.PreFogImageEffectRenderImage)); - Prefix(nameof(PlanetaryFogRenderer.CalcFrustumCorners), nameof(Patch.PreCalcFrustumCorners)); - Prefix(nameof(HeightmapAmbientLightRenderer.CalcFrustumCorners), nameof(Patch.Prefix_HeightmapAmbientLightRenderer_CalcFrustumCorners)); + Prefix(nameof(PlanetaryFogController.ResetFogSettings), nameof(PatchResetFog)); + Prefix(nameof(PlanetaryFogController.UpdateFogSettings), nameof(PatchUpdateFog)); + Prefix(nameof(FogOverrideVolume.OverrideFogSettings), nameof(PatchOverrideFog)); + Prefix(nameof(PlanetaryFogImageEffect.OnRenderImage), nameof(PreFogImageEffectRenderImage)); + Prefix(nameof(PlanetaryFogRenderer.CalcFrustumCorners), nameof(PreCalcFrustumCorners)); + Prefix(nameof(HeightmapAmbientLightRenderer.CalcFrustumCorners), nameof(Prefix_HeightmapAmbientLightRenderer_CalcFrustumCorners)); } private static readonly Vector3[] frustumCornersBuffer = new Vector3[4]; diff --git a/NomaiVR/EffectFixes/LoopTransitionFix.cs b/NomaiVR/EffectFixes/LoopTransitionFix.cs index 3a6bae9..6f6a18d 100644 --- a/NomaiVR/EffectFixes/LoopTransitionFix.cs +++ b/NomaiVR/EffectFixes/LoopTransitionFix.cs @@ -53,7 +53,7 @@ namespace NomaiVR.EffectFixes ____origScreenScale *= 0.5f; var scale = ____origScreenScale; - var uplinkTrigger = GameObject.FindObjectOfType(); + var uplinkTrigger = Object.FindObjectOfType(); var statue = uplinkTrigger._lockOnTransform; var eye = statue.Find("Props_NOM_StatueHead/eyelid_mid"); focus = new GameObject().transform; diff --git a/NomaiVR/EffectFixes/ProjectionStoneCameraFix.cs b/NomaiVR/EffectFixes/ProjectionStoneCameraFix.cs index bd477ce..51dd496 100644 --- a/NomaiVR/EffectFixes/ProjectionStoneCameraFix.cs +++ b/NomaiVR/EffectFixes/ProjectionStoneCameraFix.cs @@ -11,7 +11,7 @@ namespace NomaiVR.EffectFixes { public override void ApplyPatches() { - Postfix("SwitchToRemoteCamera", nameof(Patch.SwitchToRemoteCamera)); + Postfix("SwitchToRemoteCamera", nameof(SwitchToRemoteCamera)); } private static void SwitchToRemoteCamera(NomaiRemoteCameraPlatform ____slavePlatform, Transform ____playerHologram) diff --git a/NomaiVR/EffectFixes/ShadowsFix.cs b/NomaiVR/EffectFixes/ShadowsFix.cs index 15edf18..62a96ad 100644 --- a/NomaiVR/EffectFixes/ShadowsFix.cs +++ b/NomaiVR/EffectFixes/ShadowsFix.cs @@ -12,23 +12,23 @@ namespace NomaiVR.EffectFixes public override void ApplyPatches() { //Solve (1x)PreCull->(2x)PostRender conflicts - Prefix(nameof(CSMTextureCacher.OnAnyCameraPostRender), nameof(Patch.PreOnAnyCameraPostRender)); - Prefix(nameof(RingworldShadowsOverride.OnCameraPostRender), nameof(Patch.OwCameraPostRenderDisabler)); - Prefix(nameof(CloudEffectBubbleController.OnTargetCameraPostRender), nameof(Patch.OwCameraPostRenderDisabler)); - Prefix(nameof(FogWarpEffectBubbleController.OnTargetCameraPostRender), nameof(Patch.OwCameraPostRenderDisabler)); - Prefix(nameof(QuantumFogEffectBubbleController.OnTargetCameraPostRender), nameof(Patch.OwCameraPostRenderDisabler)); - Prefix(nameof(SandEffectBubbleController.OnTargetCameraPostRender), nameof(Patch.OwCameraPostRenderDisabler)); - Prefix(nameof(UnderwaterEffectBubbleController.OnTargetCameraPostRender), nameof(Patch.OwCameraPostRenderDisabler)); - Prefix(nameof(PerCameraRendererState.OnOWCameraPostRender), nameof(Patch.OwCameraPostRenderDisabler)); - Prefix(nameof(GeyserWaterVillageHack.OnPlayerCameraPostRender), nameof(Patch.OwCameraPostRenderDisabler)); - Prefix(nameof(LightLOD.RevertLODSettings), nameof(Patch.OwCameraPostRenderDisabler)); - Prefix(nameof(RingworldSunController.OnOWCameraPostRender), nameof(Patch.OwCameraPostRenderDisabler)); - Prefix(nameof(IPExteriorVisualsManager.OnOWCameraPostRender), nameof(Patch.OwCameraPostRenderDisabler)); - Prefix(nameof(TessellatedSphereRenderer.Clear), nameof(Patch.OwCameraPostRenderDisabler)); - Prefix(nameof(TessellatedPlaneRenderer.Clear), nameof(Patch.OwCameraPostRenderDisabler)); - Prefix(nameof(TessellatedRingRenderer.Clear), nameof(Patch.OwCameraPostRenderDisabler)); - Prefix(nameof(UnderwaterCurrentFadeController.OnAnyPrerender), nameof(Patch.Pre_UnderwaterCurrentFadeController_OnAnyPrerender)); - Prefix(nameof(UnderwaterCurrentFadeController.OnAnyPostrender), nameof(Patch.Pre_UnderwaterCurrentFadeController_OnAnyPostRender)); + Prefix(nameof(CSMTextureCacher.OnAnyCameraPostRender), nameof(PreOnAnyCameraPostRender)); + Prefix(nameof(RingworldShadowsOverride.OnCameraPostRender), nameof(OwCameraPostRenderDisabler)); + Prefix(nameof(CloudEffectBubbleController.OnTargetCameraPostRender), nameof(OwCameraPostRenderDisabler)); + Prefix(nameof(FogWarpEffectBubbleController.OnTargetCameraPostRender), nameof(OwCameraPostRenderDisabler)); + Prefix(nameof(QuantumFogEffectBubbleController.OnTargetCameraPostRender), nameof(OwCameraPostRenderDisabler)); + Prefix(nameof(SandEffectBubbleController.OnTargetCameraPostRender), nameof(OwCameraPostRenderDisabler)); + Prefix(nameof(UnderwaterEffectBubbleController.OnTargetCameraPostRender), nameof(OwCameraPostRenderDisabler)); + Prefix(nameof(PerCameraRendererState.OnOWCameraPostRender), nameof(OwCameraPostRenderDisabler)); + Prefix(nameof(GeyserWaterVillageHack.OnPlayerCameraPostRender), nameof(OwCameraPostRenderDisabler)); + Prefix(nameof(LightLOD.RevertLODSettings), nameof(OwCameraPostRenderDisabler)); + Prefix(nameof(RingworldSunController.OnOWCameraPostRender), nameof(OwCameraPostRenderDisabler)); + Prefix(nameof(IPExteriorVisualsManager.OnOWCameraPostRender), nameof(OwCameraPostRenderDisabler)); + Prefix(nameof(TessellatedSphereRenderer.Clear), nameof(OwCameraPostRenderDisabler)); + Prefix(nameof(TessellatedPlaneRenderer.Clear), nameof(OwCameraPostRenderDisabler)); + Prefix(nameof(TessellatedRingRenderer.Clear), nameof(OwCameraPostRenderDisabler)); + Prefix(nameof(UnderwaterCurrentFadeController.OnAnyPrerender), nameof(Pre_UnderwaterCurrentFadeController_OnAnyPrerender)); + Prefix(nameof(UnderwaterCurrentFadeController.OnAnyPostrender), nameof(Pre_UnderwaterCurrentFadeController_OnAnyPostRender)); } private static bool OwCameraPostRenderDisabler(OWCamera owCamera) diff --git a/NomaiVR/Hands/NomaiVR_Hand_Skeleton.cs b/NomaiVR/Hands/NomaiVR_Hand_Skeleton.cs index 605af27..0b899dd 100644 --- a/NomaiVR/Hands/NomaiVR_Hand_Skeleton.cs +++ b/NomaiVR/Hands/NomaiVR_Hand_Skeleton.cs @@ -53,13 +53,13 @@ namespace NomaiVR.Hands public void BlendBonePosition(int boneIndex, Vector3 blendPosition, float ammount) { blendPosition = Vector3.Lerp(bones[boneIndex].localPosition, blendPosition, ammount); - this.SetBonePosition(boneIndex, blendPosition); + SetBonePosition(boneIndex, blendPosition); } public void BlendBoneRotation(int boneIndex, Quaternion blendRotation, float ammount) { blendRotation = Quaternion.Lerp(bones[boneIndex].localRotation, blendRotation, ammount); - this.SetBoneRotation(boneIndex, blendRotation); + SetBoneRotation(boneIndex, blendRotation); } } } diff --git a/NomaiVR/Helpers/LayerHelper.cs b/NomaiVR/Helpers/LayerHelper.cs index 52cf4b8..861afac 100644 --- a/NomaiVR/Helpers/LayerHelper.cs +++ b/NomaiVR/Helpers/LayerHelper.cs @@ -9,7 +9,7 @@ namespace NomaiVR.Helpers { var layer = LayerMask.NameToLayer(layerName); var ret = new List(); - var all = GameObject.FindObjectsOfType(); + var all = Object.FindObjectsOfType(); foreach (var t in all) { diff --git a/NomaiVR/Helpers/MenuHelper.cs b/NomaiVR/Helpers/MenuHelper.cs index 5e38eb2..49c84fc 100644 --- a/NomaiVR/Helpers/MenuHelper.cs +++ b/NomaiVR/Helpers/MenuHelper.cs @@ -9,14 +9,14 @@ namespace NomaiVR.Helpers { var pauseItems = pauseMenu._pauseMenu.transform.Find("PauseMenuItemsLayout"); var buttonTemplate = pauseItems.Find("Button-Options").gameObject; - var newPauseMenuButton = GameObject.Instantiate(buttonTemplate); + var newPauseMenuButton = Object.Instantiate(buttonTemplate); newPauseMenuButton.transform.SetParent(pauseItems); newPauseMenuButton.transform.SetSiblingIndex(order); var text = newPauseMenuButton.GetComponentInChildren(true); - GameObject.Destroy(newPauseMenuButton.GetComponent()); - GameObject.Destroy(newPauseMenuButton.GetComponent()); - GameObject.Destroy(text.gameObject.GetComponent()); + Object.Destroy(newPauseMenuButton.GetComponent()); + Object.Destroy(newPauseMenuButton.GetComponent()); + Object.Destroy(text.gameObject.GetComponent()); var submitAction = newPauseMenuButton.AddComponent(); submitAction.OnSubmitAction += onSubmit; text.text = name; diff --git a/NomaiVR/Helpers/PlayerHelper.cs b/NomaiVR/Helpers/PlayerHelper.cs index 2f814ec..e62ec10 100644 --- a/NomaiVR/Helpers/PlayerHelper.cs +++ b/NomaiVR/Helpers/PlayerHelper.cs @@ -10,7 +10,7 @@ namespace NomaiVR.Helpers get { if (playerHead == null) { - playerHead = GameObject.FindObjectOfType().transform; + playerHead = Object.FindObjectOfType().transform; } return playerHead; } diff --git a/NomaiVR/Loaders/NomaiVRLoaderOWML.cs b/NomaiVR/Loaders/NomaiVRLoaderOWML.cs index 9013fa1..40e4f81 100644 --- a/NomaiVR/Loaders/NomaiVRLoaderOWML.cs +++ b/NomaiVR/Loaders/NomaiVRLoaderOWML.cs @@ -19,7 +19,7 @@ namespace NomaiVR.Loaders public override void Configure(IModConfig config) { Helper = ModHelper; - var settingsProvider = new ModConfig.OwmlSettingsProvider(config); + var settingsProvider = new OwmlSettingsProvider(config); ModSettings.SetProvider(settingsProvider); } } diff --git a/NomaiVR/Player/PlayerBodyPosition.cs b/NomaiVR/Player/PlayerBodyPosition.cs index d910f16..ad42cb2 100644 --- a/NomaiVR/Player/PlayerBodyPosition.cs +++ b/NomaiVR/Player/PlayerBodyPosition.cs @@ -101,10 +101,10 @@ namespace NomaiVR.Player { public override void ApplyPatches() { - Postfix("UpdateTurning", nameof(Patch.PostCharacterTurning)); - Postfix("FixedUpdate", nameof(Patch.PostThrusterUpdate)); - Prefix("set_fieldOfView", nameof(Patch.PatchOwCameraFOV)); - Prefix("get_fieldOfView", nameof(Patch.GetOwCameraFOVScaled)); + Postfix("UpdateTurning", nameof(PostCharacterTurning)); + Postfix("FixedUpdate", nameof(PostThrusterUpdate)); + Prefix("set_fieldOfView", nameof(PatchOwCameraFOV)); + Prefix("get_fieldOfView", nameof(GetOwCameraFOVScaled)); } private static void PostThrusterUpdate(Vector3 ____rotationalInput) diff --git a/NomaiVR/ReusableBehaviours/Dream/SupportSimulationCamera.cs b/NomaiVR/ReusableBehaviours/Dream/SupportSimulationCamera.cs index 5540f9b..66e619b 100644 --- a/NomaiVR/ReusableBehaviours/Dream/SupportSimulationCamera.cs +++ b/NomaiVR/ReusableBehaviours/Dream/SupportSimulationCamera.cs @@ -15,61 +15,61 @@ namespace NomaiVR.ReusableBehaviours.Dream private void Awake() { - this.camera = gameObject.AddComponent(); - this.camera.stereoTargetEye = StereoTargetEyeMask.Right; - this.simulationRenderTexture = new RenderTexture(Screen.width, Screen.height, 24, RenderTextureFormat.ARGBHalf, RenderTextureReadWrite.sRGB); - this.simulationRenderTexture.name = "SimulationRenderTexture_R"; - this.simulationRenderTexture.useDynamicScale = true; - this.enabled = false; + camera = gameObject.AddComponent(); + camera.stereoTargetEye = StereoTargetEyeMask.Right; + simulationRenderTexture = new RenderTexture(Screen.width, Screen.height, 24, RenderTextureFormat.ARGBHalf, RenderTextureReadWrite.sRGB); + simulationRenderTexture.name = "SimulationRenderTexture_R"; + simulationRenderTexture.useDynamicScale = true; + enabled = false; } public void SetupSimulationCameraParent(SimulationCamera simulationCamera) { this.simulationCamera = simulationCamera; - this.gameObject.layer = simulationCamera.gameObject.layer; - this.camera.cullingMask = simulationCamera._camera.cullingMask; - this.camera.depthTextureMode = DepthTextureMode.Depth; - this.camera.allowMSAA = false; - this.camera.clearFlags = simulationCamera._camera.clearFlags; - this.camera.backgroundColor = simulationCamera._camera.backgroundColor; - this.camera.renderingPath = simulationCamera._camera.renderingPath; - this.camera.depth = simulationCamera._camera.depth; - this.camera.nearClipPlane = simulationCamera._camera.nearClipPlane; - this.camera.farClipPlane = simulationCamera._camera.farClipPlane; - this.camera.allowDynamicResolution = simulationCamera._camera.allowDynamicResolution; + gameObject.layer = simulationCamera.gameObject.layer; + camera.cullingMask = simulationCamera._camera.cullingMask; + camera.depthTextureMode = DepthTextureMode.Depth; + camera.allowMSAA = false; + camera.clearFlags = simulationCamera._camera.clearFlags; + camera.backgroundColor = simulationCamera._camera.backgroundColor; + camera.renderingPath = simulationCamera._camera.renderingPath; + camera.depth = simulationCamera._camera.depth; + camera.nearClipPlane = simulationCamera._camera.nearClipPlane; + camera.farClipPlane = simulationCamera._camera.farClipPlane; + camera.allowDynamicResolution = simulationCamera._camera.allowDynamicResolution; simulationCamera._simulationMaskMaterial.shader = ShaderLoader.GetShader("Hidden/StereoBlitSimulationMask"); simulationCamera._simulationCompositeMaterial.shader = ShaderLoader.GetShader("Hidden/StereoBlitSimulationComposite"); - simulationCamera._simulationMaskMaterial.SetTexture("_RightTex", this.simulationRenderTexture); - simulationCamera._simulationCompositeMaterial.SetTexture("_RightTex", this.simulationRenderTexture); + simulationCamera._simulationMaskMaterial.SetTexture("_RightTex", simulationRenderTexture); + simulationCamera._simulationCompositeMaterial.SetTexture("_RightTex", simulationRenderTexture); } private void OnEnable() { - this.camera.enabled = true; + camera.enabled = true; } private void OnDisable() { - this.camera.enabled = false; + camera.enabled = false; } public void AllocateTexture() { - this.simulationRenderTexture.Create(); - this.camera.targetTexture = this.simulationRenderTexture; + simulationRenderTexture.Create(); + camera.targetTexture = simulationRenderTexture; } public void DeallocateTexture() { - this.camera.targetTexture = null; - this.simulationRenderTexture.Release(); + camera.targetTexture = null; + simulationRenderTexture.Release(); } private void OnDestroy() { - this.simulationRenderTexture.Release(); - GameObject.Destroy(this.simulationRenderTexture); - this.simulationRenderTexture = null; + simulationRenderTexture.Release(); + Destroy(simulationRenderTexture); + simulationRenderTexture = null; } public void VerifyRenderTexResolution(Camera targetCamera) @@ -78,26 +78,26 @@ namespace NomaiVR.ReusableBehaviours.Dream { return; } - if (this.simulationRenderTexture.width == targetCamera.pixelWidth && this.simulationRenderTexture.height == targetCamera.pixelHeight) + if (simulationRenderTexture.width == targetCamera.pixelWidth && simulationRenderTexture.height == targetCamera.pixelHeight) { return; } - if (this.simulationRenderTexture.IsCreated()) + if (simulationRenderTexture.IsCreated()) { - this.simulationRenderTexture.Release(); - this.simulationRenderTexture.width = targetCamera.pixelWidth; - this.simulationRenderTexture.height = targetCamera.pixelHeight; - this.simulationRenderTexture.Create(); + simulationRenderTexture.Release(); + simulationRenderTexture.width = targetCamera.pixelWidth; + simulationRenderTexture.height = targetCamera.pixelHeight; + simulationRenderTexture.Create(); return; } - this.simulationRenderTexture.width = targetCamera.pixelWidth; - this.simulationRenderTexture.height = targetCamera.pixelHeight; + simulationRenderTexture.width = targetCamera.pixelWidth; + simulationRenderTexture.height = targetCamera.pixelHeight; } private void OnPreRender() { - if (this.simulationCamera == null || this.simulationCamera._targetCamera == null) return; - GraphicsHelper.ForceCameraToEye(this.camera, this.simulationCamera._targetCamera.mainCamera, Valve.VR.EVREye.Eye_Right); + if (simulationCamera == null || simulationCamera._targetCamera == null) return; + GraphicsHelper.ForceCameraToEye(camera, simulationCamera._targetCamera.mainCamera, Valve.VR.EVREye.Eye_Right); } } } \ No newline at end of file diff --git a/NomaiVR/ReusableBehaviours/Dream/VRMindProjectorImageEffect.cs b/NomaiVR/ReusableBehaviours/Dream/VRMindProjectorImageEffect.cs index 5803caf..8a42a46 100644 --- a/NomaiVR/ReusableBehaviours/Dream/VRMindProjectorImageEffect.cs +++ b/NomaiVR/ReusableBehaviours/Dream/VRMindProjectorImageEffect.cs @@ -22,13 +22,13 @@ namespace NomaiVR.ReusableBehaviours.Dream private void Start() { var quad = GameObject.CreatePrimitive(PrimitiveType.Quad); - GameObject.Destroy(quad.GetComponent()); - GameObject.Destroy(quad.GetComponent()); + Destroy(quad.GetComponent()); + Destroy(quad.GetComponent()); quad.name = "MindProjectorPlane"; var dome = GameObject.CreatePrimitive(PrimitiveType.Sphere); - GameObject.Destroy(dome.GetComponent()); - GameObject.Destroy(dome.GetComponent()); + Destroy(dome.GetComponent()); + Destroy(dome.GetComponent()); var domeMesh = dome.GetComponent().mesh; domeMesh.triangles = domeMesh.triangles.Reverse().ToArray(); //We need a reverse dome dome.name = "MindProjectorEyeDome"; @@ -60,7 +60,7 @@ namespace NomaiVR.ReusableBehaviours.Dream eyeDome.localPosition = Vector3.zero; eyeDome.localScale = Vector3.one * 10; - this.enabled = false; + enabled = false; } private void OnEnable() @@ -82,7 +82,7 @@ namespace NomaiVR.ReusableBehaviours.Dream currentColor = Color.black; currentColor.a = (1 - EyeOpenness*EyeOpenness); fadeMaterial.SetColor(fadeMaterialColorID, currentColor); - this.projectionMaterial.SetFloat(shaderPropIDUnscaledTime, Time.unscaledTime); + projectionMaterial.SetFloat(shaderPropIDUnscaledTime, Time.unscaledTime); } } } diff --git a/NomaiVR/UI/TitleMenuLogoFader.cs b/NomaiVR/UI/TitleMenuLogoFader.cs index 93c0a9c..62c6b64 100644 --- a/NomaiVR/UI/TitleMenuLogoFader.cs +++ b/NomaiVR/UI/TitleMenuLogoFader.cs @@ -45,7 +45,7 @@ namespace NomaiVR.UI this.fadeFunc = fadeFunc; this.activationFunc = activationFunc; this.forceOff = forceOff; - this.enabled = true; + enabled = true; } private void FadeTo(float value) @@ -66,7 +66,7 @@ namespace NomaiVR.UI FadeTo(fadeTo * Mathf.Clamp(percentage, 0, 1)); if (percentage >= 1) - this.enabled = false; + enabled = false; } else if(activationFunc != null && activationFunc.Invoke()) {