Gittes-archive/nomai-vr
2
0
Fork 0
mirror of https://github.com/Raicuparta/nomai-vr.git synced 2025-12-11 20:15:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup

Browse Source
This commit is contained in:
Raicuparta 2021-11-14 12:11:52 +01:00 committed by Ricardo
parent cfb237a681
commit e3bf843886
15 changed files with 87 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NomaiVR/Assets/AssetLoader.cs
View File

@ -124,7 +124,7 @@ namespace NomaiVR.Assets
return JsonConvert.DeserializeObject<T>(File.ReadAllText(fullPath));
}
private T LoadAsset<T>(AssetBundle bundle, string prefabName) where T : UnityEngine.Object
private T LoadAsset<T>(AssetBundle bundle, string prefabName) where T : Object
{
return bundle.LoadAsset<T>($"assets/{prefabName}");
}

4
NomaiVR/Assets/ShaderLoader.cs
View File

@ -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);
}
}

12
NomaiVR/EffectFixes/FogFix.cs
View File

@ -27,12 +27,12 @@ namespace NomaiVR.EffectFixes
{
public override void ApplyPatches()
{
Prefix<PlanetaryFogController>(nameof(PlanetaryFogController.ResetFogSettings), nameof(Patch.PatchResetFog));
Prefix<PlanetaryFogController>(nameof(PlanetaryFogController.UpdateFogSettings), nameof(Patch.PatchUpdateFog));
Prefix<FogOverrideVolume>(nameof(FogOverrideVolume.OverrideFogSettings), nameof(Patch.PatchOverrideFog));
Prefix<PlanetaryFogImageEffect>(nameof(PlanetaryFogImageEffect.OnRenderImage), nameof(Patch.PreFogImageEffectRenderImage));
Prefix<PlanetaryFogRenderer>(nameof(PlanetaryFogRenderer.CalcFrustumCorners), nameof(Patch.PreCalcFrustumCorners));
Prefix<HeightmapAmbientLightRenderer>(nameof(HeightmapAmbientLightRenderer.CalcFrustumCorners), nameof(Patch.Prefix_HeightmapAmbientLightRenderer_CalcFrustumCorners));
Prefix<PlanetaryFogController>(nameof(PlanetaryFogController.ResetFogSettings), nameof(PatchResetFog));
Prefix<PlanetaryFogController>(nameof(PlanetaryFogController.UpdateFogSettings), nameof(PatchUpdateFog));
Prefix<FogOverrideVolume>(nameof(FogOverrideVolume.OverrideFogSettings), nameof(PatchOverrideFog));
Prefix<PlanetaryFogImageEffect>(nameof(PlanetaryFogImageEffect.OnRenderImage), nameof(PreFogImageEffectRenderImage));
Prefix<PlanetaryFogRenderer>(nameof(PlanetaryFogRenderer.CalcFrustumCorners), nameof(PreCalcFrustumCorners));
Prefix<HeightmapAmbientLightRenderer>(nameof(HeightmapAmbientLightRenderer.CalcFrustumCorners), nameof(Prefix_HeightmapAmbientLightRenderer_CalcFrustumCorners));
}
private static readonly Vector3[] frustumCornersBuffer = new Vector3[4];

2
NomaiVR/EffectFixes/LoopTransitionFix.cs
View File

@ -53,7 +53,7 @@ namespace NomaiVR.EffectFixes
____origScreenScale *= 0.5f;
var scale = ____origScreenScale;
var uplinkTrigger = GameObject.FindObjectOfType<MemoryUplinkTrigger>();
var uplinkTrigger = Object.FindObjectOfType<MemoryUplinkTrigger>();
var statue = uplinkTrigger._lockOnTransform;
var eye = statue.Find("Props_NOM_StatueHead/eyelid_mid");
focus = new GameObject().transform;

2
NomaiVR/EffectFixes/ProjectionStoneCameraFix.cs
View File

@ -11,7 +11,7 @@ namespace NomaiVR.EffectFixes
{
public override void ApplyPatches()
{
Postfix<NomaiRemoteCameraPlatform>("SwitchToRemoteCamera", nameof(Patch.SwitchToRemoteCamera));
Postfix<NomaiRemoteCameraPlatform>("SwitchToRemoteCamera", nameof(SwitchToRemoteCamera));
}
private static void SwitchToRemoteCamera(NomaiRemoteCameraPlatform ____slavePlatform, Transform ____playerHologram)

34
NomaiVR/EffectFixes/ShadowsFix.cs
View File

@ -12,23 +12,23 @@ namespace NomaiVR.EffectFixes
public override void ApplyPatches()
{
//Solve (1x)PreCull->(2x)PostRender conflicts
Prefix<CSMTextureCacher>(nameof(CSMTextureCacher.OnAnyCameraPostRender), nameof(Patch.PreOnAnyCameraPostRender));
Prefix<RingworldShadowsOverride>(nameof(RingworldShadowsOverride.OnCameraPostRender), nameof(Patch.OwCameraPostRenderDisabler));
Prefix<CloudEffectBubbleController>(nameof(CloudEffectBubbleController.OnTargetCameraPostRender), nameof(Patch.OwCameraPostRenderDisabler));
Prefix<FogWarpEffectBubbleController>(nameof(FogWarpEffectBubbleController.OnTargetCameraPostRender), nameof(Patch.OwCameraPostRenderDisabler));
Prefix<QuantumFogEffectBubbleController>(nameof(QuantumFogEffectBubbleController.OnTargetCameraPostRender), nameof(Patch.OwCameraPostRenderDisabler));
Prefix<SandEffectBubbleController>(nameof(SandEffectBubbleController.OnTargetCameraPostRender), nameof(Patch.OwCameraPostRenderDisabler));
Prefix<UnderwaterEffectBubbleController>(nameof(UnderwaterEffectBubbleController.OnTargetCameraPostRender), nameof(Patch.OwCameraPostRenderDisabler));
Prefix<PerCameraRendererState>(nameof(PerCameraRendererState.OnOWCameraPostRender), nameof(Patch.OwCameraPostRenderDisabler));
Prefix<GeyserWaterVillageHack>(nameof(GeyserWaterVillageHack.OnPlayerCameraPostRender), nameof(Patch.OwCameraPostRenderDisabler));
Prefix<LightLOD>(nameof(LightLOD.RevertLODSettings), nameof(Patch.OwCameraPostRenderDisabler));
Prefix<RingworldSunController>(nameof(RingworldSunController.OnOWCameraPostRender), nameof(Patch.OwCameraPostRenderDisabler));
Prefix<IPExteriorVisualsManager>(nameof(IPExteriorVisualsManager.OnOWCameraPostRender), nameof(Patch.OwCameraPostRenderDisabler));
Prefix<TessellatedSphereRenderer>(nameof(TessellatedSphereRenderer.Clear), nameof(Patch.OwCameraPostRenderDisabler));
Prefix<TessellatedPlaneRenderer>(nameof(TessellatedPlaneRenderer.Clear), nameof(Patch.OwCameraPostRenderDisabler));
Prefix<TessellatedRingRenderer>(nameof(TessellatedRingRenderer.Clear), nameof(Patch.OwCameraPostRenderDisabler));
Prefix<UnderwaterCurrentFadeController>(nameof(UnderwaterCurrentFadeController.OnAnyPrerender), nameof(Patch.Pre_UnderwaterCurrentFadeController_OnAnyPrerender));
Prefix<UnderwaterCurrentFadeController>(nameof(UnderwaterCurrentFadeController.OnAnyPostrender), nameof(Patch.Pre_UnderwaterCurrentFadeController_OnAnyPostRender));
Prefix<CSMTextureCacher>(nameof(CSMTextureCacher.OnAnyCameraPostRender), nameof(PreOnAnyCameraPostRender));
Prefix<RingworldShadowsOverride>(nameof(RingworldShadowsOverride.OnCameraPostRender), nameof(OwCameraPostRenderDisabler));
Prefix<CloudEffectBubbleController>(nameof(CloudEffectBubbleController.OnTargetCameraPostRender), nameof(OwCameraPostRenderDisabler));
Prefix<FogWarpEffectBubbleController>(nameof(FogWarpEffectBubbleController.OnTargetCameraPostRender), nameof(OwCameraPostRenderDisabler));
Prefix<QuantumFogEffectBubbleController>(nameof(QuantumFogEffectBubbleController.OnTargetCameraPostRender), nameof(OwCameraPostRenderDisabler));
Prefix<SandEffectBubbleController>(nameof(SandEffectBubbleController.OnTargetCameraPostRender), nameof(OwCameraPostRenderDisabler));
Prefix<UnderwaterEffectBubbleController>(nameof(UnderwaterEffectBubbleController.OnTargetCameraPostRender), nameof(OwCameraPostRenderDisabler));
Prefix<PerCameraRendererState>(nameof(PerCameraRendererState.OnOWCameraPostRender), nameof(OwCameraPostRenderDisabler));
Prefix<GeyserWaterVillageHack>(nameof(GeyserWaterVillageHack.OnPlayerCameraPostRender), nameof(OwCameraPostRenderDisabler));
Prefix<LightLOD>(nameof(LightLOD.RevertLODSettings), nameof(OwCameraPostRenderDisabler));
Prefix<RingworldSunController>(nameof(RingworldSunController.OnOWCameraPostRender), nameof(OwCameraPostRenderDisabler));
Prefix<IPExteriorVisualsManager>(nameof(IPExteriorVisualsManager.OnOWCameraPostRender), nameof(OwCameraPostRenderDisabler));
Prefix<TessellatedSphereRenderer>(nameof(TessellatedSphereRenderer.Clear), nameof(OwCameraPostRenderDisabler));
Prefix<TessellatedPlaneRenderer>(nameof(TessellatedPlaneRenderer.Clear), nameof(OwCameraPostRenderDisabler));
Prefix<TessellatedRingRenderer>(nameof(TessellatedRingRenderer.Clear), nameof(OwCameraPostRenderDisabler));
Prefix<UnderwaterCurrentFadeController>(nameof(UnderwaterCurrentFadeController.OnAnyPrerender), nameof(Pre_UnderwaterCurrentFadeController_OnAnyPrerender));
Prefix<UnderwaterCurrentFadeController>(nameof(UnderwaterCurrentFadeController.OnAnyPostrender), nameof(Pre_UnderwaterCurrentFadeController_OnAnyPostRender));
}
private static bool OwCameraPostRenderDisabler(OWCamera owCamera)

4
NomaiVR/Hands/NomaiVR_Hand_Skeleton.cs
View File

@ -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);
}
}
}

