Upgrading project and code to 2022.2

alelievr · Jul 21, 2022 · 65dff62 · 65dff62
1 parent 2938f3d
commit 65dff62
Show file tree

Hide file tree

Showing 52 changed files with 11,575 additions and 1,259 deletions.
diff --git a/...ets/SciFi_Industrial/SampleScenes/SciFi_Industrial_SampleLayout/Environment Profile.asset b/...ets/SciFi_Industrial/SampleScenes/SciFi_Industrial_SampleLayout/Environment Profile.asset
@@ -254,6 +254,7 @@ MonoBehaviour:
   - {fileID: -6419595802931978257}
   - {fileID: -6476862319670478211}
   - {fileID: 2411109085389232553}
+  - {fileID: 6060095546912683492}
 --- !u!114 &2411109085389232553
 MonoBehaviour:
   m_ObjectHideFlags: 3
@@ -315,7 +316,7 @@ MonoBehaviour:
     m_OverrideState: 1
     m_Value: 40
   m_BilateralUpsample:
-    m_OverrideState: 0
+    m_OverrideState: 1
     m_Value: 1
   m_DirectionCount:
     m_OverrideState: 1
@@ -332,3 +333,49 @@ MonoBehaviour:
   m_DenoiserRadius:
     m_OverrideState: 1
     m_Value: 0.5
+--- !u!114 &6060095546912683492
+MonoBehaviour:
+  m_ObjectHideFlags: 3
+  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: 24f077503be6ae942a1e1245dbd53ea9, type: 3}
+  m_Name: Bloom
+  m_EditorClassIdentifier: 
+  active: 1
+  quality:
+    m_OverrideState: 1
+    m_Value: 1
+  threshold:
+    m_OverrideState: 1
+    m_Value: 1
+  intensity:
+    m_OverrideState: 1
+    m_Value: 0.1
+  scatter:
+    m_OverrideState: 1
+    m_Value: 0.445
+  tint:
+    m_OverrideState: 1
+    m_Value: {r: 1, g: 1, b: 1, a: 1}
+  dirtTexture:
+    m_OverrideState: 1
+    m_Value: {fileID: 0}
+  dirtIntensity:
+    m_OverrideState: 1
+    m_Value: 0
+  anamorphic:
+    m_OverrideState: 1
+    m_Value: 1
+  m_Resolution:
+    m_OverrideState: 1
+    m_Value: 2
+  m_HighQualityPrefiltering:
+    m_OverrideState: 1
+    m_Value: 0
+  m_HighQualityFiltering:
+    m_OverrideState: 1
+    m_Value: 1
diff --git a/Assets/CustomPasses/CopyPass/Color Copy Pass.renderTexture b/Assets/CustomPasses/CopyPass/Color Copy Pass.renderTexture
@@ -14,8 +14,8 @@ RenderTexture:
   m_DownscaleFallback: 0
   m_IsAlphaChannelOptional: 0
   serializedVersion: 5
-  m_Width: 1061
-  m_Height: 569
+  m_Width: 930
+  m_Height: 590
   m_AntiAliasing: 1
   m_MipCount: -1
   m_DepthStencilFormat: 0

diff --git a/Assets/CustomPasses/CopyPass/Depth Copy.renderTexture b/Assets/CustomPasses/CopyPass/Depth Copy.renderTexture
@@ -14,8 +14,8 @@ RenderTexture:
   m_DownscaleFallback: 0
   m_IsAlphaChannelOptional: 0
   serializedVersion: 5
-  m_Width: 1061
-  m_Height: 569
+  m_Width: 930
+  m_Height: 590
   m_AntiAliasing: 1
   m_MipCount: -1
   m_DepthStencilFormat: 0

diff --git a/Assets/CustomPasses/CopyPass/Motion vectors Copy.renderTexture b/Assets/CustomPasses/CopyPass/Motion vectors Copy.renderTexture
@@ -14,8 +14,8 @@ RenderTexture:
   m_DownscaleFallback: 0
   m_IsAlphaChannelOptional: 0
   serializedVersion: 5
-  m_Width: 1061
-  m_Height: 569
+  m_Width: 930
+  m_Height: 590
   m_AntiAliasing: 1
   m_MipCount: -1
   m_DepthStencilFormat: 0

diff --git a/Assets/CustomPasses/CopyPass/Normal Copy.renderTexture b/Assets/CustomPasses/CopyPass/Normal Copy.renderTexture
@@ -14,8 +14,8 @@ RenderTexture:
   m_DownscaleFallback: 0
   m_IsAlphaChannelOptional: 0
   serializedVersion: 5
-  m_Width: 1061
-  m_Height: 569
+  m_Width: 930
+  m_Height: 590
   m_AntiAliasing: 1
   m_MipCount: -1
   m_DepthStencilFormat: 0

diff --git a/Assets/CustomPasses/CopyPass/Roughness Copy.renderTexture b/Assets/CustomPasses/CopyPass/Roughness Copy.renderTexture
@@ -14,8 +14,8 @@ RenderTexture:
   m_DownscaleFallback: 0
   m_IsAlphaChannelOptional: 0
   serializedVersion: 5
-  m_Width: 1061
-  m_Height: 569
+  m_Width: 930
+  m_Height: 590
   m_AntiAliasing: 1
   m_MipCount: -1
   m_DepthStencilFormat: 0

diff --git a/Assets/CustomPasses/FPS Foreground/FPSForeground.cs b/Assets/CustomPasses/FPS Foreground/FPSForeground.cs
@@ -87,7 +87,7 @@ protected override void Execute(CustomPassContext ctx)
 
     public void RenderFromCameraDepthPass(in CustomPassContext ctx, Camera view, RTHandle targetColor, RTHandle targetDepth, ClearFlag clearFlag, LayerMask layerMask, CustomPass.RenderQueueType renderQueueFilter = CustomPass.RenderQueueType.All, Material overrideMaterial = null, int overrideMaterialIndex = 0, RenderStateBlock overrideRenderState = default(RenderStateBlock))
     {
-    ShaderTagId[] depthTags = { HDShaderPassNames.s_DepthForwardOnlyName, HDShaderPassNames.s_DepthOnlyName };
+        ShaderTagId[] depthTags = { HDShaderPassNames.s_DepthForwardOnlyName, HDShaderPassNames.s_DepthOnlyName };
         if (targetColor != null && targetDepth != null)
             CoreUtils.SetRenderTarget(ctx.cmd, targetColor, targetDepth, clearFlag);
         else if (targetColor != null)