Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* feat(ui): attach quest list to hand * feat(ui): move toolbar, compas and map to hands * feat(ui): place menus in world * fix(ui): render inventory menu in correct position * fix(player): move all hand attach childs to default layer
- Loading branch information
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| root = true | ||
|
|
||
| [*] | ||
| charset = utf-8 | ||
| trim_trailing_whitespace = true | ||
| end_of_line = lf | ||
| insert_final_newline = true | ||
|
|
||
| [*{.cs,.adoc,.sh}] | ||
| indent_style = tab | ||
| indent_size = 1 | ||
| tab_width = 2 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,170 +1,120 @@ | ||
| using System.Collections; | ||
| using FluffyUnderware.DevTools.Extensions; | ||
| using Plugin.Input; | ||
| using Rewired; | ||
| using TechtonicaVR.Assets; | ||
| using TechtonicaVR.Debug; | ||
| using UnityEngine; | ||
| using Valve.VR; | ||
|
|
||
| namespace TechtonicaVR.VRCamera; | ||
| public class VRCameraManager : MonoBehaviour | ||
| { | ||
| public Transform vrRoot; | ||
| public SteamVR_CameraHelper cameraHelperPrefab; | ||
|
|
||
| private SteamVR_CameraHelper cameraHelper; | ||
|
Check warning on line 16 in plugin/src/camera/camera_manager.cs
|
||
|
|
||
| public static Camera mainCamera; | ||
|
|
||
| public static VRCameraManager Create() | ||
| { | ||
| var instance = new GameObject(nameof(VRCameraManager)).AddComponent<VRCameraManager>(); | ||
|
|
||
| return instance; | ||
| } | ||
|
|
||
| private void Start() | ||
| { | ||
| DontDestroyOnLoad(gameObject); | ||
| } | ||
|
|
||
| private void OnDestory() | ||
| { | ||
| Plugin.Logger.LogInfo("Destroying vr camera manager..."); | ||
| } | ||
|
|
||
| private void OnEnable() | ||
| { | ||
| Plugin.Logger.LogInfo("Enabling vr camera manager..."); | ||
| } | ||
|
|
||
| private void OnDisable() | ||
| { | ||
| Plugin.Logger.LogInfo("Disabling vr camera manager..."); | ||
| } | ||
|
|
||
| private void Update() | ||
| { | ||
| if (Camera.main == null) | ||
| { | ||
| return; | ||
| } | ||
|
|
||
| if (Camera.main != mainCamera) | ||
| { | ||
| mainCamera = Camera.main; | ||
| SetupCamera(); | ||
| } | ||
| } | ||
|
|
||
| private void SetupCamera() | ||
| { | ||
| Plugin.Logger.LogInfo("Setting up camera..."); | ||
|
|
||
| mainCamera.gameObject.AddComponent<SteamVR_Camera>(); | ||
| mainCamera.gameObject.AddComponent<SteamVR_TrackedObject>(); | ||
| mainCamera.gameObject.AddComponent<TechMainCamera>(); | ||
| HmdMatrix44_t leftEyeMatrix = OpenVR.System.GetProjectionMatrix(EVREye.Eye_Left, mainCamera.nearClipPlane, mainCamera.farClipPlane); | ||
| HmdMatrix44_t rightEyeMatrix = OpenVR.System.GetProjectionMatrix(EVREye.Eye_Right, mainCamera.nearClipPlane, mainCamera.farClipPlane); | ||
|
|
||
| if (PlayerFirstPersonController.instance != null) | ||
| { | ||
| vrRoot = PlayerFirstPersonController.instance.transform; | ||
|
|
||
|
|
||
| mainCamera.transform.parent = vrRoot; | ||
| foreach (var a in ReInput.mapping.Actions) | ||
| { | ||
| Plugin.Logger.LogInfo("Action: " + a.name); | ||
| Plugin.Logger.LogInfo(" id: " + a.id); | ||
| } | ||
|
|
||
| StartCoroutine(PatchCoroutine()); | ||
| SpawnHands(vrRoot); | ||
| } | ||
|
|
||
| FindObjectsOfType<Headlamp>().ForEach(h => h.transform.parent = mainCamera.transform); | ||
| } | ||
|
|
||
| IEnumerator PatchCoroutine() | ||
| { | ||
| yield return new WaitForSeconds(1); | ||
|
|
||
| MainGamePatch.Create(); | ||
| yield break; | ||
| } | ||
|
|
||
| private void SpawnHands(Transform vrRoot) | ||
| { | ||
| var rightHandObject = new GameObject("RightHand"); | ||
| rightHandObject.AddComponent<Gizmo>(); | ||
|
|
||
| rightHandObject.transform.parent = vrRoot; | ||
| var rightHandModel = GameObject.Instantiate(AssetLoader.RightHandBase, Vector3.zero, Quaternion.identity, rightHandObject.transform); | ||
| rightHandModel.transform.localPosition = new Vector3(0, 0.01f, -0.09f); | ||
| rightHandModel.transform.localRotation = Quaternion.Euler(358.4256f, 103.2413f, 240.2217f); | ||
|
|
||
| SteamVRInputMapper.rightHandObject = rightHandObject; | ||
|
|
||
| var leftHandObject = new GameObject("LeftHand"); | ||
| leftHandObject.AddComponent<Gizmo>(); | ||
|
|
||
| leftHandObject.transform.parent = vrRoot; | ||
| var leftHandModel = GameObject.Instantiate(AssetLoader.LeftHandBase, Vector3.zero, Quaternion.identity, leftHandObject.transform); | ||
| leftHandModel.transform.localPosition = new Vector3(0, 0.01f, -0.09f); | ||
| leftHandModel.transform.localRotation = Quaternion.Euler(335.2912f, 256.7355f, 116.7813f); | ||
|
|
||
| SteamVRInputMapper.leftHandObject = leftHandObject; | ||
| } | ||
| } | ||
Oops, something went wrong.