Skip to content

Commit

Permalink
Fix liquid scene
Browse files Browse the repository at this point in the history
  • Loading branch information
alelievr committed Jul 20, 2022
1 parent 5e21bd5 commit 924aa33
Show file tree
Hide file tree
Showing 5 changed files with 35 additions and 88 deletions.
11 changes: 9 additions & 2 deletions Assets/CustomPasses/Glass/DepthBase.mat
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,20 @@ MonoBehaviour:
m_Values:
--- !u!21 &2100000
Material:
serializedVersion: 6
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: DepthBase
m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _DOUBLESIDED_ON _NORMALMAP_TANGENT_SPACE
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords:
- _DISABLE_SSR_TRANSPARENT
- _DOUBLESIDED_ON
- _NORMALMAP_TANGENT_SPACE
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 1
Expand All @@ -38,6 +44,7 @@ Material:
- TransparentDepthPostpass
- TransparentBackface
- RayTracingPrepass
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
Expand Down
11 changes: 7 additions & 4 deletions Assets/CustomPasses/Liquid/Liquid.vfx
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ MonoBehaviour:
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 7d4c867f6b72b714dbb5fd1780afe208, type: 3}
m_Name: Liquid 1
m_Name: Liquid
m_EditorClassIdentifier:
m_UIIgnoredErrors: []
m_Parent: {fileID: 0}
Expand All @@ -54,7 +54,7 @@ MonoBehaviour:
m_UIInfos: {fileID: 114340500867371532}
m_ParameterInfo: []
m_ImportDependencies: []
m_GraphVersion: 8
m_GraphVersion: 9
m_ResourceVersion: 1
m_SubgraphDependencies: []
m_CategoryPath:
Expand All @@ -64,7 +64,7 @@ VisualEffectResource:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Liquid 1
m_Name: Liquid
m_Graph: {fileID: 114350483966674976}
m_Infos:
m_RendererSettings:
Expand Down Expand Up @@ -538,7 +538,7 @@ MonoBehaviour:
stripCapacity: 16
particlePerStripCount: 16
needsComputeBounds: 0
boundsSettingMode: 1
boundsMode: 1
m_Space: 1
--- !u!114 &8926484042661614569
MonoBehaviour:
Expand Down Expand Up @@ -1092,12 +1092,15 @@ MonoBehaviour:
useSoftParticle: 0
vfxSystemSortPriority: 0
sort: 0
sortMode: 0
revertSorting: 0
indirectDraw: 0
computeCulling: 0
frustumCulling: 0
castShadows: 0
useExposureWeight: 0
flipbookLayout: 0
needsOwnSort: 0
shaderGraph: {fileID: -5475051401550479605, guid: dcd703e07af617a4388fd9a2e8172388,
type: 3}
materialSettings:
Expand Down
57 changes: 2 additions & 55 deletions Assets/CustomPasses/Liquid/Resources/ScreenSpaceWater.shadergraph
Original file line number Diff line number Diff line change
Expand Up @@ -102,9 +102,6 @@
{
"m_Id": "b4cf03dd5d9448488a256f7b15aefd03"
},
{
"m_Id": "6257e426cc78488a8f6e7aab5c614645"
},
{
"m_Id": "849d5f661cc24359bdfac9c976b09a37"
},
Expand Down Expand Up @@ -427,9 +424,6 @@
{
"m_Id": "b4cf03dd5d9448488a256f7b15aefd03"
},
{
"m_Id": "6257e426cc78488a8f6e7aab5c614645"
},
{
"m_Id": "849d5f661cc24359bdfac9c976b09a37"
},
Expand Down Expand Up @@ -1200,6 +1194,7 @@
"m_DistortionDepthTest": true,
"m_AddPrecomputedVelocity": false,
"m_TransparentWritesMotionVec": false,
"m_AlphaToMask": false,
"m_DepthOffset": true,
"m_ConservativeDepthOffset": false,
"m_TransparencyFog": true,
Expand Down Expand Up @@ -1523,40 +1518,6 @@
"m_Labels": []
}

{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.BlockNode",
"m_ObjectId": "6257e426cc78488a8f6e7aab5c614645",
"m_Group": {
"m_Id": ""
},
"m_Name": "SurfaceDescription.CoatMask",
"m_DrawState": {
"m_Expanded": true,
"m_Position": {
"serializedVersion": "2",
"x": 0.0,
"y": 0.0,
"width": 0.0,
"height": 0.0
}
},
"m_Slots": [
{
"m_Id": "9469262d7133405d8495e72ad7dcf49f"
}
],
"synonyms": [],
"m_Precision": 0,
"m_PreviewExpanded": true,
"m_DismissedVersion": 0,
"m_PreviewMode": 0,
"m_CustomColors": {
"m_SerializableColors": []
},
"m_SerializedDescriptor": "SurfaceDescription.CoatMask"
}

{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
Expand Down Expand Up @@ -2066,21 +2027,6 @@
}
}

{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
"m_ObjectId": "9469262d7133405d8495e72ad7dcf49f",
"m_Id": 0,
"m_DisplayName": "Coat Mask",
"m_SlotType": 0,
"m_Hidden": false,
"m_ShaderOutputName": "CoatMask",
"m_StageCapability": 2,
"m_Value": 0.0,
"m_DefaultValue": 0.0,
"m_Labels": []
}

{
"m_SGVersion": 1,
"m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty",
Expand Down Expand Up @@ -2659,6 +2605,7 @@
"m_DistortionDepthTest": true,
"m_AddPrecomputedVelocity": false,
"m_TransparentWritesMotionVec": false,
"m_AlphaToMask": false,
"m_DepthOffset": false,
"m_ConservativeDepthOffset": false,
"m_TransparencyFog": true,
Expand Down
17 changes: 10 additions & 7 deletions Assets/CustomPasses/Liquid/Shader Graphs_ScreenSpaceWater.mat
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,17 @@ Material:
- _DISABLE_SSR
- _DISABLE_SSR_TRANSPARENT
- _DOUBLESIDED_ON
- _ENABLE_FOG_ON_TRANSPARENT
- _REFRACTION_SPHERE
- _SURFACE_TYPE_TRANSPARENT
m_InvalidKeywords: []
m_LightmapFlags: 2
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 1
m_CustomRenderQueue: 2475
m_CustomRenderQueue: 3000
stringTagMap:
MotionVector: User
RenderType: TransparentCutout
RenderType: Transparent
disabledShaderPasses:
- MOTIONVECTORS
- TransparentBackface
Expand Down Expand Up @@ -65,7 +68,7 @@ Material:
- Vector1_F093E635: 0.825
- _AddPrecomputedVelocity: 0
- _AlphaCutoffEnable: 1
- _AlphaDstBlend: 0
- _AlphaDstBlend: 10
- _AlphaSrcBlend: 1
- _AlphaToMask: 0
- _AlphaToMaskInspectorValue: 0
Expand All @@ -77,15 +80,15 @@ Material:
- _DoubleSidedEnable: 1
- _DoubleSidedGIMode: 0
- _DoubleSidedNormalMode: 2
- _DstBlend: 0
- _DstBlend: 10
- _EnableBlendModePreserveSpecularLighting: 1
- _EnableFogOnTransparent: 1
- _OpaqueCullMode: 2
- _RayTracing: 0
- _ReceivesSSR: 0
- _ReceivesSSRTransparent: 0
- _RefractionModel: 2
- _RenderQueueType: 1
- _RenderQueueType: 4
- _RequireSplitLighting: 0
- _SrcBlend: 1
- _StencilRef: 0
Expand All @@ -99,7 +102,7 @@ Material:
- _StencilWriteMaskGBuffer: 14
- _StencilWriteMaskMV: 40
- _SupportDecals: 1
- _SurfaceType: 0
- _SurfaceType: 1
- _TransparentBackfaceEnable: 0
- _TransparentCullMode: 2
- _TransparentDepthPostpassEnable: 0
Expand All @@ -108,7 +111,7 @@ Material:
- _TransparentWritingMotionVec: 0
- _TransparentZWrite: 1
- _UseShadowThreshold: 0
- _ZTestDepthEqualForOpaque: 3
- _ZTestDepthEqualForOpaque: 4
- _ZTestGBuffer: 3
- _ZTestTransparent: 4
- _ZWrite: 1
Expand Down
27 changes: 7 additions & 20 deletions Assets/Scenes/Liquid.unity
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ NavMeshSettings:
serializedVersion: 2
m_ObjectHideFlags: 0
m_BuildSettings:
serializedVersion: 3
serializedVersion: 2
agentTypeID: 0
agentRadius: 0.5
agentHeight: 2
Expand All @@ -117,7 +117,7 @@ NavMeshSettings:
cellSize: 0.16666667
manualTileSize: 0
tileSize: 256
buildHeightMesh: 0
accuratePlacement: 0
maxJobWorkers: 0
preserveTilesOutsideBounds: 0
debug:
Expand Down Expand Up @@ -173,7 +173,7 @@ MonoBehaviour:
clearFlags: 7
passFoldout: 0
m_Version: 0
radius: 14.2
radius: 18.2
layerMask:
serializedVersion: 2
m_Bits: 8192
Expand Down Expand Up @@ -315,6 +315,7 @@ MonoBehaviour:
taaMotionVectorRejection: 0
taaAntiHistoryRinging: 0
taaBaseBlendFactor: 0.875
taaJitterScale: 1
physicalParameters:
m_Iso: 200
m_ShutterSpeed: 0.005
Expand All @@ -340,8 +341,6 @@ MonoBehaviour:
deepLearningSuperSamplingUseCustomAttributes: 0
deepLearningSuperSamplingUseOptimalSettings: 1
deepLearningSuperSamplingSharpening: 0
fsrOverrideSharpness: 0
fsrSharpness: 0.92
exposureTarget: {fileID: 0}
materialMipBias: 0
m_RenderingPathCustomFrameSettings:
Expand Down Expand Up @@ -433,17 +432,9 @@ Camera:
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
Expand Down Expand Up @@ -508,7 +499,7 @@ PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
serializedVersion: 2
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 1751948307316588, guid: 37f16a7beb3cae449a4885b50959b6ae, type: 3}
Expand Down Expand Up @@ -564,9 +555,7 @@ PrefabInstance:
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 37f16a7beb3cae449a4885b50959b6ae, type: 3}
--- !u!1 &698734268
GameObject:
Expand Down Expand Up @@ -1239,7 +1228,7 @@ PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
serializedVersion: 2
m_TransformParent: {fileID: 360045712}
m_Modifications:
- target: {fileID: 8040162854802574218, guid: fd157eea35f81404d8a188d264dd86cd,
Expand Down Expand Up @@ -1358,9 +1347,7 @@ PrefabInstance:
value: ScrollingFormulas
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: fd157eea35f81404d8a188d264dd86cd, type: 3}
--- !u!224 &2058781831 stripped
RectTransform:
Expand Down

0 comments on commit 924aa33

Please sign in to comment.