2
NomaiVR/Helpers/LayerHelper.cs
View File

@ -9,7 +9,7 @@ namespace NomaiVR.Helpers
{
var layer = LayerMask.NameToLayer(layerName);
var ret = new List<GameObject>();
var all = GameObject.FindObjectsOfType<GameObject>();
var all = Object.FindObjectsOfType<GameObject>();
foreach (var t in all)
{

8
NomaiVR/Helpers/MenuHelper.cs
View File

@ -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<Text>(true);
GameObject.Destroy(newPauseMenuButton.GetComponent<Menu>());
GameObject.Destroy(newPauseMenuButton.GetComponent<SubmitActionMenu>());
GameObject.Destroy(text.gameObject.GetComponent<LocalizedText>());
Object.Destroy(newPauseMenuButton.GetComponent<Menu>());
Object.Destroy(newPauseMenuButton.GetComponent<SubmitActionMenu>());
Object.Destroy(text.gameObject.GetComponent<LocalizedText>());
var submitAction = newPauseMenuButton.AddComponent<SubmitAction>();
submitAction.OnSubmitAction += onSubmit;
text.text = name;

2
NomaiVR/Helpers/PlayerHelper.cs
View File

@ -10,7 +10,7 @@ namespace NomaiVR.Helpers
get {
if (playerHead == null)
{
playerHead = GameObject.FindObjectOfType<ToolModeUI>().transform;
playerHead = Object.FindObjectOfType<ToolModeUI>().transform;
}
return playerHead;
}

2
NomaiVR/Loaders/NomaiVRLoaderOWML.cs
View File

@ -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);
}
}

8
NomaiVR/Player/PlayerBodyPosition.cs
View File

@ -101,10 +101,10 @@ namespace NomaiVR.Player
{
public override void ApplyPatches()
{
Postfix<PlayerCharacterController>("UpdateTurning", nameof(Patch.PostCharacterTurning));
Postfix<JetpackThrusterController>("FixedUpdate", nameof(Patch.PostThrusterUpdate));
Prefix<OWCamera>("set_fieldOfView", nameof(Patch.PatchOwCameraFOV));
Prefix<OWCamera>("get_fieldOfView", nameof(Patch.GetOwCameraFOVScaled));
Postfix<PlayerCharacterController>("UpdateTurning", nameof(PostCharacterTurning));
Postfix<JetpackThrusterController>("FixedUpdate", nameof(PostThrusterUpdate));
Prefix<OWCamera>("set_fieldOfView", nameof(PatchOwCameraFOV));
Prefix<OWCamera>("get_fieldOfView", nameof(GetOwCameraFOVScaled));
}
private static void PostThrusterUpdate(Vector3 ____rotationalInput)

76
NomaiVR/ReusableBehaviours/Dream/SupportSimulationCamera.cs
View File

@ -15,61 +15,61 @@ namespace NomaiVR.ReusableBehaviours.Dream
private void Awake()
{
this.camera = gameObject.AddComponent<Camera>();
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>();
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);
}
}
}

12
NomaiVR/ReusableBehaviours/Dream/VRMindProjectorImageEffect.cs
View File

@ -22,13 +22,13 @@ namespace NomaiVR.ReusableBehaviours.Dream
private void Start()
{
var quad = GameObject.CreatePrimitive(PrimitiveType.Quad);
GameObject.Destroy(quad.GetComponent<Collider>());
GameObject.Destroy(quad.GetComponent<Rigidbody>());
Destroy(quad.GetComponent<Collider>());
Destroy(quad.GetComponent<Rigidbody>());
quad.name = "MindProjectorPlane";
var dome = GameObject.CreatePrimitive(PrimitiveType.Sphere);
GameObject.Destroy(dome.GetComponent<Collider>());
GameObject.Destroy(dome.GetComponent<Rigidbody>());
Destroy(dome.GetComponent<Collider>());
Destroy(dome.GetComponent<Rigidbody>());
var domeMesh = dome.GetComponent<MeshFilter>().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);
}
}
}

4
NomaiVR/UI/TitleMenuLogoFader.cs
View File

@ -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())
{