diff --git a/Assets/Escape Room Engine/Portal/Portal.cs b/Assets/Escape Room Engine/Portal/Portal.cs index 1a9d686..b99e7ec 100644 --- a/Assets/Escape Room Engine/Portal/Portal.cs +++ b/Assets/Escape Room Engine/Portal/Portal.cs @@ -36,7 +36,7 @@ namespace Escape_Room_Engine.Portal if (!playerCamera) throw new Exception("No camera initialised."); // create render texture - _texture = new RenderTexture(Screen.width, Screen.height, 24, RenderTextureFormat.ARGB32); + if (!_texture) _texture = new RenderTexture(Screen.width, Screen.height, 24, RenderTextureFormat.ARGB32); } private void Start() diff --git a/Assets/Scenes/PortalScene.unity b/Assets/Scenes/PortalScene.unity index 2762807..186a1bc 100644 --- a/Assets/Scenes/PortalScene.unity +++ b/Assets/Scenes/PortalScene.unity @@ -147,11 +147,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 52010740} m_LocalRotation: {x: -0, y: 0.70710677, z: -0, w: 0.7071068} - m_LocalPosition: {x: 0, y: 0, z: -2} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1199088360} + - {fileID: 1984169765} - {fileID: 7295752538729181700} - {fileID: 2061968364} - {fileID: 1363513912} @@ -925,7 +926,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 289664350} m_LocalRotation: {x: -0, y: 0.70710677, z: -0, w: 0.7071068} - m_LocalPosition: {x: -0, y: 0, z: 2} + m_LocalPosition: {x: 0, y: 0, z: 6} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -2871,7 +2872,7 @@ GameObject: - component: {fileID: 1199088358} m_Layer: 0 m_Name: Test Camera - m_TagString: Untagged + m_TagString: MainCamera m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -3067,22 +3068,22 @@ PrefabInstance: - target: {fileID: 2246995198243242195, guid: c50e7df1078c96f46bc6825f7e422fb7, type: 3} propertyPath: m_LocalRotation.w - value: 0.00000590086 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2246995198243242195, guid: c50e7df1078c96f46bc6825f7e422fb7, type: 3} propertyPath: m_LocalRotation.x - value: -0 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2246995198243242195, guid: c50e7df1078c96f46bc6825f7e422fb7, type: 3} propertyPath: m_LocalRotation.y - value: -1 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2246995198243242195, guid: c50e7df1078c96f46bc6825f7e422fb7, type: 3} propertyPath: m_LocalRotation.z - value: -0 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2246995198243242195, guid: c50e7df1078c96f46bc6825f7e422fb7, type: 3} @@ -3092,7 +3093,7 @@ PrefabInstance: - target: {fileID: 2246995198243242195, guid: c50e7df1078c96f46bc6825f7e422fb7, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: -899.999 + value: 180 objectReference: {fileID: 0} - target: {fileID: 2246995198243242195, guid: c50e7df1078c96f46bc6825f7e422fb7, type: 3} @@ -3156,7 +3157,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 52010741} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!135 &1363513913 SphereCollider: @@ -3953,6 +3954,124 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1882294794} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &1984169764 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1984169765} + - component: {fileID: 1984169768} + - component: {fileID: 1984169767} + - component: {fileID: 1984169766} + m_Layer: 0 + m_Name: Test VR Camera + m_TagString: MainCamera + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &1984169765 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1984169764} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 1.193, z: -2.275} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 52010741} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1984169766 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1984169764} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_RenderShadows: 1 + m_RequiresDepthTextureOption: 2 + m_RequiresOpaqueTextureOption: 2 + m_CameraType: 0 + m_Cameras: [] + m_RendererIndex: -1 + m_VolumeLayerMask: + serializedVersion: 2 + m_Bits: 1 + m_VolumeTrigger: {fileID: 0} + m_VolumeFrameworkUpdateModeOption: 2 + m_RenderPostProcessing: 0 + m_Antialiasing: 0 + m_AntialiasingQuality: 2 + m_StopNaN: 0 + m_Dithering: 0 + m_ClearDepth: 1 + m_AllowXRRendering: 1 + m_RequiresDepthTexture: 0 + m_RequiresColorTexture: 0 + m_Version: 2 +--- !u!81 &1984169767 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1984169764} + m_Enabled: 1 +--- !u!20 &1984169768 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1984169764} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_FocalLength: 50 + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 0 + orthographic size: 5 + m_Depth: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 --- !u!1 &2061968363 GameObject: m_ObjectHideFlags: 0 @@ -3985,7 +4104,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 52010741} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!64 &2061968365 MeshCollider: @@ -4303,7 +4422,7 @@ PrefabInstance: - target: {fileID: 2246995198243242195, guid: c50e7df1078c96f46bc6825f7e422fb7, type: 3} propertyPath: m_RootOrder - value: 1 + value: 2 objectReference: {fileID: 0} - target: {fileID: 2246995198243242195, guid: c50e7df1078c96f46bc6825f7e422fb7, type: 3} diff --git a/Assets/Settings/Unity.VisualScripting.Generated.meta b/Assets/Unity.VisualScripting.Generated.meta similarity index 77% rename from Assets/Settings/Unity.VisualScripting.Generated.meta rename to Assets/Unity.VisualScripting.Generated.meta index c1ba8c8..ebb0aac 100644 --- a/Assets/Settings/Unity.VisualScripting.Generated.meta +++ b/Assets/Unity.VisualScripting.Generated.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 19f47080bfc9b7b4e9a290599b83f591 +guid: 3082fcc3c686fb844b5e4ed06a447784 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Settings/Unity.VisualScripting.Generated/VisualScripting.Flow.meta b/Assets/Unity.VisualScripting.Generated/VisualScripting.Flow.meta similarity index 77% rename from Assets/Settings/Unity.VisualScripting.Generated/VisualScripting.Flow.meta rename to Assets/Unity.VisualScripting.Generated/VisualScripting.Flow.meta index c7e2ab6..96c82b6 100644 --- a/Assets/Settings/Unity.VisualScripting.Generated/VisualScripting.Flow.meta +++ b/Assets/Unity.VisualScripting.Generated/VisualScripting.Flow.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: e6976f26831435b4e906ee767bff34c2 +guid: 33dcbe12816d206488d82e085bb1cae4 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Settings/Unity.VisualScripting.Generated/VisualScripting.Flow/UnitOptions.db b/Assets/Unity.VisualScripting.Generated/VisualScripting.Flow/UnitOptions.db similarity index 92% rename from Assets/Settings/Unity.VisualScripting.Generated/VisualScripting.Flow/UnitOptions.db rename to Assets/Unity.VisualScripting.Generated/VisualScripting.Flow/UnitOptions.db index ed3b9f6..5fe953b 100644 Binary files a/Assets/Settings/Unity.VisualScripting.Generated/VisualScripting.Flow/UnitOptions.db and b/Assets/Unity.VisualScripting.Generated/VisualScripting.Flow/UnitOptions.db differ diff --git a/Assets/Settings/Unity.VisualScripting.Generated/VisualScripting.Flow/UnitOptions.db.meta b/Assets/Unity.VisualScripting.Generated/VisualScripting.Flow/UnitOptions.db.meta similarity index 74% rename from Assets/Settings/Unity.VisualScripting.Generated/VisualScripting.Flow/UnitOptions.db.meta rename to Assets/Unity.VisualScripting.Generated/VisualScripting.Flow/UnitOptions.db.meta index b78528e..3dcc1b0 100644 --- a/Assets/Settings/Unity.VisualScripting.Generated/VisualScripting.Flow/UnitOptions.db.meta +++ b/Assets/Unity.VisualScripting.Generated/VisualScripting.Flow/UnitOptions.db.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 08a294bf408f98d4b9904f08ec5a1169 +guid: 477c7ef114f984d438ea37c767271c1d DefaultImporter: externalObjects: {} userData: