升级6.4.升级水,升级天气
This commit is contained in:
@@ -97,6 +97,7 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: 82638e366ec3c4f5587d1ff63e01d8b2, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
_Version: 0
|
||||
_Mode: 3
|
||||
_Weight: 1
|
||||
_Queue: 0
|
||||
@@ -106,13 +107,13 @@ MonoBehaviour:
|
||||
_Data:
|
||||
rid: 5130806863891791890
|
||||
_DrawBounds: 0
|
||||
_Version: 0
|
||||
references:
|
||||
version: 2
|
||||
RefIds:
|
||||
- rid: 5130806863891791890
|
||||
type: {class: DynamicWavesRendererLodInputData, ns: WaveHarmonic.Crest, asm: WaveHarmonic.Crest}
|
||||
data:
|
||||
_Version: 0
|
||||
_Input: {fileID: 4365008454756617228}
|
||||
_Renderer: {fileID: 7469831289853732886}
|
||||
_DisableRenderer: 1
|
||||
@@ -133,6 +134,6 @@ MonoBehaviour:
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
_Version: 0
|
||||
_WarmUp: 1
|
||||
_OnTime: 0.25
|
||||
_StartTime: 1
|
||||
_Period: 4
|
||||
_Length: 0.25
|
||||
|
||||
@@ -638,6 +638,7 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: e64c239f69eea46778ded6dcc3427a34, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
_Version: 2
|
||||
_Layer: 4
|
||||
_Material: {fileID: 2100000, guid: aa74fe26a90564079a48cdae97645f7b, type: 2}
|
||||
_VolumeMaterial: {fileID: 0}
|
||||
@@ -648,7 +649,6 @@ MonoBehaviour:
|
||||
_TimeSliceBoundsUpdateFrameCount: 1
|
||||
_SurfaceSelfIntersectionFixMode: 4
|
||||
_AllowRenderQueueSorting: 0
|
||||
_Version: 1
|
||||
_Camera: {fileID: 0}
|
||||
_TimeProvider: {fileID: 0}
|
||||
_WindZone: {fileID: 0}
|
||||
@@ -676,7 +676,10 @@ MonoBehaviour:
|
||||
_Resolution: 384
|
||||
_GeometryDownSampleFactor: 2
|
||||
_ExtentsSizeMultiplier: 100
|
||||
_MultipleViewpoints: 0
|
||||
_Viewpoint: {fileID: 0}
|
||||
_CameraExclusions: -1
|
||||
_DataBackgroundMode: 3
|
||||
_CenterOfDetailDisplacementCorrection: 1
|
||||
_SampleTerrainHeightForScale: 1
|
||||
_ForceScaleChangeSmoothing: 0
|
||||
@@ -712,10 +715,16 @@ MonoBehaviour:
|
||||
_Portals:
|
||||
rid: 9154139594981113870
|
||||
_ShowWaterProxyPlane: 0
|
||||
_EditModeFrameRate: 30
|
||||
_FollowSceneCamera: 1
|
||||
_EditorMultipleViewpoints: 1
|
||||
_HeightQueries: 1
|
||||
_Debug:
|
||||
_VisualizeData: 0
|
||||
_VisualizeDataType: 0
|
||||
_VisualizeDataExposure: 0
|
||||
_VisualizeDataRange: 10
|
||||
_VisualizeDataSaturate: 1
|
||||
_SimulatePaused: 0
|
||||
_AttachDebugGUI: 0
|
||||
_ShowHiddenObjects: 0
|
||||
_DisableFollowViewpoint: 0
|
||||
@@ -725,6 +734,8 @@ MonoBehaviour:
|
||||
_LogScaleChange: 0
|
||||
_PauseOnScaleChange: 0
|
||||
_IgnoreWavesForScaleChange: 0
|
||||
_OverrideScale: 0
|
||||
_ScaleOverride: 0
|
||||
_ForceNoGraphics: 0
|
||||
_Resources: {fileID: 11400000, guid: 0817af17dea584e5382e6216db162d4a, type: 2}
|
||||
references:
|
||||
@@ -733,11 +744,14 @@ MonoBehaviour:
|
||||
- rid: 323759186686771352
|
||||
type: {class: AbsorptionLod, ns: WaveHarmonic.Crest, asm: WaveHarmonic.Crest}
|
||||
data:
|
||||
_Version: 0
|
||||
_Enabled: 0
|
||||
_OverrideResolution: 1
|
||||
_Resolution: 256
|
||||
_TextureFormatMode: 100
|
||||
_TextureFormat: 7
|
||||
_Blur: 0
|
||||
_BlurIterations: 1
|
||||
_ShorelineColorSource: 0
|
||||
_ShorelineColor: {r: 1.026, g: 2.085, b: 2.5500002, a: 0.306}
|
||||
_ShorelineColorMaximumDistance: 10
|
||||
@@ -745,11 +759,14 @@ MonoBehaviour:
|
||||
- rid: 323759186686771353
|
||||
type: {class: ScatteringLod, ns: WaveHarmonic.Crest, asm: WaveHarmonic.Crest}
|
||||
data:
|
||||
_Version: 0
|
||||
_Enabled: 0
|
||||
_OverrideResolution: 1
|
||||
_Resolution: 256
|
||||
_TextureFormatMode: 200
|
||||
_TextureFormat: 23
|
||||
_Blur: 0
|
||||
_BlurIterations: 1
|
||||
_ShorelineColorSource: 0
|
||||
_ShorelineColor: {r: 0, g: 0.588, b: 1.2, a: 6}
|
||||
_ShorelineColorMaximumDistance: 10
|
||||
@@ -760,95 +777,128 @@ MonoBehaviour:
|
||||
_Version: 0
|
||||
_Enabled: 1
|
||||
_Layer: 4
|
||||
_Material: {fileID: 2100000, guid: aa74fe26a90564079a48cdae97645f7b, type: 2}
|
||||
_VolumeMaterial: {fileID: 0}
|
||||
_MeshType: 0
|
||||
_ChunkTemplate: {fileID: 1516456258233481520, guid: 17840562212c147d6bdb5144d35bc442,
|
||||
type: 3}
|
||||
_SupportCustomRenderers: 1
|
||||
_Material: {fileID: 2100000, guid: aa74fe26a90564079a48cdae97645f7b, type: 2}
|
||||
_VolumeMaterial: {fileID: 0}
|
||||
_CastShadows: 0
|
||||
_WaterBodyCulling: 1
|
||||
_TimeSliceBoundsUpdateFrameCount: 1
|
||||
_CameraExclusions: 6
|
||||
_SurfaceSelfIntersectionFixMode: 4
|
||||
_AllowRenderQueueSorting: 0
|
||||
_Debug:
|
||||
_UniformTiles: 0
|
||||
_DisableSkirt: 0
|
||||
_DrawRendererBounds: 0
|
||||
- rid: 9040549687677943810
|
||||
type: {class: Meniscus, ns: WaveHarmonic.Crest, asm: WaveHarmonic.Crest}
|
||||
data:
|
||||
_Version: 0
|
||||
_Enabled: 1
|
||||
_Layer: 4
|
||||
_Material: {fileID: 2100000, guid: 238e45299a5ec46308e9bf99ddf67963, type: 2}
|
||||
_CameraExclusions: 6
|
||||
- rid: 9154139594981113859
|
||||
type: {class: AnimatedWavesLod, ns: WaveHarmonic.Crest, asm: WaveHarmonic.Crest}
|
||||
data:
|
||||
_Version: 0
|
||||
_Enabled: 1
|
||||
_OverrideResolution: 0
|
||||
_Resolution: 256
|
||||
_TextureFormatMode: 100
|
||||
_TextureFormat: 48
|
||||
_Blur: 0
|
||||
_BlurIterations: 1
|
||||
_QuerySource: 1
|
||||
_MaximumQueryCount: 4096
|
||||
_CollisionLayers: -1
|
||||
_BakedWaveData: {fileID: 0}
|
||||
_WaveSampling: 0
|
||||
_WaveResolutionMultiplier: 1
|
||||
_AttenuationInShallows: 0.95
|
||||
_ShallowsMaximumDepth: 1000
|
||||
_CollisionSource: 2
|
||||
_CollisionLayers: -1
|
||||
_MaximumQueryCount: 4096
|
||||
_BakedWaveData: {fileID: 0}
|
||||
- rid: 9154139594981113860
|
||||
type: {class: DepthLod, ns: WaveHarmonic.Crest, asm: WaveHarmonic.Crest}
|
||||
data:
|
||||
_Version: 0
|
||||
_Enabled: 1
|
||||
_OverrideResolution: 1
|
||||
_Resolution: 256
|
||||
_TextureFormatMode: 100
|
||||
_TextureFormat: 46
|
||||
_Blur: 0
|
||||
_BlurIterations: 1
|
||||
_QuerySource: 1
|
||||
_MaximumQueryCount: 512
|
||||
_IncludeTerrainHeight: 0
|
||||
_EnableSignedDistanceFields: 1
|
||||
- rid: 9154139594981113861
|
||||
type: {class: LevelLod, ns: WaveHarmonic.Crest, asm: WaveHarmonic.Crest}
|
||||
data:
|
||||
_Version: 0
|
||||
_Enabled: 0
|
||||
_OverrideResolution: 0
|
||||
_Resolution: 256
|
||||
_TextureFormatMode: 300
|
||||
_TextureFormat: 45
|
||||
_Blur: 0
|
||||
_BlurIterations: 4
|
||||
- rid: 9154139594981113862
|
||||
type: {class: FoamLod, ns: WaveHarmonic.Crest, asm: WaveHarmonic.Crest}
|
||||
data:
|
||||
_Version: 0
|
||||
_Enabled: 1
|
||||
_OverrideResolution: 1
|
||||
_Resolution: 256
|
||||
_TextureFormatMode: 100
|
||||
_TextureFormat: 45
|
||||
_Blur: 0
|
||||
_BlurIterations: 1
|
||||
_SimulationFrequency: 30
|
||||
_Prewarm: 1
|
||||
_Settings: {fileID: 0}
|
||||
- rid: 9154139594981113863
|
||||
type: {class: DynamicWavesLod, ns: WaveHarmonic.Crest, asm: WaveHarmonic.Crest}
|
||||
data:
|
||||
_Version: 0
|
||||
_Enabled: 1
|
||||
_OverrideResolution: 0
|
||||
_Resolution: 512
|
||||
_TextureFormatMode: 300
|
||||
_TextureFormat: 46
|
||||
_Blur: 0
|
||||
_BlurIterations: 1
|
||||
_SimulationFrequency: 60
|
||||
_AttenuationInShallows: 1
|
||||
_Settings: {fileID: 0}
|
||||
- rid: 9154139594981113864
|
||||
type: {class: FlowLod, ns: WaveHarmonic.Crest, asm: WaveHarmonic.Crest}
|
||||
data:
|
||||
_Version: 0
|
||||
_Enabled: 0
|
||||
_OverrideResolution: 1
|
||||
_Resolution: 128
|
||||
_TextureFormatMode: 100
|
||||
_TextureFormat: 46
|
||||
_Blur: 0
|
||||
_BlurIterations: 1
|
||||
_QuerySource: 1
|
||||
_MaximumQueryCount: 1024
|
||||
- rid: 9154139594981113865
|
||||
type: {class: ShadowLod, ns: WaveHarmonic.Crest, asm: WaveHarmonic.Crest}
|
||||
data:
|
||||
_Version: 0
|
||||
_Enabled: 1
|
||||
_OverrideResolution: 1
|
||||
_Resolution: 256
|
||||
_TextureFormatMode: 100
|
||||
_TextureFormat: 6
|
||||
_Blur: 1
|
||||
_BlurIterations: 1
|
||||
_SimulationFrequency: 60
|
||||
_DynamicSoftShadows: 1
|
||||
_SoftJitterExtinctionFactor: 0.75
|
||||
@@ -861,20 +911,26 @@ MonoBehaviour:
|
||||
- rid: 9154139594981113866
|
||||
type: {class: ClipLod, ns: WaveHarmonic.Crest, asm: WaveHarmonic.Crest}
|
||||
data:
|
||||
_Version: 0
|
||||
_Enabled: 0
|
||||
_OverrideResolution: 1
|
||||
_Resolution: 256
|
||||
_TextureFormatMode: 100
|
||||
_TextureFormat: 5
|
||||
_Blur: 0
|
||||
_BlurIterations: 1
|
||||
_DefaultClippingState: 0
|
||||
- rid: 9154139594981113867
|
||||
type: {class: AlbedoLod, ns: WaveHarmonic.Crest, asm: WaveHarmonic.Crest}
|
||||
data:
|
||||
_Version: 0
|
||||
_Enabled: 0
|
||||
_OverrideResolution: 1
|
||||
_Resolution: 768
|
||||
_TextureFormatMode: 100
|
||||
_TextureFormat: 8
|
||||
_Blur: 0
|
||||
_BlurIterations: 1
|
||||
- rid: 9154139594981113868
|
||||
type: {class: WaterReflections, ns: WaveHarmonic.Crest, asm: WaveHarmonic.Crest}
|
||||
data:
|
||||
@@ -885,13 +941,12 @@ MonoBehaviour:
|
||||
serializedVersion: 2
|
||||
m_Bits: 1
|
||||
_Resolution: 512
|
||||
_RenderOnlySingleCamera: 0
|
||||
_Overscan: 1.5
|
||||
_Sky: 1
|
||||
_DisablePixelLights: 1
|
||||
_DisableShadows: 1
|
||||
_HDR: 1
|
||||
_Stencil: 0
|
||||
_AllowMSAA: 0
|
||||
_QualitySettingsOverride:
|
||||
_OverrideLodBias: 0
|
||||
_LodBias: 0.5
|
||||
@@ -907,9 +962,13 @@ MonoBehaviour:
|
||||
_UseObliqueMatrix: 1
|
||||
_NonObliqueNearSurface: 0
|
||||
_NonObliqueNearSurfaceThreshold: 0.05
|
||||
_RenderOnlySingleCamera: 0
|
||||
_RendererIndex: 0
|
||||
_Debug:
|
||||
_ShowHiddenObjects: 0
|
||||
_DisableRecursiveRendering: 0
|
||||
_ForceCompatibility: 0
|
||||
_AllowMSAA: 0
|
||||
- rid: 9154139594981113869
|
||||
type: {class: UnderwaterRenderer, ns: WaveHarmonic.Crest, asm: WaveHarmonic.Crest}
|
||||
data:
|
||||
@@ -920,9 +979,10 @@ MonoBehaviour:
|
||||
_EnvironmentalLightingEnable: 0
|
||||
_EnvironmentalLightingWeight: 1
|
||||
_EnvironmentalLightingVolumeProfile: {fileID: 0}
|
||||
_AllCameras: 0
|
||||
_CameraExclusions: 6
|
||||
_CopyWaterMaterialParametersEachFrame: 1
|
||||
_FarPlaneMultiplier: 0.68
|
||||
_EnableChunkCulling: 1
|
||||
_CullLimit: 0.001
|
||||
_Debug:
|
||||
_VisualizeMask: 0
|
||||
@@ -931,13 +991,17 @@ MonoBehaviour:
|
||||
_DisableHeightAboveWaterOptimization: 0
|
||||
_DisableArtifactCorrection: 0
|
||||
_OnlyReflectionCameras: 0
|
||||
_AllCameras: 0
|
||||
- rid: 9154139594981113870
|
||||
type: {class: PortalRenderer, ns: WaveHarmonic.Crest.Portals, asm: WaveHarmonic.Crest}
|
||||
data:
|
||||
_Version: 0
|
||||
_Enabled: 0
|
||||
_Mode: 2
|
||||
_Geometry: {fileID: 0}
|
||||
_Invert: 0
|
||||
_MaximumResolution: 1024
|
||||
_TexelSize: 0.02
|
||||
--- !u!1001 &2904561123747805697
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
// Copyright © 2024 Wave Harmonic. All rights reserved.
|
||||
|
||||
using UnityEngine;
|
||||
using UnityEngine.Serialization;
|
||||
using WaveHarmonic.Crest.Internal;
|
||||
|
||||
namespace WaveHarmonic.Crest.Examples
|
||||
@@ -11,20 +12,20 @@ namespace WaveHarmonic.Crest.Examples
|
||||
[AddComponentMenu(Constants.k_MenuPrefixSample + "Ripple Generator")]
|
||||
sealed class RippleGenerator : ManagedBehaviour<WaterRenderer>
|
||||
{
|
||||
[SerializeField, HideInInspector]
|
||||
#pragma warning disable 414
|
||||
int _Version = 0;
|
||||
#pragma warning restore 414
|
||||
|
||||
[Tooltip("Amount of time before it starts.")]
|
||||
[FormerlySerializedAs("_WarmUp")]
|
||||
[SerializeField]
|
||||
float _WarmUp = 3f;
|
||||
|
||||
[SerializeField]
|
||||
float _OnTime = 0.2f;
|
||||
float _StartTime = 3f;
|
||||
|
||||
[Tooltip("The time interval to inject a ripple.\n\nTime will loop around by this number (in seconds). Increase to make ripples more frequent.")]
|
||||
[SerializeField]
|
||||
float _Period = 4f;
|
||||
|
||||
[Tooltip("The length of time in the period the input runs for.\n\nFrom the start of the period until this time, the input will continue to render. The longer it is active, the further the water will be pushed/pulled per period. If it is too long for the period, the surface may never return to rest.")]
|
||||
[FormerlySerializedAs("_OnTime")]
|
||||
[SerializeField]
|
||||
float _Length = 0.2f;
|
||||
|
||||
DynamicWavesLodInput _DynamicWavesLodInput;
|
||||
|
||||
private protected override void Initialize()
|
||||
@@ -44,15 +45,15 @@ namespace WaveHarmonic.Crest.Examples
|
||||
|
||||
var time = water.CurrentTime;
|
||||
|
||||
if (time < _WarmUp)
|
||||
if (time < _StartTime)
|
||||
{
|
||||
_DynamicWavesLodInput.ForceRenderingOff = true;
|
||||
return;
|
||||
}
|
||||
|
||||
time -= _WarmUp;
|
||||
time -= _StartTime;
|
||||
time = Mathf.Repeat(time, _Period);
|
||||
_DynamicWavesLodInput.ForceRenderingOff = time >= _OnTime;
|
||||
_DynamicWavesLodInput.ForceRenderingOff = time >= _Length;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user