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

Vr camera fix (#534)

Browse Source 
## Bug fixes
- Should fix some compatibility issues with NomaiVR

(Also fixes new proc gen Nomai text showing on held scrolls - don't need
that in the patch notes tho)
This commit is contained in:
Nick 2023-03-04 17:26:09 -05:00 committed by GitHub
commit ae7ddb9ac9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -344,7 +344,7 @@ namespace NewHorizons.Builder.Props
// fix campfires // fix campfires
if (component is InteractVolume interactVolume) if (component is InteractVolume interactVolume)
{ {
interactVolume._playerCam = GameObject.Find("Player_Body/PlayerCamera").GetComponent<OWCamera>(); Delay.FireOnNextUpdate(() => interactVolume._playerCam = Locator.GetPlayerCamera());
} }
if (component is PlayerAttachPoint playerAttachPoint) if (component is PlayerAttachPoint playerAttachPoint)
{ {
@ -352,7 +352,7 @@ namespace NewHorizons.Builder.Props
playerAttachPoint._playerController = playerBody.GetComponent<PlayerCharacterController>(); playerAttachPoint._playerController = playerBody.GetComponent<PlayerCharacterController>();
playerAttachPoint._playerOWRigidbody = playerBody.GetComponent<OWRigidbody>(); playerAttachPoint._playerOWRigidbody = playerBody.GetComponent<OWRigidbody>();
playerAttachPoint._playerTransform = playerBody.transform; playerAttachPoint._playerTransform = playerBody.transform;
playerAttachPoint._fpsCamController = GameObject.Find("Player_Body/PlayerCamera").GetComponent<PlayerCameraController>(); Delay.FireOnNextUpdate(() => playerAttachPoint._fpsCamController = Locator.GetPlayerCameraController());
} }
if (component is NomaiInterfaceOrb orb) if (component is NomaiInterfaceOrb orb)
@ -365,7 +365,7 @@ namespace NewHorizons.Builder.Props
{ {
torchItem.enabled = true; torchItem.enabled = true;
torchItem.mindProjectorTrigger.enabled = true; torchItem.mindProjectorTrigger.enabled = true;
torchItem.mindSlideProjector._mindProjectorImageEffect = SearchUtilities.Find("Player_Body/PlayerCamera").GetComponent<MindProjectorImageEffect>(); Delay.FireOnNextUpdate(() => torchItem.mindSlideProjector._mindProjectorImageEffect = Locator.GetPlayerCamera().GetComponent<MindProjectorImageEffect>());
} }
if (component is Animator animator) animator.enabled = true; if (component is Animator animator) animator.enabled = true;

8
NewHorizons/Builder/Props/TranslatorText/TranslatorTextBuilder.cs
View File

@ -269,9 +269,7 @@ namespace NewHorizons.Builder.Props
customScroll.SetActive(true); customScroll.SetActive(true);
// Enable the collider and renderer Delay.FireOnNextUpdate(
Delay.RunWhen(
() => Main.IsSystemReady,
() => () =>
{ {
Logger.LogVerbose("Fixing scroll!"); Logger.LogVerbose("Fixing scroll!");
@ -281,8 +279,12 @@ namespace NewHorizons.Builder.Props
customScroll.transform.Find("Props_NOM_Scroll/Props_NOM_Scroll_Collider").gameObject.SetActive(true); customScroll.transform.Find("Props_NOM_Scroll/Props_NOM_Scroll_Collider").gameObject.SetActive(true);
nomaiWallText.gameObject.GetComponent<Collider>().enabled = false; nomaiWallText.gameObject.GetComponent<Collider>().enabled = false;
customScroll.GetComponent<CapsuleCollider>().enabled = true; customScroll.GetComponent<CapsuleCollider>().enabled = true;
scrollItem._nomaiWallText.HideImmediate();
scrollItem._nomaiWallText._collider.SetActivation(true);
scrollItem.SetColliderActivation(true);
} }
); );
conversationInfoToCorrespondingSpawnedGameObject[info] = customScroll; conversationInfoToCorrespondingSpawnedGameObject[info] = customScroll;
return customScroll; return customScroll;

26
docs/Pipfile.lock generated
View File

