prepare for stencil portals

2022-12-19 15:13:40 +01:00
parent 88a9f17efe
commit 643e03192a
12 changed files with 955 additions and 793 deletions
--- a/Assets/Engine/Runtime/Editor/EngineEditor.cs
+++ b/Assets/Engine/Runtime/Editor/EngineEditor.cs
@@ -41,7 +41,7 @@ namespace EscapeRoomEngine.Engine.Runtime.Editor

        private void PassToNextRoom()
        {
-            if (EditorApplication.isPlaying)
+            if (Engine.Instance && EditorApplication.isPlaying)
            {
                Engine.Instance.CurrentRoom.Match(some: room => room.EnterRoom());
                UpdateUI();
@@ -50,7 +50,7 @@ namespace EscapeRoomEngine.Engine.Runtime.Editor

        private void SkipCurrentRoom()
        {
-            if (EditorApplication.isPlaying)
+            if (Engine.Instance && EditorApplication.isPlaying)
            {
                Engine.Instance.CurrentRoom.Match(some: room => room.SkipRoom());
                UpdateUI();
@@ -59,7 +59,7 @@ namespace EscapeRoomEngine.Engine.Runtime.Editor

        private void SkipAndPass()
        {
-            if (EditorApplication.isPlaying)
+            if (Engine.Instance && EditorApplication.isPlaying)
            {
                Engine.Instance.CurrentRoom.Match(some: room => room.SkipRoom());
                Engine.Instance.CurrentRoom.Match(some: room => room.EnterRoom());
@@ -69,7 +69,7 @@ namespace EscapeRoomEngine.Engine.Runtime.Editor

        private void UpdateUI()
        {
-            if (EditorApplication.isPlaying)
+            if (Engine.Instance && EditorApplication.isPlaying)
            {
                if (!_registeredUpdateEvent)
                {
@@ -82,9 +82,9 @@ namespace EscapeRoomEngine.Engine.Runtime.Editor
                _registeredUpdateEvent = false;
            }
            
-            _passToNextRoomButton.SetEnabled(EditorApplication.isPlaying && Engine.Instance.NumberOfRooms > 1);
-            _skipCurrentRoomButton.SetEnabled(EditorApplication.isPlaying && Engine.Instance.NumberOfRooms > 0);
-            _skipAndPassButton.SetEnabled(EditorApplication.isPlaying && Engine.Instance.NumberOfRooms > 0);
+            _passToNextRoomButton.SetEnabled(EditorApplication.isPlaying && Engine.Instance && Engine.Instance.NumberOfRooms > 1);
+            _skipCurrentRoomButton.SetEnabled(EditorApplication.isPlaying && Engine.Instance && Engine.Instance.NumberOfRooms > 0);
+            _skipAndPassButton.SetEnabled(EditorApplication.isPlaying && Engine.Instance && Engine.Instance.NumberOfRooms > 0);
        }
    }
    #endif
--- a/Assets/Portal/Assets/Prefabs/Portal.prefab
+++ b/Assets/Portal/Assets/Prefabs/Portal.prefab
@@ -117,7 +117,7 @@ Transform:
  - {fileID: 9135323956734471646}
  - {fileID: 2398425302420252226}
  m_Father: {fileID: 0}
-  m_RootOrder: 0
+  m_RootOrder: -1
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &1249363658
 MonoBehaviour:
@@ -143,9 +143,17 @@ BoxCollider:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 5635962022185625128}
  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
  m_IsTrigger: 1
+  m_ProvidesContacts: 0
  m_Enabled: 1
-  serializedVersion: 2
+  serializedVersion: 3
  m_Size: {x: 1, y: 3, z: 0.3}
  m_Center: {x: 0, y: 1.5, z: -0.15}
 --- !u!1 &7398326895463990628
@@ -189,16 +197,24 @@ Camera:
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 7398326895463990628}
-  m_Enabled: 0
+  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_Iso: 200
+  m_ShutterSpeed: 0.005
+  m_Aperture: 16
+  m_FocusDistance: 10
+  m_FocalLength: 50
+  m_BladeCount: 5
+  m_Curvature: {x: 2, y: 11}
+  m_BarrelClipping: 0.25
+  m_Anamorphism: 0
  m_SensorSize: {x: 36, y: 24}
  m_LensShift: {x: 0, y: 0}
-  m_FocalLength: 50
  m_NormalizedViewPortRect:
    serializedVersion: 2
    x: 0
@@ -255,6 +271,9 @@ MonoBehaviour:
  m_Dithering: 0
  m_ClearDepth: 1
  m_AllowXRRendering: 0
+  m_UseScreenCoordOverride: 0
+  m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0}
+  m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0}
  m_RequiresDepthTexture: 0
  m_RequiresColorTexture: 0
  m_Version: 2
@@ -265,7 +284,7 @@ MonoBehaviour:
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 7398326895463990628}
-  m_Enabled: 0
+  m_Enabled: 1
  m_EditorHideFlags: 0
  m_Script: {fileID: 11500000, guid: ad60e3973ab83f3468637a06970d7f1f, type: 3}
  m_Name: 
--- a/Assets/Scenes/PortalScene.unity
+++ b/Assets/Scenes/PortalScene.unity
--- a/Assets/URP/URP-Balanced-Renderer.asset
+++ b/Assets/URP/URP-Balanced-Renderer.asset
@@ -1,76 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
--- !u!114 &-1878332245247344467
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: f62c9c65cf3354c93be831c8bc075510, type: 3}
-  m_Name: SSAO
-  m_EditorClassIdentifier: 
-  m_Active: 1
-  m_Shader: {fileID: 0}
-  m_Settings:
-    Downsample: 1
-    AfterOpaque: 0
-    Source: 0
-    NormalSamples: 0
-    Intensity: 0.5
-    DirectLightingStrength: 0.25
-    Radius: 0.25
-    SampleCount: 4
--- !u!114 &11400000
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: de640fe3d0db1804a85f9fc8f5cadab6, type: 3}
-  m_Name: URP-Balanced-Renderer
-  m_EditorClassIdentifier: 
-  debugShaders:
-    debugReplacementPS: {fileID: 4800000, guid: cf852408f2e174538bcd9b7fda1c5ae7,
-      type: 3}
-  m_RendererFeatures:
-  - {fileID: -1878332245247344467}
-  m_RendererFeatureMap: adc0de57c6d2eee5
-  m_UseNativeRenderPass: 0
-  postProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2}
-  shaders:
-    blitPS: {fileID: 4800000, guid: c17132b1f77d20942aa75f8429c0f8bc, type: 3}
-    copyDepthPS: {fileID: 4800000, guid: d6dae50ee9e1bfa4db75f19f99355220, type: 3}
-    screenSpaceShadowPS: {fileID: 0}
-    samplingPS: {fileID: 4800000, guid: 04c410c9937594faa893a11dceb85f7e, type: 3}
-    stencilDeferredPS: {fileID: 4800000, guid: e9155b26e1bc55942a41e518703fe304, type: 3}
-    fallbackErrorPS: {fileID: 4800000, guid: e6e9a19c3678ded42a3bc431ebef7dbd, type: 3}
-    materialErrorPS: {fileID: 4800000, guid: 5fd9a8feb75a4b5894c241777f519d4e, type: 3}
-    coreBlitPS: {fileID: 0}
-    coreBlitColorAndDepthPS: {fileID: 0}
-    cameraMotionVector: {fileID: 0}
-    objectMotionVector: {fileID: 0}
-  m_OpaqueLayerMask:
-    serializedVersion: 2
-    m_Bits: 4294967295
-  m_TransparentLayerMask:
-    serializedVersion: 2
-    m_Bits: 4294967295
-  m_DefaultStencilState:
-    overrideStencilState: 0
-    stencilReference: 0
-    stencilCompareFunction: 8
-    passOperation: 2
-    failOperation: 0
-    zFailOperation: 0
-  m_ShadowTransparentReceive: 1
-  m_RenderingMode: 0
-  m_DepthPrimingMode: 0
-  m_AccurateGbufferNormals: 0
-  m_ClusteredRendering: 0
-  m_TileSize: 32
--- a/Assets/URP/URP-Balanced-Renderer.asset.meta
+++ b/Assets/URP/URP-Balanced-Renderer.asset.meta
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: e634585d5c4544dd297acaee93dc2beb
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 11400000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/URP/URP-Balanced.asset
+++ b/Assets/URP/URP-Balanced.asset
@@ -1,83 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: bf2edee5c58d82540a51f03df9d42094, type: 3}
-  m_Name: URP-Balanced
-  m_EditorClassIdentifier: 
-  k_AssetVersion: 11
-  k_AssetPreviousVersion: 11
-  m_RendererType: 1
-  m_RendererData: {fileID: 0}
-  m_RendererDataList:
-  - {fileID: 11400000, guid: e634585d5c4544dd297acaee93dc2beb, type: 2}
-  m_DefaultRendererIndex: 0
-  m_RequireDepthTexture: 0
-  m_RequireOpaqueTexture: 0
-  m_OpaqueDownsampling: 1
-  m_SupportsTerrainHoles: 1
-  m_SupportsHDR: 1
-  m_HDRColorBufferPrecision: 0
-  m_MSAA: 1
-  m_RenderScale: 1
-  m_UpscalingFilter: 0
-  m_FsrOverrideSharpness: 0
-  m_FsrSharpness: 0.92
-  m_EnableLODCrossFade: 1
-  m_LODCrossFadeDitheringType: 1
-  m_MainLightRenderingMode: 1
-  m_MainLightShadowsSupported: 1
-  m_MainLightShadowmapResolution: 1024
-  m_AdditionalLightsRenderingMode: 1
-  m_AdditionalLightsPerObjectLimit: 2
-  m_AdditionalLightShadowsSupported: 0
-  m_AdditionalLightsShadowmapResolution: 512
-  m_AdditionalLightsShadowResolutionTierLow: 128
-  m_AdditionalLightsShadowResolutionTierMedium: 256
-  m_AdditionalLightsShadowResolutionTierHigh: 512
-  m_ReflectionProbeBlending: 0
-  m_ReflectionProbeBoxProjection: 0
-  m_ShadowDistance: 50
-  m_ShadowCascadeCount: 1
-  m_Cascade2Split: 0.25
-  m_Cascade3Split: {x: 0.1, y: 0.3}
-  m_Cascade4Split: {x: 0.067, y: 0.2, z: 0.467}
-  m_CascadeBorder: 0.1
-  m_ShadowDepthBias: 1
-  m_ShadowNormalBias: 1
-  m_AnyShadowsSupported: 1
-  m_SoftShadowsSupported: 1
-  m_ConservativeEnclosingSphere: 0
-  m_NumIterationsEnclosingSphere: 64
-  m_AdditionalLightsCookieResolution: 512
-  m_AdditionalLightsCookieFormat: 1
-  m_UseSRPBatcher: 1
-  m_SupportsDynamicBatching: 0
-  m_MixedLightingSupported: 1
-  m_SupportsLightCookies: 1
-  m_SupportsLightLayers: 0
-  m_DebugLevel: 0
-  m_StoreActionsOptimization: 0
-  m_EnableRenderGraph: 0
-  m_UseAdaptivePerformance: 1
-  m_ColorGradingMode: 0
-  m_ColorGradingLutSize: 32
-  m_UseFastSRGBLinearConversion: 0
-  m_ShadowType: 1
-  m_LocalShadowsSupported: 0
-  m_LocalShadowsAtlasResolution: 256
-  m_MaxPixelLights: 0
-  m_ShadowAtlasResolution: 256
-  m_VolumeFrameworkUpdateMode: 0
-  m_Textures:
-    blueNoise64LTex: {fileID: 2800000, guid: e3d24661c1e055f45a7560c033dbb837, type: 3}
-    bayerMatrixTex: {fileID: 2800000, guid: f9ee4ed84c1d10c49aabb9b210b0fc44, type: 3}
-  m_ShaderVariantLogLevel: 0
-  m_ShadowCascades: 0
--- a/Assets/URP/URP-Balanced.asset.meta
+++ b/Assets/URP/URP-Balanced.asset.meta
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: e1260c1148f6143b28bae5ace5e9c5d1
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/URP/URP-Performant-Renderer.asset
+++ b/Assets/URP/URP-Performant-Renderer.asset
@@ -1,52 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: de640fe3d0db1804a85f9fc8f5cadab6, type: 3}
-  m_Name: URP-Performant-Renderer
-  m_EditorClassIdentifier: 
-  debugShaders:
-    debugReplacementPS: {fileID: 4800000, guid: cf852408f2e174538bcd9b7fda1c5ae7,
-      type: 3}
-  m_RendererFeatures: []
-  m_RendererFeatureMap: 
-  m_UseNativeRenderPass: 0
-  postProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2}
-  shaders:
-    blitPS: {fileID: 4800000, guid: c17132b1f77d20942aa75f8429c0f8bc, type: 3}
-    copyDepthPS: {fileID: 4800000, guid: d6dae50ee9e1bfa4db75f19f99355220, type: 3}
-    screenSpaceShadowPS: {fileID: 0}
-    samplingPS: {fileID: 4800000, guid: 04c410c9937594faa893a11dceb85f7e, type: 3}
-    stencilDeferredPS: {fileID: 4800000, guid: e9155b26e1bc55942a41e518703fe304, type: 3}
-    fallbackErrorPS: {fileID: 4800000, guid: e6e9a19c3678ded42a3bc431ebef7dbd, type: 3}
-    materialErrorPS: {fileID: 4800000, guid: 5fd9a8feb75a4b5894c241777f519d4e, type: 3}
-    coreBlitPS: {fileID: 0}
-    coreBlitColorAndDepthPS: {fileID: 0}
-    cameraMotionVector: {fileID: 0}
-    objectMotionVector: {fileID: 0}
-  m_OpaqueLayerMask:
-    serializedVersion: 2
-    m_Bits: 4294967295
-  m_TransparentLayerMask:
-    serializedVersion: 2
-    m_Bits: 4294967295
-  m_DefaultStencilState:
-    overrideStencilState: 0
-    stencilReference: 0
-    stencilCompareFunction: 8
-    passOperation: 2
-    failOperation: 0
-    zFailOperation: 0
-  m_ShadowTransparentReceive: 1
-  m_RenderingMode: 0
-  m_DepthPrimingMode: 0
-  m_AccurateGbufferNormals: 0
-  m_ClusteredRendering: 0
-  m_TileSize: 32
--- a/Assets/URP/URP-Performant-Renderer.asset.meta
+++ b/Assets/URP/URP-Performant-Renderer.asset.meta
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 707360a9c581a4bd7aa53bfeb1429f71
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 11400000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/URP/URP-Performant.asset
+++ b/Assets/URP/URP-Performant.asset
@@ -1,83 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: bf2edee5c58d82540a51f03df9d42094, type: 3}
-  m_Name: URP-Performant
-  m_EditorClassIdentifier: 
-  k_AssetVersion: 11
-  k_AssetPreviousVersion: 11
-  m_RendererType: 1
-  m_RendererData: {fileID: 0}
-  m_RendererDataList:
-  - {fileID: 11400000, guid: 707360a9c581a4bd7aa53bfeb1429f71, type: 2}
-  m_DefaultRendererIndex: 0
-  m_RequireDepthTexture: 0
-  m_RequireOpaqueTexture: 0
-  m_OpaqueDownsampling: 1
-  m_SupportsTerrainHoles: 1
-  m_SupportsHDR: 0
-  m_HDRColorBufferPrecision: 0
-  m_MSAA: 1
-  m_RenderScale: 1
-  m_UpscalingFilter: 0
-  m_FsrOverrideSharpness: 0
-  m_FsrSharpness: 0.92
-  m_EnableLODCrossFade: 1
-  m_LODCrossFadeDitheringType: 1
-  m_MainLightRenderingMode: 1
-  m_MainLightShadowsSupported: 0
-  m_MainLightShadowmapResolution: 1024
-  m_AdditionalLightsRenderingMode: 0
-  m_AdditionalLightsPerObjectLimit: 4
-  m_AdditionalLightShadowsSupported: 0
-  m_AdditionalLightsShadowmapResolution: 512
-  m_AdditionalLightsShadowResolutionTierLow: 128
-  m_AdditionalLightsShadowResolutionTierMedium: 256
-  m_AdditionalLightsShadowResolutionTierHigh: 512
-  m_ReflectionProbeBlending: 0
-  m_ReflectionProbeBoxProjection: 0
-  m_ShadowDistance: 50
-  m_ShadowCascadeCount: 1
-  m_Cascade2Split: 0.25
-  m_Cascade3Split: {x: 0.1, y: 0.3}
-  m_Cascade4Split: {x: 0.067, y: 0.2, z: 0.467}
-  m_CascadeBorder: 0.1
-  m_ShadowDepthBias: 1
-  m_ShadowNormalBias: 1
-  m_AnyShadowsSupported: 1
-  m_SoftShadowsSupported: 0
-  m_ConservativeEnclosingSphere: 0
-  m_NumIterationsEnclosingSphere: 64
-  m_AdditionalLightsCookieResolution: 2048
-  m_AdditionalLightsCookieFormat: 3
-  m_UseSRPBatcher: 1
-  m_SupportsDynamicBatching: 0
-  m_MixedLightingSupported: 1
-  m_SupportsLightCookies: 1
-  m_SupportsLightLayers: 0
-  m_DebugLevel: 0
-  m_StoreActionsOptimization: 0
-  m_EnableRenderGraph: 0
-  m_UseAdaptivePerformance: 1
-  m_ColorGradingMode: 0
-  m_ColorGradingLutSize: 16
-  m_UseFastSRGBLinearConversion: 0
-  m_ShadowType: 1
-  m_LocalShadowsSupported: 0
-  m_LocalShadowsAtlasResolution: 256
-  m_MaxPixelLights: 0
-  m_ShadowAtlasResolution: 256
-  m_VolumeFrameworkUpdateMode: 0
-  m_Textures:
-    blueNoise64LTex: {fileID: 2800000, guid: e3d24661c1e055f45a7560c033dbb837, type: 3}
-    bayerMatrixTex: {fileID: 2800000, guid: f9ee4ed84c1d10c49aabb9b210b0fc44, type: 3}
-  m_ShaderVariantLogLevel: 0
-  m_ShadowCascades: 0
--- a/Assets/URP/URP-Performant.asset.meta
+++ b/Assets/URP/URP-Performant.asset.meta
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: d0e2fc18fe036412f8223b3b3d9ad574
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: