升级6.4.升级水,升级天气

This commit is contained in:
2026-04-05 00:26:54 +08:00
parent 63bc9b5536
commit 5f7cbfb713
635 changed files with 34718 additions and 22567 deletions

View File

@@ -3,11 +3,6 @@
#if d_UnityURP
#if !UNITY_6000_3_OR_NEWER
#define URP_COMPATIBILITY_MODE
#endif
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.Rendering;
using UnityEngine.Rendering.Universal;
@@ -79,32 +74,16 @@ namespace WaveHarmonic.Crest
Instance = new(water);
}
[System.Diagnostics.Conditional(Constants.Symbols.k_Refraction)]
internal void OnBeginCameraRendering(ScriptableRenderContext context, Camera camera)
{
var water = _Water;
if (!ShouldRender(camera, water.Surface.Layer))
{
return;
}
// Our reflections do not need them.
if (camera == WaterReflections.CurrentCamera)
{
return;
}
if (!water.WriteToColorTexture && !water.WriteToDepthTexture)
{
return;
}
if (water.Surface.Material == null)
{
return;
}
// TODO: Could also check RenderType. Which is better?
if (!SurfaceRenderer.IsTransparent(water.Surface.Material))
{
@@ -119,14 +98,18 @@ namespace WaveHarmonic.Crest
// Needed for OnCameraSetup.
renderer.EnqueuePass(this);
#if URP_COMPATIBILITY_MODE
#if UNITY_6000_0_OR_NEWER
#if !UNITY_6000_4_OR_NEWER
// Copy depth pass does not support RG directly.
if (GraphicsSettings.GetRenderPipelineSettings<RenderGraphSettings>().enableRenderCompatibilityMode)
#endif
#endif
{
if (water.WriteToColorTexture) renderer.EnqueuePass(_CopyColorPass);
if (water.WriteToDepthTexture) renderer.EnqueuePass(_CopyDepthPass);
}
#endif
}
#if UNITY_6000_0_OR_NEWER
@@ -143,11 +126,16 @@ namespace WaveHarmonic.Crest
if (_Water.WriteToDepthTexture)
{
// Whether we a writing to color or depth format.
#if !UNITY_6000_5_OR_NEWER
_CopyDepthPass.CopyToDepth = descriptor.colorFormat == UnityEngine.Experimental.Rendering.GraphicsFormat.None;
#endif
_CopyDepthPass.Render(graph, frame, resources.cameraDepthTexture, resources.cameraDepth);
}
}
#endif
#if URP_COMPATIBILITY_MODE
#if UNITY_6000_0_OR_NEWER
[System.Obsolete]
#endif
public override void OnCameraSetup(CommandBuffer buffer, ref RenderingData data)
@@ -162,11 +150,10 @@ namespace WaveHarmonic.Crest
}
else
{
var queue = s_ActiveRenderPassQueue.GetValue(renderer) as List<ScriptableRenderPass>;
var queue = s_ActiveRenderPassQueue.GetValue(renderer) as System.Collections.Generic.List<ScriptableRenderPass>;
queue.Remove(_CopyColorPass);
}
#if URP_COMPATIBILITY_MODE
// Also check internal RT because it can be null on Vulkan for some reason.
if (renderer.cameraDepthTargetHandle?.rt != null && renderer.m_DepthTexture?.rt != null)
{
@@ -176,9 +163,8 @@ namespace WaveHarmonic.Crest
_CopyDepthPass.Setup(renderer.cameraDepthTargetHandle, renderer.m_DepthTexture);
}
else
#endif
{
var queue = s_ActiveRenderPassQueue.GetValue(renderer) as List<ScriptableRenderPass>;
var queue = s_ActiveRenderPassQueue.GetValue(renderer) as System.Collections.Generic.List<ScriptableRenderPass>;
queue.Remove(_CopyDepthPass);
}
}
@@ -190,6 +176,7 @@ namespace WaveHarmonic.Crest
{
// Blank
}
#endif // URP_COMPATIBILITY_MODE
}
}
}