From 5b52a31b5d9ff830d7011e4b4f55626855f4e666 Mon Sep 17 00:00:00 2001 From: NotAKidoS <37721153+NotAKidOnSteam@users.noreply.github.com> Date: Mon, 17 Oct 2022 20:00:40 -0500 Subject: [PATCH] Fix mirror & shader queue..? --- Blackout/BlackoutController.cs | 21 +++++++++++++++++-- Blackout/resources/blackout_controller.asset | Bin 13708 -> 13702 bytes 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/Blackout/BlackoutController.cs b/Blackout/BlackoutController.cs index c3c1f2e..d4faf30 100644 --- a/Blackout/BlackoutController.cs +++ b/Blackout/BlackoutController.cs @@ -59,6 +59,7 @@ public class BlackoutController : MonoBehaviour Sleeping, } + private GameObject activeModeCam; private Quaternion oldHeadRotation = Quaternion.identity; private float angularMovement = 0f; private float curTime = 0f; @@ -125,7 +126,7 @@ public class BlackoutController : MonoBehaviour nextUpdate = Mathf.FloorToInt(curTime) + 1; //get difference between last frame rotation and current rotation - Quaternion currentHeadRotation = PlayerSetup.Instance.GetActiveCamera().transform.rotation; + Quaternion currentHeadRotation = activeModeCam.transform.rotation; angularMovement = Quaternion.Angle(oldHeadRotation, currentHeadRotation); oldHeadRotation = currentHeadRotation; @@ -150,16 +151,32 @@ public class BlackoutController : MonoBehaviour { curTime = Time.time; lastAwakeTime = curTime; + Camera.onPreRender += OnPreRender; + Camera.onPostRender += OnPostRender; } void OnDisable() { ChangeBlackoutState(BlackoutState.Awake); + Camera.onPreRender -= OnPreRender; + Camera.onPostRender -= OnPostRender; + } + + void OnPreRender(Camera cam) + { + if (cam != activeModeCam.GetComponent()) return; + blackoutAnimator.transform.localScale = Vector3.zero; + } + + void OnPostRender(Camera cam) + { + blackoutAnimator.transform.localScale = Vector3.one; } public void SetupBlackoutInstance() { - blackoutAnimator.transform.parent = PlayerSetup.Instance.GetActiveCamera().transform; + activeModeCam = PlayerSetup.Instance.GetActiveCamera(); + blackoutAnimator.transform.parent = activeModeCam.transform; blackoutAnimator.transform.localPosition = Vector3.zero; blackoutAnimator.transform.localRotation = Quaternion.identity; blackoutAnimator.transform.localScale = Vector3.one; diff --git a/Blackout/resources/blackout_controller.asset b/Blackout/resources/blackout_controller.asset index 8c44df3f5bcd19e8f08b8d5010d7e89ee04057fc..b9205609d495f10eaa239a0df6bb39809e999f1f 100644 GIT binary patch delta 1132 zcmV-y1e5!WYldr(B>{$!CMN*}u}BNSQ_dmbKGN5z`SAGdazt~$Kx4t}a+gR0U3a+Xe}~fi zmg^TEg=+vlLIgT(EQ0nk1imlS=CHPasn4$n)ilO!kU2iTfhQWj4JP=JxP9J(-NnnM z!LTdN*#?Q3?gc`e8ET8o$@xkax4ZE`Tg!GLj0IJyv)AGm$c2wM-v4yCQ4YrhXKtUE zpT{=t|CJenB*@*57)n4w8Oeefe^Wu!gEmmMuPPZ*ZELRLT_hfb0nH4u2w|?PiRAP? zeMiK_Gi|zwGf<2P-&k8EARr zdRN}qWu-#@q64>58oeq^iVs_0OnmtlV1c-iY@{tcexgtqu)4{b+Ol@Ne^gJRs6S_g z-zLQT+*gvVuYk+cn}PdH>vjed z%)(WR69^|ukQU%|$yyOcdZj-7?v)S4H;&ZYuqVz+rPeeBNUsmp8hTb_I%Jss7@j6{ z3O#50n7W!vX3Ei3J5DgE`}XVJCe6(_Ve;%~*A!LOE9O-6$z7*te53Hxi73WV*x-p zb-+_pom!=rR-f}l953dZlT&bjL)tKZ!tZ7aOF$Qr`mBOSSjSh{;9xO4kZQk_A)fdy z$aB1h24yv3=k2IXe}_6RTi|-Y!2Tlpr;R(_bgCMfg4zr8cJihapOPpj?!EZEs8Dx9 zjY1FG1rg7PWGlSqzNhx+7NQjs0I3-v0w~`*fPOZ?tIDv%8KjQVFAi_quFJQ ziu?b(Q=$GzT4jTd@EjtzoS&^W?k&nU$Q=K$?NXTHEbeyi+Yj$jqGq$xk2HRo$shsv yl0NRWx2?<3txbC7W4J^RX!g{AUMP}V3UE2`b&9S;Mlo|Xx{|)CMN+4u}k3!Sk^ zKV6T(L=6QGMxECvxBamcC!%sjM|%6s%}IpB_}AI! zW(~bt)N@eaFFcWxf+%viT4SA$f3r&<)+mG@Kd#(rpM_|{rT-ar9-(uNte&sxpjK)a zKJw%Z=99@FMt=#cknQ(FPSLq#catte@-VE8cqNf5u5^{ zt~x>IkfF)_^df0Lg^}L9NN=UHJzkrNqG6Z~DMI?~s3!&hv>Ez8u2QlaY#cD5wtK$* zwIeV9R~3?o-I5(OT`-v73_7s&#@rpNTn9u4nG*zU#xYw7$nmbmmvlp4s;%Z6c7K`F zzy{nrt@RFcFNRkee=Z#&Yjxg{?fSxYdnGPwZAp6+lrUumcr1ZDWQ`!zK~Ncr2xZ3n z)ygCe4o_(lmGWZ`?A}})dxgTqKtKfzDYY6j@$vjqp(de}mrTb9Um-a{bYKxSY4f7OZ!%UnYN1?_$yIIu~^q{U1J0Uxq$;Vc?n2)x%fnAWh6tYT2Z4|MIYI EF$hL2@&Et;