From 31aaa3a0cee2d46e46fad38ce369ba78470916e1 Mon Sep 17 00:00:00 2001 From: milan Date: Wed, 7 Dec 2022 17:10:00 +0100 Subject: [PATCH] fix gamemaster camera --- .../Modules/Portal/Desert Portal Entrance.prefab | 2 +- .../Assets/Modules/Portal/Desert Portal Exit.prefab | 2 +- Assets/VR/Assets/Prefabs/XR Origin.prefab | 12 ++++++------ ProjectSettings/ProjectSettings.asset | 2 ++ 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/Assets/Desert/Assets/Modules/Portal/Desert Portal Entrance.prefab b/Assets/Desert/Assets/Modules/Portal/Desert Portal Entrance.prefab index ff6ee8e..587fbb6 100644 --- a/Assets/Desert/Assets/Modules/Portal/Desert Portal Entrance.prefab +++ b/Assets/Desert/Assets/Modules/Portal/Desert Portal Entrance.prefab @@ -342,7 +342,7 @@ Camera: m_Bits: 4294967295 m_RenderingPath: -1 m_TargetTexture: {fileID: 0} - m_TargetDisplay: 0 + m_TargetDisplay: 1 m_TargetEye: 3 m_HDR: 1 m_AllowMSAA: 1 diff --git a/Assets/Desert/Assets/Modules/Portal/Desert Portal Exit.prefab b/Assets/Desert/Assets/Modules/Portal/Desert Portal Exit.prefab index 57db3be..e1871b4 100644 --- a/Assets/Desert/Assets/Modules/Portal/Desert Portal Exit.prefab +++ b/Assets/Desert/Assets/Modules/Portal/Desert Portal Exit.prefab @@ -425,7 +425,7 @@ Camera: m_Bits: 4294967295 m_RenderingPath: -1 m_TargetTexture: {fileID: 0} - m_TargetDisplay: 0 + m_TargetDisplay: 1 m_TargetEye: 3 m_HDR: 1 m_AllowMSAA: 1 diff --git a/Assets/VR/Assets/Prefabs/XR Origin.prefab b/Assets/VR/Assets/Prefabs/XR Origin.prefab index 2a870bb..85ce71a 100644 --- a/Assets/VR/Assets/Prefabs/XR Origin.prefab +++ b/Assets/VR/Assets/Prefabs/XR Origin.prefab @@ -235,7 +235,8 @@ Transform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 6316608510528613386} m_Father: {fileID: 419816429471595185} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -264,7 +265,7 @@ Camera: height: 1 near clip plane: 0.01 far clip plane: 1000 - field of view: 60 + field of view: 103.3097 orthographic: 0 orthographic size: 5 m_Depth: 0 @@ -944,7 +945,6 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 6316608510528613386} - {fileID: 419816428804372186} - {fileID: 419816428871882043} - {fileID: 419816428230682310} @@ -1300,13 +1300,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2085627837412252196} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 3784117403828992818} - m_Father: {fileID: 419816429471595185} + m_Father: {fileID: 419816428804372186} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!20 &2792121328529009607 @@ -1334,7 +1334,7 @@ Camera: height: 1 near clip plane: 0.01 far clip plane: 1000 - field of view: 60 + field of view: 103.3097 orthographic: 0 orthographic size: 5 m_Depth: 0 diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index c590344..f9f4ba7 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -141,6 +141,8 @@ PlayerSettings: preloadedAssets: - {fileID: 0} - {fileID: 0} + - {fileID: 1167000971541970262, guid: 5038e8a8e7bee0a44a0c2892bcbf360e, type: 2} + - {fileID: -4807887856401509111, guid: 4fc8ed80f87d6b94981580316e2b7811, type: 2} metroInputSource: 0 wsaTransparentSwapchain: 0 m_HolographicPauseOnTrackingLoss: 1