@ -1,10 +1,12 @@
{ {
"_meta": { "_meta": {
"hash": { "hash": {
"sha256": "d0e23851039e578ecd7c2df24e2808d281315a5e40fdeccd730ecd29cd17de8d" "sha256": "e93f7f7087f635da529dc8dbaa56be872c12a26be4d8cfcaa9393f12fe7f1bda"
}, },
"pipfile-spec": 6, "pipfile-spec": 6,
"requires": {}, "requires": {
"python_version": "3.11"
},
"sources": [ "sources": [
{ {
"name": "pypi", "name": "pypi",
@ -28,7 +30,7 @@
"sha256:58d5c3d29f5a36ffeb94f02f0d786cd53014cf9b3b3951d42e0080d8a9498d30", "sha256:58d5c3d29f5a36ffeb94f02f0d786cd53014cf9b3b3951d42e0080d8a9498d30",
"sha256:ad9aa55b65ef2808eb405f46cf74df7fcb7044d5cbc26487f96eb2ef2e436693" "sha256:ad9aa55b65ef2808eb405f46cf74df7fcb7044d5cbc26487f96eb2ef2e436693"
], ],
"markers": "python_version >= '3.6'", "markers": "python_full_version >= '3.6.0'",
"version": "==4.11.1" "version": "==4.11.1"
}, },
"certifi": { "certifi": {
@ -141,14 +143,6 @@
"markers": "python_version >= '3.7'", "markers": "python_version >= '3.7'",
"version": "==8.1.3" "version": "==8.1.3"
}, },
"colorama": {
"hashes": [
"sha256:08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44",
"sha256:4f1d9991f5acc0ca119f9d443620b77f9d6b33703e51011c16baf57afb285fc6"
],
"markers": "platform_system == 'Windows'",
"version": "==0.4.6"
},
"dataclasses-json": { "dataclasses-json": {
"hashes": [ "hashes": [
"sha256:bc285b5f892094c3a53d558858a88553dd6a61a11ab1a8128a0e554385dcc5dd", "sha256:bc285b5f892094c3a53d558858a88553dd6a61a11ab1a8128a0e554385dcc5dd",
@ -234,7 +228,7 @@
"sha256:528f978beb3dbcf529a139b6c76f6ac6ecf8bb96c131beab751bb095b3873b58", "sha256:528f978beb3dbcf529a139b6c76f6ac6ecf8bb96c131beab751bb095b3873b58",
"sha256:f65b4dbe1e16591b14fd40bc659b8b58d285eab70c1da21f390294fcdec42bb0" "sha256:f65b4dbe1e16591b14fd40bc659b8b58d285eab70c1da21f390294fcdec42bb0"
], ],
"markers": "python_version >= '3.5' and python_version < '4.0'", "markers": "python_version >= '3.5' and python_version < '4'",
"version": "==2.4.6" "version": "==2.4.6"
}, },
"markupsafe": { "markupsafe": {
@ -310,11 +304,11 @@
}, },
"menagerie-docs": { "menagerie-docs": {
"hashes": [ "hashes": [
"sha256:0b07000ced6adebb061dcf17d334c82259a21739cbca22f33e2675cfd53bacd3", "sha256:214fb87bf94ce1b814c718ae98e319ef470fe3ea0b01f215ab43e46623289e92",
"sha256:127e687358e49bc155fb5d94519f35389423391e7b984980c117ed279d89c82f" "sha256:b20d0f099edd3316f00e72ef754d885982a3f80c80c70ca8a01d43721388813b"
], ],
"index": "pypi", "index": "pypi",
"version": "==0.1.12" "version": "==0.1.13"
}, },
"more-itertools": { "more-itertools": {
"hashes": [ "hashes": [
@ -557,7 +551,7 @@
"sha256:64299f4909223da747622c030b781c0d7811e359c37124b4bd368fb8c6518baa", "sha256:64299f4909223da747622c030b781c0d7811e359c37124b4bd368fb8c6518baa",
"sha256:98b1b2782e3c6c4904938b84c0eb932721069dfdb9134313beff7c83c2df24bf" "sha256:98b1b2782e3c6c4904938b84c0eb932721069dfdb9134313beff7c83c2df24bf"
], ],
"markers": "python_version >= '3.7' and python_version < '4.0'", "markers": "python_version >= '3.7' and python_version < '4'",
"version": "==2.28.2" "version": "==2.28.2"
}, },
"rjsmin": { "rjsmin": {