diff --git a/Assets/_Content/Materials/M_default.mat b/Assets/_Content/Materials/M_default.mat index 23e3604d..e9d52cc6 100644 --- a/Assets/_Content/Materials/M_default.mat +++ b/Assets/_Content/Materials/M_default.mat @@ -84,8 +84,11 @@ Material: - _ClipInvert: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailSize: 1 - _DstBlend: 0 - _DstBlendAlpha: 0 + - _FogMax: 15 + - _FogMin: 0 - _GrainSize: 0.4 - _GrainStrength: 0.2 - _HighlightMax: 1 @@ -114,6 +117,7 @@ Material: m_Colors: - _BaseColor: {r: 0.754717, g: 0.754717, b: 0.754717, a: 1} - _Color: {r: 0.8588235, g: 0.8588235, b: 0.8588235, a: 1} + - _FogColor: {r: 1, g: 1, b: 1, a: 0} - _GrainColor: {r: 1, g: 1, b: 1, a: 0.09803922} - _HighlightColor: {r: 2.118547, g: 2.118547, b: 2.118547, a: 1} - _ShadowColor: {r: 0.14117646, g: 0.16862747, b: 0.16470587, a: 1} diff --git a/Assets/_Content/Materials/Stencil/M_default_mask_A.mat b/Assets/_Content/Materials/Stencil/M_default_mask_A.mat index b76c96f5..bfa3cc95 100644 --- a/Assets/_Content/Materials/Stencil/M_default_mask_A.mat +++ b/Assets/_Content/Materials/Stencil/M_default_mask_A.mat @@ -73,6 +73,9 @@ Material: m_Floats: - _ClipDistance: 0 - _ClipInvert: 0 + - _DetailSize: 1 + - _FogMax: 15 + - _FogMin: 0 - _GrainSize: 0.4 - _GrainStrength: 0.2 - _HighlightMax: 1 @@ -97,6 +100,7 @@ Material: m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _Color: {r: 0.8588235, g: 0.8588235, b: 0.8588235, a: 1} + - _FogColor: {r: 1, g: 1, b: 1, a: 0} - _GrainColor: {r: 1, g: 1, b: 1, a: 0.09803922} - _HighlightColor: {r: 2.118547, g: 2.118547, b: 2.118547, a: 1} - _ShadowColor: {r: 0.14117646, g: 0.16862747, b: 0.16470587, a: 1} diff --git a/Assets/_Content/Materials/Stencil/M_default_mask_B.mat b/Assets/_Content/Materials/Stencil/M_default_mask_B.mat index d920cfd1..67a5362a 100644 --- a/Assets/_Content/Materials/Stencil/M_default_mask_B.mat +++ b/Assets/_Content/Materials/Stencil/M_default_mask_B.mat @@ -73,6 +73,9 @@ Material: m_Floats: - _ClipDistance: 0 - _ClipInvert: 0 + - _DetailSize: 1 + - _FogMax: 15 + - _FogMin: 0 - _GrainSize: 0.4 - _GrainStrength: 0.2 - _HighlightMax: 1 @@ -97,6 +100,7 @@ Material: m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _Color: {r: 0.8588235, g: 0.8588235, b: 0.8588235, a: 1} + - _FogColor: {r: 1, g: 1, b: 1, a: 0} - _GrainColor: {r: 1, g: 1, b: 1, a: 0.09803922} - _HighlightColor: {r: 2.118547, g: 2.118547, b: 2.118547, a: 1} - _ShadowColor: {r: 0.14117646, g: 0.16862747, b: 0.16470587, a: 1} diff --git a/Assets/_Content/Models/Environments/Omnissiah/Materials/M_omnissiah_ground.mat b/Assets/_Content/Models/Environments/Omnissiah/Materials/M_omnissiah_ground.mat index 94bd1ee9..2941abfc 100644 --- a/Assets/_Content/Models/Environments/Omnissiah/Materials/M_omnissiah_ground.mat +++ b/Assets/_Content/Models/Environments/Omnissiah/Materials/M_omnissiah_ground.mat @@ -40,6 +40,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _DetailMap: + m_Texture: {fileID: 2800000, guid: 2da59fbd756c92a4bb2018abf06c4e07, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _DetailMask: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -102,6 +106,7 @@ Material: - _Cutoff: 0.5 - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 + - _DetailSize: 1 - _DstBlend: 0 - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 @@ -116,6 +121,7 @@ Material: - _Metallic: 0 - _OcclusionStrength: 1 - _Parallax: 0.005 + - _ProjectionBlend: 0.1 - _QueueControl: 0 - _QueueOffset: 0 - _ReceiveShadows: 1 diff --git a/Assets/_Content/Models/Props/Omnissiah/Stele/Materials/M_omnissiah_stele.mat b/Assets/_Content/Models/Props/Omnissiah/Stele/Materials/M_omnissiah_stele.mat index e73fa817..e2159b1f 100644 --- a/Assets/_Content/Models/Props/Omnissiah/Stele/Materials/M_omnissiah_stele.mat +++ b/Assets/_Content/Models/Props/Omnissiah/Stele/Materials/M_omnissiah_stele.mat @@ -40,6 +40,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _DetailMap: + m_Texture: {fileID: 2800000, guid: 2da59fbd756c92a4bb2018abf06c4e07, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _DetailMask: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -110,9 +114,12 @@ Material: - _Cutoff: 0.5 - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 + - _DetailSize: 1 - _DstBlend: 0 - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 + - _FogMax: 7 + - _FogMin: 0 - _GlossMapScale: 0 - _Glossiness: 0 - _GlossyReflections: 0 @@ -124,6 +131,7 @@ Material: - _Metallic: 0 - _OcclusionStrength: 1 - _Parallax: 0.005 + - _ProjectionBlend: 0.1 - _QueueControl: 0 - _QueueOffset: 0 - _ReceiveShadows: 1 @@ -141,6 +149,7 @@ Material: - _Surface: 0 - _Test: 0 - _TriplanarBlend: 0 + - _VertexColor: 0 - _WorkflowMode: 1 - _XRMotionVectorsPass: 1 - _ZWrite: 1 @@ -151,6 +160,7 @@ Material: - _EmissionColor: {r: 256, g: 256, b: 256, a: 1} - _Emission_intensity: {r: 128, g: 128, b: 128, a: 1} - _Emissive_intensity: {r: 16, g: 16, b: 16, a: 1} + - _FogColor: {r: 1.8679246, g: 0.62325984, b: 0.25551805, a: 0.5686275} - _GrainColor: {r: 1, g: 1, b: 1, a: 0.09803922} - _HighlightColor: {r: 2.118547, g: 2.118547, b: 2.118547, a: 1} - _ShadowColor: {r: 0.14117646, g: 0.16862747, b: 0.16470587, a: 1} diff --git a/Assets/_Content/Models/VFX/Fog/Materials/M_fog.mat b/Assets/_Content/Models/VFX/Fog/Materials/M_fog.mat index 951e497f..fbf029a2 100644 --- a/Assets/_Content/Models/VFX/Fog/Materials/M_fog.mat +++ b/Assets/_Content/Models/VFX/Fog/Materials/M_fog.mat @@ -55,7 +55,7 @@ Material: - _QueueControl: 0 - _QueueOffset: 0 m_Colors: - - _ColorA: {r: 1.244819, g: 0.500609, b: 0.2289997, a: 1} + - _ColorA: {r: 1.4980392, g: 0.6024425, b: 0.27558267, a: 1} - _ColorB: {r: 0.7924528, g: 0.2773978, b: 0.09344961, a: 1} m_BuildTextureStacks: [] m_AllowLocking: 1 diff --git a/Assets/_Content/Models/VFX/Fog/Shaders/Fog.hlsl b/Assets/_Content/Models/VFX/Fog/Shaders/Fog.hlsl index fa6aa74c..bb1e168b 100644 --- a/Assets/_Content/Models/VFX/Fog/Shaders/Fog.hlsl +++ b/Assets/_Content/Models/VFX/Fog/Shaders/Fog.hlsl @@ -28,25 +28,30 @@ void Fog_float //float test = RidgedNoise3D(PositionWS, 10, 2, 2, .5); float3 camPos = _WorldSpaceCameraPos.xyz; float depth = distance(camPos, PositionWS); - float depthAtten = smoothstep(10, 100, depth); + float depthAtten = smoothstep(5, 30, depth); - float mask = smoothstep(0, lerp(.3, .1, depthAtten), PositionOS.y) * pow(smoothstep(1, .5, PositionOS.y), 2); float t = _Time.y * .7; float s = lerp(Scale.x, 1, .3); + float3 p = PositionWS;// - PivotWS; p += float3(t, t * .2, t); - p += RidgedNoise3D(p - PivotWS * .9, .1, 3, 1.6, 1) * 3; + + float noise = RidgedNoise3D(p - PivotWS * .9, .1, 5, 1.6, 1); + + p += noise * 3; float fog = FBMNoise3D((p - PivotWS * .5), 10 / s, 3, 1.5, .5); - float4 col = lerp(ColorA, ColorB, saturate(RidgedNoise3D((p - PivotWS * .7) * float3(1, 1.6, 1), 3 / s, 3, 1.6, 1))); + float4 col = lerp(ColorA, ColorB, saturate(RidgedNoise3D((p - PivotWS * .9) * float3(1, 1.6, 1), 3 / s, 3, 1.6, 1))); + + float mask = smoothstep(0, lerp(.3, .1, depthAtten), PositionOS.y) * pow(smoothstep(1, .5, PositionOS.y - .15 + noise * .3), 2); // Output Output = col.rgb; - Alpha = lerp(fog, smoothstep(1, .5, PositionOS.y), depthAtten * mask) * lerp(.2, 1, smoothstep(0, 30, depth)) * mask * col.a; + Alpha = lerp(fog, smoothstep(1, .5, PositionOS.y), depthAtten * mask) * lerp(.2, 1, smoothstep(0, 15, depth)) * mask * col.a; } #endif diff --git a/Assets/_Content/Models/VFX/Ray/Materials/M_ray_Omnissiah.mat b/Assets/_Content/Models/VFX/Ray/Materials/M_ray_Omnissiah.mat new file mode 100644 index 00000000..25095edb --- /dev/null +++ b/Assets/_Content/Models/VFX/Ray/Materials/M_ray_Omnissiah.mat @@ -0,0 +1,75 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-5120607745848675954 +MonoBehaviour: + m_ObjectHideFlags: 11 + 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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 10 +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: M_ray_Omnissiah + m_Shader: {fileID: -6465566751694194690, guid: 41e1af50dce5647448137abb3f85e49b, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 1 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 3000 + stringTagMap: {} + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _SampleTexture2D_45427f0cc3994257be048fc580e65bba_Texture_1_Texture2D: + m_Texture: {fileID: 2800000, guid: dffef66376be4fa480fb02b19edbe903, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _Debug: 0 + - _Demo: 0 + - _IgnoreAtten: 1 + - _Intendity: 0.828 + - _Intensity: 1 + - _Noise: 0.786 + - _QueueControl: 0 + - _QueueOffset: 0 + - _Size: 3.92 + - _Speed: 2 + - _Stop: 1 + - _UV: 0 + m_Colors: + - _Color: {r: 10.556064, g: 0, b: 0.17448205, a: 0.105882354} + - _Direction: {r: 0, g: 0, b: 1, a: 0} + - _Size: {r: 3, g: 1, b: 0, a: 0} + m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/_Content/Models/VFX/Ray/Materials/M_ray_Omnissiah.mat.meta b/Assets/_Content/Models/VFX/Ray/Materials/M_ray_Omnissiah.mat.meta new file mode 100644 index 00000000..25a833a8 --- /dev/null +++ b/Assets/_Content/Models/VFX/Ray/Materials/M_ray_Omnissiah.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2f0a42f4b97d23e4599d257dabb0f97d +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_Content/Models/VFX/Ray/Shaders/Ray.shadergraph b/Assets/_Content/Models/VFX/Ray/Shaders/Ray.shadergraph index fb6a67c3..e324436c 100644 --- a/Assets/_Content/Models/VFX/Ray/Shaders/Ray.shadergraph +++ b/Assets/_Content/Models/VFX/Ray/Shaders/Ray.shadergraph @@ -219,9 +219,6 @@ { "m_Id": "674cec991594498c8756bf3f89639441" }, - { - "m_Id": "45427f0cc3994257be048fc580e65bba" - }, { "m_Id": "356ead80edae4fa8b208a5b477611142" }, @@ -242,6 +239,33 @@ }, { "m_Id": "b2bb364d532b4dd999f4ffc8d39b09be" + }, + { + "m_Id": "d0b2148d6951451ea72df6dd3bfc9721" + }, + { + "m_Id": "04ccc388dde743e684e58f816092b9f2" + }, + { + "m_Id": "8efb17c5cc8d4cc995f8897569969d22" + }, + { + "m_Id": "165b29411327480c8108711d1c7aa8fc" + }, + { + "m_Id": "cd5f6c0f08b34a13986791a0708bd10f" + }, + { + "m_Id": "2ae77d66af42479b900424b2c59d506f" + }, + { + "m_Id": "481c868fbd424dee8779e414ddbfc6f2" + }, + { + "m_Id": "88d47eee265d42179af1618f64d4cb42" + }, + { + "m_Id": "bd957a577b964244ac6b8f9854af3641" } ], "m_GroupDatas": [ @@ -310,6 +334,20 @@ "m_SlotId": 1 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "04ccc388dde743e684e58f816092b9f2" + }, + "m_SlotId": 2 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "8efb17c5cc8d4cc995f8897569969d22" + }, + "m_SlotId": 0 + } + }, { "m_OutputSlot": { "m_Node": { @@ -394,6 +432,20 @@ "m_SlotId": 1 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "165b29411327480c8108711d1c7aa8fc" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "cd5f6c0f08b34a13986791a0708bd10f" + }, + "m_SlotId": 0 + } + }, { "m_OutputSlot": { "m_Node": { @@ -478,6 +530,20 @@ "m_SlotId": 1 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "2ae77d66af42479b900424b2c59d506f" + }, + "m_SlotId": 1 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "dfd7a434c75d4317b4ec5650b710e565" + }, + "m_SlotId": 0 + } + }, { "m_OutputSlot": { "m_Node": { @@ -562,6 +628,20 @@ "m_SlotId": 1 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "481c868fbd424dee8779e414ddbfc6f2" + }, + "m_SlotId": 1 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "88d47eee265d42179af1618f64d4cb42" + }, + "m_SlotId": 0 + } + }, { "m_OutputSlot": { "m_Node": { @@ -758,6 +838,20 @@ "m_SlotId": 0 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "88d47eee265d42179af1618f64d4cb42" + }, + "m_SlotId": 2 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "bd957a577b964244ac6b8f9854af3641" + }, + "m_SlotId": 1 + } + }, { "m_OutputSlot": { "m_Node": { @@ -781,21 +875,21 @@ }, "m_InputSlot": { "m_Node": { - "m_Id": "45427f0cc3994257be048fc580e65bba" + "m_Id": "b761b7065b85432e9105a2bb9beb2779" }, - "m_SlotId": 2 + "m_SlotId": 0 } }, { "m_OutputSlot": { "m_Node": { - "m_Id": "8c33db14052d44f58d122f6121da5b71" + "m_Id": "8efb17c5cc8d4cc995f8897569969d22" }, - "m_SlotId": 3 + "m_SlotId": 2 }, "m_InputSlot": { "m_Node": { - "m_Id": "b761b7065b85432e9105a2bb9beb2779" + "m_Id": "2ae77d66af42479b900424b2c59d506f" }, "m_SlotId": 0 } @@ -1010,6 +1104,20 @@ "m_SlotId": 2 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "bd957a577b964244ac6b8f9854af3641" + }, + "m_SlotId": 2 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "8efb17c5cc8d4cc995f8897569969d22" + }, + "m_SlotId": 1 + } + }, { "m_OutputSlot": { "m_Node": { @@ -1136,6 +1244,20 @@ "m_SlotId": 0 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "cd5f6c0f08b34a13986791a0708bd10f" + }, + "m_SlotId": 4 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "04ccc388dde743e684e58f816092b9f2" + }, + "m_SlotId": 1 + } + }, { "m_OutputSlot": { "m_Node": { @@ -1150,6 +1272,20 @@ "m_SlotId": 0 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "d0b2148d6951451ea72df6dd3bfc9721" + }, + "m_SlotId": 1 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "04ccc388dde743e684e58f816092b9f2" + }, + "m_SlotId": 0 + } + }, { "m_OutputSlot": { "m_Node": { @@ -1485,6 +1621,50 @@ "m_LiteralMode": false } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.SubtractNode", + "m_ObjectId": "04ccc388dde743e684e58f816092b9f2", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Subtract", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 1359.9998779296875, + "y": 312.9999694824219, + "width": 126.0, + "height": 118.0 + } + }, + "m_Slots": [ + { + "m_Id": "e26ac78533ae4f5c97716362c01ce181" + }, + { + "m_Id": "a82e18b7a40c4c01b62455911db42d47" + }, + { + "m_Id": "6980f20ac3994f2f91cf2e19d98b021c" + } + ], + "synonyms": [ + "subtraction", + "remove", + "minus", + "take away" + ], + "m_Precision": 0, + "m_PreviewExpanded": false, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -1517,31 +1697,6 @@ "m_LiteralMode": false } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot", - "m_ObjectId": "08e27e150e004f2f9c3bd1d66fdfa8f4", - "m_Id": 0, - "m_DisplayName": "RGBA", - "m_SlotType": 1, - "m_Hidden": false, - "m_ShaderOutputName": "RGBA", - "m_StageCapability": 2, - "m_Value": { - "x": 0.0, - "y": 0.0, - "z": 0.0, - "w": 0.0 - }, - "m_DefaultValue": { - "x": 0.0, - "y": 0.0, - "z": 0.0, - "w": 0.0 - }, - "m_Labels": [] -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.MultiplyNode", @@ -2197,6 +2352,31 @@ "m_ConstIntMode": false } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "13f8857121904b14aac4c28d7e321d34", + "m_Id": 1, + "m_DisplayName": "B", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "B", + "m_StageCapability": 3, + "m_Value": { + "x": 2.0, + "y": 2.0, + "z": 2.0, + "w": 2.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_LiteralMode": false +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot", @@ -2309,6 +2489,40 @@ "m_LiteralMode": false } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.ScreenPositionNode", + "m_ObjectId": "165b29411327480c8108711d1c7aa8fc", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Screen Position", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 1045.9998779296875, + "y": 387.9999694824219, + "width": 145.0, + "height": 127.99996948242188 + } + }, + "m_Slots": [ + { + "m_Id": "af3fcfb94d304a64921b8a6d1b0131f7" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": false, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_ScreenSpaceType": 1 +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", @@ -2419,22 +2633,6 @@ "m_Labels": [] } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", - "m_ObjectId": "192261403e4c4727b79f19242c8b9ad3", - "m_Id": 7, - "m_DisplayName": "A", - "m_SlotType": 1, - "m_Hidden": false, - "m_ShaderOutputName": "A", - "m_StageCapability": 2, - "m_Value": 0.0, - "m_DefaultValue": 0.0, - "m_Labels": [], - "m_LiteralMode": false -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot", @@ -2802,13 +3000,13 @@ { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", - "m_ObjectId": "21d45d62daf74c2aa6143c789698588c", - "m_Id": 6, - "m_DisplayName": "B", + "m_ObjectId": "2179b2fbdf464ca2b4030d679eac456e", + "m_Id": 1, + "m_DisplayName": "R", "m_SlotType": 1, "m_Hidden": false, - "m_ShaderOutputName": "B", - "m_StageCapability": 2, + "m_ShaderOutputName": "R", + "m_StageCapability": 3, "m_Value": 0.0, "m_DefaultValue": 0.0, "m_Labels": [], @@ -3050,6 +3248,44 @@ "m_LiteralMode": false } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.SaturateNode", + "m_ObjectId": "2ae77d66af42479b900424b2c59d506f", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Saturate", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 1657.9998779296875, + "y": 371.0, + "width": 128.0, + "height": 93.99993896484375 + } + }, + "m_Slots": [ + { + "m_Id": "571bd0c09b444ba298e0a8dc3f2927e6" + }, + { + "m_Id": "ca5836131aae4c8c9ecccb0d5545cc3f" + } + ], + "synonyms": [ + "clamp" + ], + "m_Precision": 0, + "m_PreviewExpanded": false, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", @@ -3426,19 +3662,6 @@ "m_LiteralMode": false } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.SamplerStateMaterialSlot", - "m_ObjectId": "38d8294fee7146508d624ea3b513ab31", - "m_Id": 3, - "m_DisplayName": "Sampler", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "Sampler", - "m_StageCapability": 3, - "m_BareResource": false -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", @@ -3686,6 +3909,54 @@ "m_LiteralMode": false } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", + "m_ObjectId": "437cd160911649c4b900404cee4cc066", + "m_Id": 0, + "m_DisplayName": "A", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "A", + "m_StageCapability": 3, + "m_Value": { + "e00": 1.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 0.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 0.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 0.0 + }, + "m_DefaultValue": { + "e00": 1.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 1.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 1.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 1.0 + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", @@ -3759,66 +4030,6 @@ "m_LiteralMode": false } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.SampleTexture2DNode", - "m_ObjectId": "45427f0cc3994257be048fc580e65bba", - "m_Group": { - "m_Id": "" - }, - "m_Name": "Sample Texture 2D", - "m_DrawState": { - "m_Expanded": true, - "m_Position": { - "serializedVersion": "2", - "x": 1533.9998779296875, - "y": 325.0, - "width": 208.0, - "height": 432.99993896484377 - } - }, - "m_Slots": [ - { - "m_Id": "08e27e150e004f2f9c3bd1d66fdfa8f4" - }, - { - "m_Id": "72e39f090e2a401695cddc208d2b6715" - }, - { - "m_Id": "f855c60d63ce493c916822f01cc0aa8c" - }, - { - "m_Id": "21d45d62daf74c2aa6143c789698588c" - }, - { - "m_Id": "192261403e4c4727b79f19242c8b9ad3" - }, - { - "m_Id": "48378a56a612440fa98572181bbef00c" - }, - { - "m_Id": "d4d263ad95a64d7bab2b59c02334ca1d" - }, - { - "m_Id": "38d8294fee7146508d624ea3b513ab31" - } - ], - "synonyms": [ - "tex2d" - ], - "m_Precision": 0, - "m_PreviewExpanded": true, - "m_DismissedVersion": 0, - "m_PreviewMode": 0, - "m_CustomColors": { - "m_SerializableColors": [] - }, - "m_TextureType": 0, - "m_NormalMapSpace": 0, - "m_EnableGlobalMipBias": true, - "m_MipSamplingMode": 0 -} - { "m_SGVersion": 1, "m_Type": "UnityEditor.Rendering.Universal.ShaderGraph.UniversalTarget", @@ -3847,20 +4058,52 @@ { "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Texture2DInputMaterialSlot", - "m_ObjectId": "48378a56a612440fa98572181bbef00c", - "m_Id": 1, - "m_DisplayName": "Texture", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "Texture", - "m_StageCapability": 3, - "m_BareResource": false, - "m_Texture": { - "m_SerializedTexture": "{\"texture\":{\"fileID\":2800000,\"guid\":\"dffef66376be4fa480fb02b19edbe903\",\"type\":3}}", - "m_Guid": "" + "m_Type": "UnityEditor.ShaderGraph.ObjectNode", + "m_ObjectId": "481c868fbd424dee8779e414ddbfc6f2", + "m_Group": { + "m_Id": "" }, - "m_DefaultType": 0 + "m_Name": "Object", + "m_DrawState": { + "m_Expanded": false, + "m_Position": { + "serializedVersion": "2", + "x": 1122.0, + "y": 527.0000610351563, + "width": 84.0001220703125, + "height": 77.0 + } + }, + "m_Slots": [ + { + "m_Id": "d003db0eb9254a2ba0a54cc489a07a39" + }, + { + "m_Id": "fb670fc65f574bc8a0dab07118b75f03" + }, + { + "m_Id": "c84be17c0c4c47d091d046ef8a588c2b" + }, + { + "m_Id": "7207d262fdb54ef6adaf5fc03ba2d559" + }, + { + "m_Id": "e9747125db2347eea95b3163bcb2c93c" + } + ], + "synonyms": [ + "position", + "scale", + "bounds", + "size" + ], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + } } { @@ -4219,6 +4462,31 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "506357a9815c4923b642e09a2835963e", + "m_Id": 0, + "m_DisplayName": "In", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "In", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_LiteralMode": false +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.AddNode", @@ -4415,6 +4683,47 @@ "m_LiteralMode": false } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "571bd0c09b444ba298e0a8dc3f2927e6", + "m_Id": 0, + "m_DisplayName": "In", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "In", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_LiteralMode": false +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "5a0794c8f7744ebdb8a7c3c2792a9bef", + "m_Id": 1, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 2, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [], + "m_LiteralMode": false +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.GradientInputMaterialSlot", @@ -4798,6 +5107,22 @@ "m_LiteralMode": false } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "617c795ffc3d4d2d9ab67973c30c682e", + "m_Id": 2, + "m_DisplayName": "G", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "G", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [], + "m_LiteralMode": false +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.ObjectNode", @@ -5045,13 +5370,29 @@ ] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "649dfcb8166b484196b72d67ae6e5a62", + "m_Id": 4, + "m_DisplayName": "A", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "A", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [], + "m_LiteralMode": false +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.GroupData", "m_ObjectId": "64c8b693f8f246429141bf72af10e2ee", "m_Title": "Billboard", "m_Position": { - "x": 115.00003051757813, + "x": 115.0, "y": -691.0 } } @@ -5177,6 +5518,31 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "6980f20ac3994f2f91cf2e19d98b021c", + "m_Id": 2, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_LiteralMode": false +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", @@ -5297,6 +5663,54 @@ ] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", + "m_ObjectId": "6c3a04fea50445c98e63102aa13ba9b5", + "m_Id": 1, + "m_DisplayName": "B", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "B", + "m_StageCapability": 3, + "m_Value": { + "e00": 1.0, + "e01": 2.0, + "e02": 2.0, + "e03": 2.0, + "e10": 2.0, + "e11": 2.0, + "e12": 2.0, + "e13": 2.0, + "e20": 2.0, + "e21": 2.0, + "e22": 2.0, + "e23": 2.0, + "e30": 2.0, + "e31": 2.0, + "e32": 2.0, + "e33": 2.0 + }, + "m_DefaultValue": { + "e00": 1.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 1.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 1.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 1.0 + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.MultiplyNode", @@ -5445,18 +5859,25 @@ { "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", - "m_ObjectId": "72e39f090e2a401695cddc208d2b6715", - "m_Id": 4, - "m_DisplayName": "R", + "m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot", + "m_ObjectId": "7207d262fdb54ef6adaf5fc03ba2d559", + "m_Id": 3, + "m_DisplayName": "World Bounds Max", "m_SlotType": 1, "m_Hidden": false, - "m_ShaderOutputName": "R", - "m_StageCapability": 2, - "m_Value": 0.0, - "m_DefaultValue": 0.0, - "m_Labels": [], - "m_LiteralMode": false + "m_ShaderOutputName": "World Bounds Max", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_Labels": [] } { @@ -6001,6 +6422,54 @@ "m_LiteralMode": false } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", + "m_ObjectId": "82198ed8f88741e58492d805ed0205ce", + "m_Id": 2, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": { + "e00": 0.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 0.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 0.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 0.0 + }, + "m_DefaultValue": { + "e00": 1.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 1.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 1.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 1.0 + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", @@ -6143,6 +6612,22 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "83c85f82e4cd4d44b932f29ae8919d7f", + "m_Id": 3, + "m_DisplayName": "B", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "B", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [], + "m_LiteralMode": false +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", @@ -6292,6 +6777,53 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.SplitNode", + "m_ObjectId": "88d47eee265d42179af1618f64d4cb42", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Split", + "m_DrawState": { + "m_Expanded": false, + "m_Position": { + "serializedVersion": "2", + "x": 1218.0001220703125, + "y": 527.0000610351563, + "width": 120.0, + "height": 77.0 + } + }, + "m_Slots": [ + { + "m_Id": "c1006c7e2a5544108719e45719a4b0f2" + }, + { + "m_Id": "2179b2fbdf464ca2b4030d679eac456e" + }, + { + "m_Id": "617c795ffc3d4d2d9ab67973c30c682e" + }, + { + "m_Id": "aab15709ed2842ff89c0d6493856863b" + }, + { + "m_Id": "c6c61d40745c40d0b9b8c35b23030fda" + } + ], + "synonyms": [ + "separate" + ], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot", @@ -6454,6 +6986,49 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.MultiplyNode", + "m_ObjectId": "8efb17c5cc8d4cc995f8897569969d22", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Multiply", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 1509.9998779296875, + "y": 371.9999694824219, + "width": 126.0, + "height": 118.0 + } + }, + "m_Slots": [ + { + "m_Id": "437cd160911649c4b900404cee4cc066" + }, + { + "m_Id": "6c3a04fea50445c98e63102aa13ba9b5" + }, + { + "m_Id": "82198ed8f88741e58492d805ed0205ce" + } + ], + "synonyms": [ + "multiplication", + "times", + "x" + ], + "m_Precision": 0, + "m_PreviewExpanded": false, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -6950,6 +7525,31 @@ "m_LiteralMode": false } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "9b3c390bd1fd41fbb286c16a44907a74", + "m_Id": 0, + "m_DisplayName": "A", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "A", + "m_StageCapability": 3, + "m_Value": { + "x": 1.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_LiteralMode": false +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", @@ -7419,6 +8019,31 @@ "m_Space": 0 } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "a82e18b7a40c4c01b62455911db42d47", + "m_Id": 1, + "m_DisplayName": "B", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "B", + "m_StageCapability": 3, + "m_Value": { + "x": 1.0, + "y": 1.0, + "z": 1.0, + "w": 1.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_LiteralMode": false +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.TangentMaterialSlot", @@ -7468,6 +8093,47 @@ "m_LiteralMode": false } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "a93b1c3546c44c3a8146d192c7715512", + "m_Id": 2, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_LiteralMode": false +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "aab15709ed2842ff89c0d6493856863b", + "m_Id": 3, + "m_DisplayName": "B", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "B", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [], + "m_LiteralMode": false +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", @@ -7602,6 +8268,31 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot", + "m_ObjectId": "af3fcfb94d304a64921b8a6d1b0131f7", + "m_Id": 0, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_Labels": [] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -8111,6 +8802,48 @@ "m_LiteralMode": false } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DivideNode", + "m_ObjectId": "bd957a577b964244ac6b8f9854af3641", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Divide", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 1360.0001220703125, + "y": 442.0000305175781, + "width": 126.0, + "height": 118.00003051757813 + } + }, + "m_Slots": [ + { + "m_Id": "9b3c390bd1fd41fbb286c16a44907a74" + }, + { + "m_Id": "13f8857121904b14aac4c28d7e321d34" + }, + { + "m_Id": "a93b1c3546c44c3a8146d192c7715512" + } + ], + "synonyms": [ + "division", + "divided by" + ], + "m_Precision": 0, + "m_PreviewExpanded": false, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.SaturateNode", @@ -8228,6 +8961,31 @@ "m_LiteralMode": false } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "c1006c7e2a5544108719e45719a4b0f2", + "m_Id": 0, + "m_DisplayName": "In", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "In", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_LiteralMode": false +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.SplitNode", @@ -8352,6 +9110,22 @@ "m_LiteralMode": false } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "c6c61d40745c40d0b9b8c35b23030fda", + "m_Id": 4, + "m_DisplayName": "A", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "A", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [], + "m_LiteralMode": false +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -8368,6 +9142,29 @@ "m_LiteralMode": false } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot", + "m_ObjectId": "c84be17c0c4c47d091d046ef8a588c2b", + "m_Id": 2, + "m_DisplayName": "World Bounds Min", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "World Bounds Min", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_Labels": [] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", @@ -8544,6 +9341,31 @@ "m_SerializedDescriptor": "VertexDescription.Normal" } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "ca5836131aae4c8c9ecccb0d5545cc3f", + "m_Id": 1, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_LiteralMode": false +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", @@ -8730,6 +9552,53 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.SplitNode", + "m_ObjectId": "cd5f6c0f08b34a13986791a0708bd10f", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Split", + "m_DrawState": { + "m_Expanded": false, + "m_Position": { + "serializedVersion": "2", + "x": 1215.9998779296875, + "y": 387.9999694824219, + "width": 119.0, + "height": 77.0 + } + }, + "m_Slots": [ + { + "m_Id": "506357a9815c4923b642e09a2835963e" + }, + { + "m_Id": "fb385c448f1e4fad92a1314b0cb1d69d" + }, + { + "m_Id": "f08b05c8fdb34ff7a13e6b7d367ebfc1" + }, + { + "m_Id": "83c85f82e4cd4d44b932f29ae8919d7f" + }, + { + "m_Id": "649dfcb8166b484196b72d67ae6e5a62" + } + ], + "synonyms": [ + "separate" + ], + "m_Precision": 0, + "m_PreviewExpanded": false, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.GradientNode", @@ -8803,6 +9672,69 @@ "m_SerializableMode": 0 } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot", + "m_ObjectId": "d003db0eb9254a2ba0a54cc489a07a39", + "m_Id": 0, + "m_DisplayName": "Position", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Position", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.SceneDepthNode", + "m_ObjectId": "d0b2148d6951451ea72df6dd3bfc9721", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Scene Depth", + "m_DrawState": { + "m_Expanded": false, + "m_Position": { + "serializedVersion": "2", + "x": 1190.9998779296875, + "y": 267.0, + "width": 145.0, + "height": 110.99996948242188 + } + }, + "m_Slots": [ + { + "m_Id": "e68f3595d1a14c3bb3d281bf8350dc3d" + }, + { + "m_Id": "5a0794c8f7744ebdb8a7c3c2792a9bef" + } + ], + "synonyms": [ + "zbuffer", + "zdepth" + ], + "m_Precision": 0, + "m_PreviewExpanded": false, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_DepthSamplingMode": 2 +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", @@ -8951,28 +9883,6 @@ } } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.UVMaterialSlot", - "m_ObjectId": "d4d263ad95a64d7bab2b59c02334ca1d", - "m_Id": 2, - "m_DisplayName": "UV", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "UV", - "m_StageCapability": 3, - "m_Value": { - "x": 0.0, - "y": 0.0 - }, - "m_DefaultValue": { - "x": 0.0, - "y": 0.0 - }, - "m_Labels": [], - "m_Channel": 0 -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -8995,8 +9905,8 @@ "m_ObjectId": "d5b16febef9c45909ea43cbde2569b05", "m_Title": "Random", "m_Position": { - "x": -2910.000244140625, - "y": -235.00001525878907 + "x": -2910.0, + "y": -235.0 } } @@ -9498,6 +10408,31 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "e26ac78533ae4f5c97716362c01ce181", + "m_Id": 0, + "m_DisplayName": "A", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "A", + "m_StageCapability": 3, + "m_Value": { + "x": 1.0, + "y": 1.0, + "z": 1.0, + "w": 1.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_LiteralMode": false +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.AddNode", @@ -9637,6 +10572,55 @@ "m_LiteralMode": false } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.ScreenPositionMaterialSlot", + "m_ObjectId": "e68f3595d1a14c3bb3d281bf8350dc3d", + "m_Id": 0, + "m_DisplayName": "UV", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "UV", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_Labels": [], + "m_ScreenSpaceType": 0 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot", + "m_ObjectId": "e9747125db2347eea95b3163bcb2c93c", + "m_Id": 4, + "m_DisplayName": "Bounds Size", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Bounds Size", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_Labels": [] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", @@ -9954,6 +10938,22 @@ "m_LiteralMode": false } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "f08b05c8fdb34ff7a13e6b7d367ebfc1", + "m_Id": 2, + "m_DisplayName": "G", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "G", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [], + "m_LiteralMode": false +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", @@ -10209,22 +11209,6 @@ } } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", - "m_ObjectId": "f855c60d63ce493c916822f01cc0aa8c", - "m_Id": 5, - "m_DisplayName": "G", - "m_SlotType": 1, - "m_Hidden": false, - "m_ShaderOutputName": "G", - "m_StageCapability": 2, - "m_Value": 0.0, - "m_DefaultValue": 0.0, - "m_Labels": [], - "m_LiteralMode": false -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot", @@ -10264,6 +11248,45 @@ "m_LiteralMode": false } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "fb385c448f1e4fad92a1314b0cb1d69d", + "m_Id": 1, + "m_DisplayName": "R", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "R", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [], + "m_LiteralMode": false +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot", + "m_ObjectId": "fb670fc65f574bc8a0dab07118b75f03", + "m_Id": 1, + "m_DisplayName": "Scale", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Scale", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_Labels": [] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", diff --git a/Assets/_Content/Prefabs/Environments/Omnissiah/OmnissiahEnv.prefab b/Assets/_Content/Prefabs/Environments/Omnissiah/OmnissiahEnv.prefab index 781134ba..333b131c 100644 --- a/Assets/_Content/Prefabs/Environments/Omnissiah/OmnissiahEnv.prefab +++ b/Assets/_Content/Prefabs/Environments/Omnissiah/OmnissiahEnv.prefab @@ -606,6 +606,133 @@ MeshCollider: m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &2025796757643683946 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8224314324322834591} + - component: {fileID: 5375479894882030970} + - component: {fileID: 4099810627939101736} + m_Layer: 21 + m_Name: Point Light + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8224314324322834591 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2025796757643683946} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0.006, y: 1.765, z: 19.533} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1381325834594434730} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!108 &5375479894882030970 +Light: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2025796757643683946} + m_Enabled: 1 + serializedVersion: 12 + m_Type: 2 + m_Color: {r: 1, g: 0, b: 0, a: 1} + m_Intensity: 1 + m_Range: 1.41 + m_SpotAngle: 30 + m_InnerSpotAngle: 21.80208 + m_CookieSize2D: {x: 0.5, y: 0.5} + m_Shadows: + m_Type: 0 + m_Resolution: -1 + m_CustomResolution: -1 + m_Strength: 1 + m_Bias: 0.05 + m_NormalBias: 0.4 + m_NearPlane: 0.2 + m_CullingMatrixOverride: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_UseCullingMatrixOverride: 0 + m_Cookie: {fileID: 0} + m_DrawHalo: 0 + m_Flare: {fileID: 0} + m_RenderMode: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingLayerMask: 2 + m_Lightmapping: 4 + m_LightShadowCasterMode: 0 + m_AreaSize: {x: 1, y: 1} + m_BounceIntensity: 1 + m_ColorTemperature: 6570 + m_UseColorTemperature: 0 + m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} + m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 + m_ForceVisible: 0 + m_ShadowRadius: 0 + m_ShadowAngle: 0 + m_LightUnit: 1 + m_LuxAtDistance: 1 + m_EnableSpotReflector: 1 +--- !u!114 &4099810627939101736 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2025796757643683946} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} + m_Name: + m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Runtime::UnityEngine.Rendering.Universal.UniversalAdditionalLightData + m_UsePipelineSettings: 1 + m_AdditionalLightsShadowResolutionTier: 2 + m_CustomShadowLayers: 0 + m_LightCookieSize: {x: 1, y: 1} + m_LightCookieOffset: {x: 0, y: 0} + m_SoftShadowQuality: 0 + m_RenderingLayersMask: + serializedVersion: 0 + m_Bits: 2 + m_ShadowRenderingLayersMask: + serializedVersion: 0 + m_Bits: 1 + m_Version: 4 + m_LightLayerMask: 1 + m_ShadowLayerMask: 1 + m_RenderingLayers: 1 + m_ShadowRenderingLayers: 1 --- !u!1 &3318401582161600079 GameObject: m_ObjectHideFlags: 0 @@ -1010,6 +1137,10 @@ Transform: - {fileID: 8594930595872363770} - {fileID: 1866815096823659602} - {fileID: 1285827998720199852} + - {fileID: 8224314324322834591} + - {fileID: 1780869142280226392} + - {fileID: 2835732385966090374} + - {fileID: 4926732054180342176} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &6092940326754491008 @@ -1455,15 +1586,15 @@ PrefabInstance: m_Modifications: - target: {fileID: -8679921383154817045, guid: 4ff3091676a78724ca2ae5d60353d400, type: 3} propertyPath: m_LocalScale.x - value: 24.46808 + value: 12.357114 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 4ff3091676a78724ca2ae5d60353d400, type: 3} propertyPath: m_LocalScale.y - value: 3.2581105 + value: 2.604046 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 4ff3091676a78724ca2ae5d60353d400, type: 3} propertyPath: m_LocalScale.z - value: 24.46808 + value: 12.357114 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 4ff3091676a78724ca2ae5d60353d400, type: 3} propertyPath: m_LocalPosition.x @@ -1527,6 +1658,84 @@ Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 4ff3091676a78724ca2ae5d60353d400, type: 3} m_PrefabInstance: {fileID: 449932605634398781} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1241588351530013389 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1381325834594434730} + m_Modifications: + - target: {fileID: 688462554248565909, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + propertyPath: m_LocalScale.x + value: 0.5566465 + objectReference: {fileID: 0} + - target: {fileID: 688462554248565909, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + propertyPath: m_LocalScale.y + value: 1.691537 + objectReference: {fileID: 0} + - target: {fileID: 688462554248565909, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + propertyPath: m_LocalScale.z + value: 1.9077115 + objectReference: {fileID: 0} + - target: {fileID: 688462554248565909, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + propertyPath: m_LocalPosition.x + value: -0.046449997 + objectReference: {fileID: 0} + - target: {fileID: 688462554248565909, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + propertyPath: m_LocalPosition.y + value: 1.6624899 + objectReference: {fileID: 0} + - target: {fileID: 688462554248565909, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + propertyPath: m_LocalPosition.z + value: 19.344181 + objectReference: {fileID: 0} + - target: {fileID: 688462554248565909, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + propertyPath: m_LocalRotation.w + value: 0.93732494 + objectReference: {fileID: 0} + - target: {fileID: 688462554248565909, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + propertyPath: m_LocalRotation.x + value: -0.3484567 + objectReference: {fileID: 0} + - target: {fileID: 688462554248565909, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 688462554248565909, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 688462554248565909, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -40.786 + objectReference: {fileID: 0} + - target: {fileID: 688462554248565909, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 688462554248565909, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2541733693143394657, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + propertyPath: m_Name + value: Ray 1 + objectReference: {fileID: 0} + - target: {fileID: 3666808908055770611, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: 2f0a42f4b97d23e4599d257dabb0f97d, type: 2} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} +--- !u!4 &1780869142280226392 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 688462554248565909, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + m_PrefabInstance: {fileID: 1241588351530013389} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1990321800832301919 PrefabInstance: m_ObjectHideFlags: 0 @@ -1537,15 +1746,15 @@ PrefabInstance: m_Modifications: - target: {fileID: -8679921383154817045, guid: 4ff3091676a78724ca2ae5d60353d400, type: 3} propertyPath: m_LocalScale.x - value: 89.137085 + value: 45.0169 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 4ff3091676a78724ca2ae5d60353d400, type: 3} propertyPath: m_LocalScale.y - value: 3.2581105 + value: 2.604046 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 4ff3091676a78724ca2ae5d60353d400, type: 3} propertyPath: m_LocalScale.z - value: 89.137085 + value: 45.0169 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 4ff3091676a78724ca2ae5d60353d400, type: 3} propertyPath: m_LocalPosition.x @@ -1619,15 +1828,15 @@ PrefabInstance: m_Modifications: - target: {fileID: -8679921383154817045, guid: 4ff3091676a78724ca2ae5d60353d400, type: 3} propertyPath: m_LocalScale.x - value: 115.92279 + value: 58.544483 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 4ff3091676a78724ca2ae5d60353d400, type: 3} propertyPath: m_LocalScale.y - value: 15.995324 + value: 12.784271 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 4ff3091676a78724ca2ae5d60353d400, type: 3} propertyPath: m_LocalScale.z - value: 115.92279 + value: 58.544483 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 4ff3091676a78724ca2ae5d60353d400, type: 3} propertyPath: m_LocalPosition.x @@ -1701,15 +1910,15 @@ PrefabInstance: m_Modifications: - target: {fileID: -8679921383154817045, guid: 4ff3091676a78724ca2ae5d60353d400, type: 3} propertyPath: m_LocalScale.x - value: 31.805193 + value: 16.062576 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 4ff3091676a78724ca2ae5d60353d400, type: 3} propertyPath: m_LocalScale.y - value: 3.2581105 + value: 2.604046 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 4ff3091676a78724ca2ae5d60353d400, type: 3} propertyPath: m_LocalScale.z - value: 31.805193 + value: 16.062576 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 4ff3091676a78724ca2ae5d60353d400, type: 3} propertyPath: m_LocalPosition.x @@ -1783,15 +1992,15 @@ PrefabInstance: m_Modifications: - target: {fileID: -8679921383154817045, guid: 4ff3091676a78724ca2ae5d60353d400, type: 3} propertyPath: m_LocalScale.x - value: 69.047554 + value: 34.871086 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 4ff3091676a78724ca2ae5d60353d400, type: 3} propertyPath: m_LocalScale.y - value: 15.041685 + value: 12.022074 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 4ff3091676a78724ca2ae5d60353d400, type: 3} propertyPath: m_LocalScale.z - value: 69.047554 + value: 34.871086 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 4ff3091676a78724ca2ae5d60353d400, type: 3} propertyPath: m_LocalPosition.x @@ -1855,6 +2064,84 @@ Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 4ff3091676a78724ca2ae5d60353d400, type: 3} m_PrefabInstance: {fileID: 3161278443421299005} m_PrefabAsset: {fileID: 0} +--- !u!1001 &3375274880855489555 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1381325834594434730} + m_Modifications: + - target: {fileID: 688462554248565909, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + propertyPath: m_LocalScale.x + value: 0.5566466 + objectReference: {fileID: 0} + - target: {fileID: 688462554248565909, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + propertyPath: m_LocalScale.y + value: 1.6915368 + objectReference: {fileID: 0} + - target: {fileID: 688462554248565909, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + propertyPath: m_LocalScale.z + value: 1.9077115 + objectReference: {fileID: 0} + - target: {fileID: 688462554248565909, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + propertyPath: m_LocalPosition.x + value: 0.13055 + objectReference: {fileID: 0} + - target: {fileID: 688462554248565909, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + propertyPath: m_LocalPosition.y + value: 1.5764899 + objectReference: {fileID: 0} + - target: {fileID: 688462554248565909, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + propertyPath: m_LocalPosition.z + value: 19.33318 + objectReference: {fileID: 0} + - target: {fileID: 688462554248565909, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + propertyPath: m_LocalRotation.w + value: 0.80491567 + objectReference: {fileID: 0} + - target: {fileID: 688462554248565909, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + propertyPath: m_LocalRotation.x + value: -0.56803125 + objectReference: {fileID: 0} + - target: {fileID: 688462554248565909, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + propertyPath: m_LocalRotation.y + value: -0.15220204 + objectReference: {fileID: 0} + - target: {fileID: 688462554248565909, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + propertyPath: m_LocalRotation.z + value: -0.079283416 + objectReference: {fileID: 0} + - target: {fileID: 688462554248565909, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -69.813 + objectReference: {fileID: 0} + - target: {fileID: 688462554248565909, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -26.68 + objectReference: {fileID: 0} + - target: {fileID: 688462554248565909, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 7.539 + objectReference: {fileID: 0} + - target: {fileID: 2541733693143394657, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + propertyPath: m_Name + value: Ray 2 + objectReference: {fileID: 0} + - target: {fileID: 3666808908055770611, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: 2f0a42f4b97d23e4599d257dabb0f97d, type: 2} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} +--- !u!4 &2835732385966090374 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 688462554248565909, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + m_PrefabInstance: {fileID: 3375274880855489555} + m_PrefabAsset: {fileID: 0} --- !u!1001 &4199400061159544012 PrefabInstance: m_ObjectHideFlags: 0 @@ -1865,15 +2152,15 @@ PrefabInstance: m_Modifications: - target: {fileID: -8679921383154817045, guid: 4ff3091676a78724ca2ae5d60353d400, type: 3} propertyPath: m_LocalScale.x - value: 40.307537 + value: 20.356514 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 4ff3091676a78724ca2ae5d60353d400, type: 3} propertyPath: m_LocalScale.y - value: 4.3782487 + value: 3.4993174 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 4ff3091676a78724ca2ae5d60353d400, type: 3} propertyPath: m_LocalScale.z - value: 40.307537 + value: 20.356514 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 4ff3091676a78724ca2ae5d60353d400, type: 3} propertyPath: m_LocalPosition.x @@ -1947,15 +2234,15 @@ PrefabInstance: m_Modifications: - target: {fileID: -8679921383154817045, guid: 4ff3091676a78724ca2ae5d60353d400, type: 3} propertyPath: m_LocalScale.x - value: 159.98505 + value: 80.79724 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 4ff3091676a78724ca2ae5d60353d400, type: 3} propertyPath: m_LocalScale.y - value: 3.2581105 + value: 2.604046 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 4ff3091676a78724ca2ae5d60353d400, type: 3} propertyPath: m_LocalScale.z - value: 159.98505 + value: 80.79724 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 4ff3091676a78724ca2ae5d60353d400, type: 3} propertyPath: m_LocalPosition.x @@ -2019,6 +2306,84 @@ Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 4ff3091676a78724ca2ae5d60353d400, type: 3} m_PrefabInstance: {fileID: 5236161718308951774} m_PrefabAsset: {fileID: 0} +--- !u!1001 &5607735495772077365 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1381325834594434730} + m_Modifications: + - target: {fileID: 688462554248565909, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + propertyPath: m_LocalScale.x + value: 0.5566465 + objectReference: {fileID: 0} + - target: {fileID: 688462554248565909, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + propertyPath: m_LocalScale.y + value: 1.691537 + objectReference: {fileID: 0} + - target: {fileID: 688462554248565909, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + propertyPath: m_LocalScale.z + value: 1.9077116 + objectReference: {fileID: 0} + - target: {fileID: 688462554248565909, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + propertyPath: m_LocalPosition.x + value: -0.23945001 + objectReference: {fileID: 0} + - target: {fileID: 688462554248565909, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + propertyPath: m_LocalPosition.y + value: 1.6264901 + objectReference: {fileID: 0} + - target: {fileID: 688462554248565909, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + propertyPath: m_LocalPosition.z + value: 19.38618 + objectReference: {fileID: 0} + - target: {fileID: 688462554248565909, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + propertyPath: m_LocalRotation.w + value: 0.829742 + objectReference: {fileID: 0} + - target: {fileID: 688462554248565909, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + propertyPath: m_LocalRotation.x + value: -0.54430974 + objectReference: {fileID: 0} + - target: {fileID: 688462554248565909, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + propertyPath: m_LocalRotation.y + value: 0.014115494 + objectReference: {fileID: 0} + - target: {fileID: 688462554248565909, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + propertyPath: m_LocalRotation.z + value: 0.12270251 + objectReference: {fileID: 0} + - target: {fileID: 688462554248565909, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -65.058 + objectReference: {fileID: 0} + - target: {fileID: 688462554248565909, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -15.142 + objectReference: {fileID: 0} + - target: {fileID: 688462554248565909, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 26.515 + objectReference: {fileID: 0} + - target: {fileID: 2541733693143394657, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + propertyPath: m_Name + value: Ray 3 + objectReference: {fileID: 0} + - target: {fileID: 3666808908055770611, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: 2f0a42f4b97d23e4599d257dabb0f97d, type: 2} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} +--- !u!4 &4926732054180342176 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 688462554248565909, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + m_PrefabInstance: {fileID: 5607735495772077365} + m_PrefabAsset: {fileID: 0} --- !u!1001 &5718038900406380094 PrefabInstance: m_ObjectHideFlags: 0 @@ -2029,15 +2394,15 @@ PrefabInstance: m_Modifications: - target: {fileID: -8679921383154817045, guid: 4ff3091676a78724ca2ae5d60353d400, type: 3} propertyPath: m_LocalScale.x - value: 14.300449 + value: 7.2221556 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 4ff3091676a78724ca2ae5d60353d400, type: 3} propertyPath: m_LocalScale.y - value: 3.2581105 + value: 2.604046 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 4ff3091676a78724ca2ae5d60353d400, type: 3} propertyPath: m_LocalScale.z - value: 14.300449 + value: 7.2221556 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 4ff3091676a78724ca2ae5d60353d400, type: 3} propertyPath: m_LocalPosition.x @@ -2111,15 +2476,15 @@ PrefabInstance: m_Modifications: - target: {fileID: -8679921383154817045, guid: 4ff3091676a78724ca2ae5d60353d400, type: 3} propertyPath: m_LocalScale.x - value: 53.488106 + value: 27.013096 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 4ff3091676a78724ca2ae5d60353d400, type: 3} propertyPath: m_LocalScale.y - value: 3.2581105 + value: 2.604046 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 4ff3091676a78724ca2ae5d60353d400, type: 3} propertyPath: m_LocalScale.z - value: 53.488106 + value: 27.013096 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 4ff3091676a78724ca2ae5d60353d400, type: 3} propertyPath: m_LocalPosition.x @@ -2193,15 +2558,15 @@ PrefabInstance: m_Modifications: - target: {fileID: -8679921383154817045, guid: 4ff3091676a78724ca2ae5d60353d400, type: 3} propertyPath: m_LocalScale.x - value: 19.237616 + value: 9.715572 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 4ff3091676a78724ca2ae5d60353d400, type: 3} propertyPath: m_LocalScale.y - value: 3.2581105 + value: 2.604046 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 4ff3091676a78724ca2ae5d60353d400, type: 3} propertyPath: m_LocalScale.z - value: 19.237616 + value: 9.715572 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 4ff3091676a78724ca2ae5d60353d400, type: 3} propertyPath: m_LocalPosition.x diff --git a/Assets/_Content/Shaders/EnkiBillal/EnkiBiIlal.shadergraph b/Assets/_Content/Shaders/EnkiBillal/EnkiBiIlal.shadergraph index c7038077..649d09f2 100644 --- a/Assets/_Content/Shaders/EnkiBillal/EnkiBiIlal.shadergraph +++ b/Assets/_Content/Shaders/EnkiBillal/EnkiBiIlal.shadergraph @@ -6,6 +6,9 @@ { "m_Id": "4a3d921ea05040ff9f3d8fba2e31ed02" }, + { + "m_Id": "6dce6170558c4ec283a6faa5df5bb7c4" + }, { "m_Id": "c42430ce8cc346ac9bdcd190d22b3277" }, @@ -38,6 +41,15 @@ }, { "m_Id": "504868b162d04f6ba141dd58a4060093" + }, + { + "m_Id": "b464deebe5304824b318bea0d83b973c" + }, + { + "m_Id": "4d1b5e4632d84153a3a55ead37696b1d" + }, + { + "m_Id": "b14cd887a743477d97eb1aa4dad4a75e" } ], "m_Keywords": [], @@ -52,6 +64,9 @@ { "m_Id": "3f91bae60f5946f087f8ddbdf5974760" }, + { + "m_Id": "71a76904d2c7441096e1ea97290cea15" + }, { "m_Id": "8ec4a0fe2487442087508231220eb8ac" }, @@ -60,9 +75,6 @@ }, { "m_Id": "4ae9f85504784bd8a4c0b331d786d017" - }, - { - "m_Id": "71a76904d2c7441096e1ea97290cea15" } ], "m_Nodes": [ @@ -161,11 +173,37 @@ }, { "m_Id": "6325def0956d4eec8fb3627c06ad1067" + }, + { + "m_Id": "082cade6eba443e8b307d65b54e96710" + }, + { + "m_Id": "b4cc7a967ddd48c8ad768fac0576a4ff" + }, + { + "m_Id": "dad406257bfd4e44a5c564c97a01bad2" + }, + { + "m_Id": "a5f98beb05504403aa675c3a4fa83329" } ], "m_GroupDatas": [], "m_StickyNoteDatas": [], "m_Edges": [ + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "082cade6eba443e8b307d65b54e96710" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "c5d342277052409f87283f2c60ccf3a1" + }, + "m_SlotId": 14 + } + }, { "m_OutputSlot": { "m_Node": { @@ -390,6 +428,20 @@ "m_SlotId": 1 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "a5f98beb05504403aa675c3a4fa83329" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "c5d342277052409f87283f2c60ccf3a1" + }, + "m_SlotId": 17 + } + }, { "m_OutputSlot": { "m_Node": { @@ -432,6 +484,20 @@ "m_SlotId": 0 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "b4cc7a967ddd48c8ad768fac0576a4ff" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "c5d342277052409f87283f2c60ccf3a1" + }, + "m_SlotId": 15 + } + }, { "m_OutputSlot": { "m_Node": { @@ -446,6 +512,20 @@ "m_SlotId": 0 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "dad406257bfd4e44a5c564c97a01bad2" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "c5d342277052409f87283f2c60ccf3a1" + }, + "m_SlotId": 16 + } + }, { "m_OutputSlot": { "m_Node": { @@ -491,8 +571,8 @@ ], "m_VertexContext": { "m_Position": { - "x": 1350.0, - "y": 347.0 + "x": 1352.0, + "y": 319.9999694824219 }, "m_Blocks": [ { @@ -508,8 +588,8 @@ }, "m_FragmentContext": { "m_Position": { - "x": 1349.0001220703125, - "y": 550.0000610351563 + "x": 1351.0, + "y": 523.0 }, "m_Blocks": [ { @@ -674,6 +754,42 @@ "m_LiteralMode": false } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PropertyNode", + "m_ObjectId": "082cade6eba443e8b307d65b54e96710", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Property", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 573.0000610351563, + "y": 1058.0, + "width": 126.99993896484375, + "height": 34.0 + } + }, + "m_Slots": [ + { + "m_Id": "bcdefe9f3c384f14874b4361894b61f9" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Property": { + "m_Id": "b464deebe5304824b318bea0d83b973c" + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot", @@ -761,10 +877,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -324.0, - "y": 239.0, - "width": 121.0, - "height": 34.0 + "x": -64.99996948242188, + "y": 505.9999694824219, + "width": 120.99993896484375, + "height": 34.000030517578128 } }, "m_Slots": [ @@ -829,6 +945,22 @@ "m_Value": false } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "15f35ea706fd4ab9812030681d1d19f9", + "m_Id": 0, + "m_DisplayName": "FogMin", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [], + "m_LiteralMode": false +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.PropertyNode", @@ -841,8 +973,8 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -93.0, - "y": 324.0, + "x": 165.99996948242188, + "y": 590.9999389648438, "width": 105.0, "height": 34.0 } @@ -954,10 +1086,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": 845.0, - "y": 1202.0, - "width": 116.0, - "height": 34.0 + "x": 905.9999389648438, + "y": 1075.0, + "width": 116.00006103515625, + "height": 33.9998779296875 } }, "m_Slots": [ @@ -1042,6 +1174,22 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "24572091a33643979e1ed8fc6df142ed", + "m_Id": 16, + "m_DisplayName": "FogMin", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "FogMin", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [], + "m_LiteralMode": false +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Internal.Texture2DShaderProperty", @@ -1156,10 +1304,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": 1002.0, - "y": 1119.0, + "x": 1063.0, + "y": 991.9999389648438, "width": 185.0, - "height": 190.0 + "height": 189.99993896484376 } }, "m_Slots": [ @@ -1282,9 +1430,9 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": 462.9999694824219, - "y": 784.0, - "width": 205.99996948242188, + "x": 494.0, + "y": 750.0, + "width": 205.99993896484376, "height": 129.99993896484376 } }, @@ -1363,6 +1511,9 @@ "m_ChildObjectList": [ { "m_Id": "504868b162d04f6ba141dd58a4060093" + }, + { + "m_Id": "b464deebe5304824b318bea0d83b973c" } ] } @@ -1435,6 +1586,31 @@ "m_SerializedDescriptor": "SurfaceDescription.AlphaClipThreshold" } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot", + "m_ObjectId": "42afaf46eed64dba982d18a4dbd17411", + "m_Id": 0, + "m_DisplayName": "FogColor", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_Labels": [] +} + { "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.Matrix4ShaderProperty", @@ -1514,6 +1690,41 @@ "m_BareResource": false } +{ + "m_SGVersion": 3, + "m_Type": "UnityEditor.ShaderGraph.Internal.ColorShaderProperty", + "m_ObjectId": "4d1b5e4632d84153a3a55ead37696b1d", + "m_Guid": { + "m_GuidSerialized": "ef39db6a-dee4-438c-abd8-d0baf8415859" + }, + "promotedFromAssetID": "", + "promotedFromCategoryName": "", + "promotedOrdering": -1, + "m_Name": "FogColor", + "m_DefaultRefNameVersion": 1, + "m_RefNameGeneratedByDisplayName": "FogColor", + "m_DefaultReferenceName": "_FogColor", + "m_OverrideReferenceName": "", + "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, + "m_Precision": 0, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, + "m_Hidden": false, + "m_PerRendererData": false, + "m_customAttributes": [], + "m_Value": { + "r": 0.9921569228172302, + "g": 0.6392157077789307, + "b": 0.4117647409439087, + "a": 0.3529411852359772 + }, + "isMainColor": false, + "m_ColorMode": 1 +} + { "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", @@ -1760,9 +1971,9 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": 554.0, - "y": 1061.0, - "width": 104.99993896484375, + "x": 595.0, + "y": 1024.0, + "width": 105.0, "height": 34.0 } }, @@ -1989,10 +2200,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": 545.0, - "y": 518.0, - "width": 113.99993896484375, - "height": 33.99993896484375 + "x": 544.9999389648438, + "y": 568.0, + "width": 114.00006103515625, + "height": 34.0 } }, "m_Slots": [ @@ -2041,9 +2252,9 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": 201.0, - "y": 90.0, - "width": 159.0, + "x": 459.99993896484377, + "y": 356.9999694824219, + "width": 138.99993896484376, "height": 34.0 } }, @@ -2090,6 +2301,66 @@ "m_Labels": [] } +{ + "m_SGVersion": 1, + "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", + "m_ObjectId": "6dce6170558c4ec283a6faa5df5bb7c4", + "m_Guid": { + "m_GuidSerialized": "4bde706d-5eb0-4321-bfcb-e6dc1c392a8a" + }, + "promotedFromAssetID": "", + "promotedFromCategoryName": "", + "promotedOrdering": -1, + "m_Name": "FogMax", + "m_DefaultRefNameVersion": 1, + "m_RefNameGeneratedByDisplayName": "FogMax", + "m_DefaultReferenceName": "_FogMax", + "m_OverrideReferenceName": "", + "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, + "m_Precision": 0, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, + "m_Hidden": false, + "m_PerRendererData": false, + "m_customAttributes": [], + "m_Value": 15.0, + "m_FloatType": 0, + "m_LiteralFloatMode": false, + "m_RangeValues": { + "x": 0.0, + "y": 1.0 + }, + "m_SliderType": 0, + "m_SliderPower": 3.0, + "m_EnumType": 0, + "m_CSharpEnumString": "", + "m_EnumNames": [ + "Default" + ], + "m_EnumValues": [ + 0 + ] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "711dda1d467543f58478767c6bd203d9", + "m_Id": 0, + "m_DisplayName": "FogMax", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [], + "m_LiteralMode": false +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.VertexColorNode", @@ -2102,10 +2373,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": 72.00001525878906, - "y": 90.0000228881836, - "width": 117.0, - "height": 93.99999237060547 + "x": 330.9999694824219, + "y": 356.9999694824219, + "width": 117.00006103515625, + "height": 94.0 } }, "m_Slots": [ @@ -2128,7 +2399,17 @@ "m_Type": "UnityEditor.ShaderGraph.CategoryData", "m_ObjectId": "71a76904d2c7441096e1ea97290cea15", "m_Name": "Fog", - "m_ChildObjectList": [] + "m_ChildObjectList": [ + { + "m_Id": "4d1b5e4632d84153a3a55ead37696b1d" + }, + { + "m_Id": "b14cd887a743477d97eb1aa4dad4a75e" + }, + { + "m_Id": "6dce6170558c4ec283a6faa5df5bb7c4" + } + ] } { @@ -2145,6 +2426,22 @@ "m_DefaultValue": false } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "73aee6571bd544d291ec8f0ebd85114d", + "m_Id": 17, + "m_DisplayName": "FogMax", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "FogMax", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [], + "m_LiteralMode": false +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.PropertyNode", @@ -2157,8 +2454,8 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": 845.0, - "y": 1236.0, + "x": 905.9999389648438, + "y": 1108.9998779296875, "width": 115.0, "height": 34.0 } @@ -2308,10 +2605,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": 844.0, - "y": 1270.0, + "x": 904.9999389648438, + "y": 1142.9998779296875, "width": 116.0, - "height": 34.0 + "height": 34.0001220703125 } }, "m_Slots": [ @@ -2504,10 +2801,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": 56.00000762939453, - "y": 206.00001525878907, + "x": 314.9999694824219, + "y": 473.0, "width": 130.0, - "height": 118.00001525878906 + "height": 117.99993896484375 } }, "m_Slots": [ @@ -2827,10 +3124,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": 514.0, - "y": 655.9999389648438, - "width": 144.99993896484376, - "height": 128.00006103515626 + "x": 544.9999389648438, + "y": 622.0, + "width": 145.00006103515626, + "height": 128.0 } }, "m_Slots": [ @@ -2891,6 +3188,22 @@ "m_BareResource": false } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "a34a1ccc27e94fc8890ea8c79a176430", + "m_Id": 14, + "m_DisplayName": "DetailSize", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "DetailSize", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [], + "m_LiteralMode": false +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.PropertyNode", @@ -2903,9 +3216,9 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": 677.0000610351563, - "y": 148.0, - "width": 121.0, + "x": 752.0, + "y": 309.0, + "width": 120.99993896484375, "height": 34.0 } }, @@ -2952,6 +3265,42 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PropertyNode", + "m_ObjectId": "a5f98beb05504403aa675c3a4fa83329", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Property", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 583.0, + "y": 1160.0, + "width": 117.0, + "height": 34.0 + } + }, + "m_Slots": [ + { + "m_Id": "711dda1d467543f58478767c6bd203d9" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Property": { + "m_Id": "6dce6170558c4ec283a6faa5df5bb7c4" + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", @@ -2989,10 +3338,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": 841.0, - "y": 1168.0, - "width": 114.0, - "height": 34.0 + "x": 901.9999389648438, + "y": 1040.9998779296875, + "width": 114.00006103515625, + "height": 34.0001220703125 } }, "m_Slots": [ @@ -3043,10 +3392,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": 230.00003051757813, - "y": 138.00003051757813, - "width": 130.0, - "height": 118.0 + "x": 488.9999084472656, + "y": 404.9999694824219, + "width": 130.00009155273438, + "height": 117.99996948242188 } }, "m_Slots": [ @@ -3086,10 +3435,10 @@ "m_Expanded": false, "m_Position": { "serializedVersion": "2", - "x": 826.0000610351563, - "y": 108.0, + "x": 900.9999389648438, + "y": 269.0, "width": 179.00006103515626, - "height": 153.0 + "height": 152.99993896484376 } }, "m_Slots": [ @@ -3144,6 +3493,155 @@ "m_BlendModePreserveSpecular": true } +{ + "m_SGVersion": 1, + "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", + "m_ObjectId": "b14cd887a743477d97eb1aa4dad4a75e", + "m_Guid": { + "m_GuidSerialized": "912dab6e-38db-4d14-af6d-c6b6531d51d1" + }, + "promotedFromAssetID": "", + "promotedFromCategoryName": "", + "promotedOrdering": -1, + "m_Name": "FogMin", + "m_DefaultRefNameVersion": 1, + "m_RefNameGeneratedByDisplayName": "FogMin", + "m_DefaultReferenceName": "_FogMin", + "m_OverrideReferenceName": "", + "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, + "m_Precision": 0, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, + "m_Hidden": false, + "m_PerRendererData": false, + "m_customAttributes": [], + "m_Value": 0.0, + "m_FloatType": 0, + "m_LiteralFloatMode": false, + "m_RangeValues": { + "x": 0.0, + "y": 1.0 + }, + "m_SliderType": 0, + "m_SliderPower": 3.0, + "m_EnumType": 0, + "m_CSharpEnumString": "", + "m_EnumNames": [ + "Default" + ], + "m_EnumValues": [ + 0 + ] +} + +{ + "m_SGVersion": 1, + "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", + "m_ObjectId": "b464deebe5304824b318bea0d83b973c", + "m_Guid": { + "m_GuidSerialized": "d495c892-b611-484c-94d9-fb565c6db11e" + }, + "promotedFromAssetID": "", + "promotedFromCategoryName": "", + "promotedOrdering": -1, + "m_Name": "DetailSize", + "m_DefaultRefNameVersion": 1, + "m_RefNameGeneratedByDisplayName": "DetailSize", + "m_DefaultReferenceName": "_DetailSize", + "m_OverrideReferenceName": "", + "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, + "m_Precision": 0, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, + "m_Hidden": false, + "m_PerRendererData": false, + "m_customAttributes": [], + "m_Value": 1.0, + "m_FloatType": 0, + "m_LiteralFloatMode": false, + "m_RangeValues": { + "x": 0.0, + "y": 1.0 + }, + "m_SliderType": 0, + "m_SliderPower": 3.0, + "m_EnumType": 0, + "m_CSharpEnumString": "", + "m_EnumNames": [ + "Default" + ], + "m_EnumValues": [ + 0 + ] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot", + "m_ObjectId": "b4699b259f0d4db78cc8b1ab43fc2abb", + "m_Id": 15, + "m_DisplayName": "FogColor", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "FogColor", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PropertyNode", + "m_ObjectId": "b4cc7a967ddd48c8ad768fac0576a4ff", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Property", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 575.0000610351563, + "y": 1092.0, + "width": 124.99993896484375, + "height": 34.0001220703125 + } + }, + "m_Slots": [ + { + "m_Id": "42afaf46eed64dba982d18a4dbd17411" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Property": { + "m_Id": "4d1b5e4632d84153a3a55ead37696b1d" + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot", @@ -3167,6 +3665,22 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "bcdefe9f3c384f14874b4361894b61f9", + "m_Id": 0, + "m_DisplayName": "DetailSize", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [], + "m_LiteralMode": false +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot", @@ -3308,10 +3822,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": 990.0, - "y": 547.0, - "width": 214.0, - "height": 334.0 + "x": 970.9999389648438, + "y": 523.0, + "width": 219.00006103515626, + "height": 421.99993896484377 } }, "m_Slots": [ @@ -3333,6 +3847,18 @@ { "m_Id": "5ac79464834a403381144578be491825" }, + { + "m_Id": "a34a1ccc27e94fc8890ea8c79a176430" + }, + { + "m_Id": "b4699b259f0d4db78cc8b1ab43fc2abb" + }, + { + "m_Id": "24572091a33643979e1ed8fc6df142ed" + }, + { + "m_Id": "73aee6571bd544d291ec8f0ebd85114d" + }, { "m_Id": "8ead54ba7a8d487ea3f55e930101215f" } @@ -3494,6 +4020,42 @@ "m_LiteralMode": false } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PropertyNode", + "m_ObjectId": "dad406257bfd4e44a5c564c97a01bad2", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Property", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 586.0, + "y": 1126.0001220703125, + "width": 114.0, + "height": 33.9998779296875 + } + }, + "m_Slots": [ + { + "m_Id": "15f35ea706fd4ab9812030681d1d19f9" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Property": { + "m_Id": "b14cd887a743477d97eb1aa4dad4a75e" + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -3522,10 +4084,10 @@ "m_Expanded": false, "m_Position": { "serializedVersion": "2", - "x": -167.0, - "y": 155.00001525878907, - "width": 179.00001525878907, - "height": 152.99998474121095 + "x": 91.99999237060547, + "y": 421.9999694824219, + "width": 178.99996948242188, + "height": 152.00003051757813 } }, "m_Slots": [ @@ -3737,10 +4299,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": 441.0000305175781, - "y": 159.00001525878907, - "width": 172.00003051757813, - "height": 142.00001525878907 + "x": 699.9998779296875, + "y": 425.9999694824219, + "width": 172.00006103515626, + "height": 141.99996948242188 } }, "m_Slots": [ @@ -3783,10 +4345,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": 462.9999694824219, - "y": 923.0, - "width": 205.99996948242188, - "height": 129.9998779296875 + "x": 494.0, + "y": 889.0, + "width": 205.99993896484376, + "height": 129.99993896484376 } }, "m_Slots": [ diff --git a/Assets/_Content/Shaders/EnkiBillal/Include/EnkiBiIlal.hlsl b/Assets/_Content/Shaders/EnkiBillal/Include/EnkiBiIlal.hlsl index fe07c3c9..75849ff6 100644 --- a/Assets/_Content/Shaders/EnkiBillal/Include/EnkiBiIlal.hlsl +++ b/Assets/_Content/Shaders/EnkiBillal/Include/EnkiBiIlal.hlsl @@ -33,7 +33,6 @@ float3 GetScale(float3 PivotWS) float GetShadow(float3 PositionWS) { float4 shadowCoord = TransformWorldToShadowCoord(PositionWS); - Light mainLight = GetMainLight(shadowCoord); float shadow = 1 - mainLight.shadowAttenuation; @@ -52,6 +51,31 @@ float GetShadow(float3 PositionWS) return saturate(shadow); } +void GetDetailLOD +( + float Depth, + float DetailSize, + float LODJitter, + out float DetailSizeA, + out float DetailSizeB, + out float LODBlend +) +{ + const float lodRatio = 4; + const float lodSize = DetailSize / lodRatio * 2; + + float dist = max(Depth, 1e-5); + float lod = log(dist) / log(lodRatio) + LODJitter; // log2(dist); + + float lodFloor = floor(lod); + float lodFrac = lod - lodFloor; + + LODBlend = lodFrac * lodFrac * (3 - 2 * lodFrac); + + DetailSizeA = lodSize * pow(lodRatio, lodFloor); + DetailSizeB = lodSize * pow(lodRatio, lodFloor + 1); +} + float4 SampleBombedTexture ( UnityTexture2D Tex, @@ -116,7 +140,7 @@ ProjectionData GetProjections ( float3 PositionOS, float3 NormalOS, - float Blend + float ProjectionBlend ) { ProjectionData data; @@ -134,7 +158,7 @@ ProjectionData GetProjections float3(0, 0, 1) }; - float sharpness = lerp(2, 32, saturate(Blend)); + float sharpness = lerp(2, 32, saturate(ProjectionBlend)); float maskSum = 0; @@ -171,6 +195,69 @@ ProjectionData GetProjections return data; } +float4 SampleProjectedDetailLOD +( + UnityTexture2D DetailTex, + float3 PositionOS, + float3 NormalOS, + float ProjectionBlend, + float DetailSize, + float Depth +) +{ + const float lodJitterStrength = .8; + const float lodJitterSize = 1.5; + + float4 detail = 0; + float totalMask = 0; + + ProjectionData projections = GetProjections + ( + PositionOS, + NormalOS, + ProjectionBlend + ); + + [unroll] + for (int i = 0; i < 7; i++) + { + float mask = projections.mask[i]; + + float lodJitter = (Hash1From2D(floor(projections.uv[i] * lodJitterSize) + i * 17.13) - .5) * lodJitterStrength; + + float detailSizeA; + float detailSizeB; + float lodBlend; + + GetDetailLOD + ( + Depth, + DetailSize, + lodJitter, + detailSizeA, + detailSizeB, + lodBlend + ); + + float4 detailA = SampleBombedTexture + ( + DetailTex, + projections.uv[i] / detailSizeA + ); + + float4 detailB = SampleBombedTexture + ( + DetailTex, + projections.uv[i] / detailSizeB + ); + + detail += lerp(detailA, detailB, lodBlend) * mask; + totalMask += mask; + } + + return detail / max(totalMask, 1e-5); +} + void EnkiBillal_float ( float4 Color, @@ -179,6 +266,10 @@ void EnkiBillal_float float3 PositionWS, float3 NormalWS, float ProjectionsBlend, + float DetailSize, + float4 FogColor, + float FogMin, + float FogMax, out float3 Output ) { @@ -201,38 +292,26 @@ void EnkiBillal_float // Detail - float4 detail = 0; - - ProjectionData projections = GetProjections + float4 detail = SampleProjectedDetailLOD ( + DetailTex, positionOS, normalOS, - ProjectionsBlend + ProjectionsBlend, + DetailSize, + depth + ); - - float totalMask = 0; - - [unroll] - for (int i = 0; i < 7; i++) - { - float mask = projections.mask[i]; - - detail += SampleBombedTexture - ( - DetailTex, - projections.uv[i] - ) * mask; - - totalMask += mask; - } - - detail /= max(totalMask, 1e-5); + + float detailMask = smoothstep(0, .8, detail.a); + + // Fog // Output Output = Color.rgb; - Output = lerp(Color.rgb, Color.rgb * detail.rgb, detail.a); - //Output *= shadowAtten; + Output = lerp(Output.rgb, detail.rgb, detailMask); + Output = lerp(Output.rgb, FogColor.rgb, smoothstep(FogMin, FogMax, depth) * FogColor.a); } #endif \ No newline at end of file diff --git a/Assets/_Content/Textures/EnkiBilal/TX_EnkiDetail.psd b/Assets/_Content/Textures/EnkiBilal/TX_EnkiDetail.psd index 44271194..2de265fb 100644 --- a/Assets/_Content/Textures/EnkiBilal/TX_EnkiDetail.psd +++ b/Assets/_Content/Textures/EnkiBilal/TX_EnkiDetail.psd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:01f400af093a5a396efbd8a46a0289aeb61992c060e676281e401c0955e78c93 -size 4532686 +oid sha256:8b88259d2c351fbb8d468d4bd9f9c176ea80f1d564f9d3dd9810809dc87fc128 +size 4563070 diff --git a/Assets/_Content/Textures/EnkiBilal/TX_EnkiDetail.psd.meta b/Assets/_Content/Textures/EnkiBilal/TX_EnkiDetail.psd.meta index e62f6d82..a1ba106a 100644 --- a/Assets/_Content/Textures/EnkiBilal/TX_EnkiDetail.psd.meta +++ b/Assets/_Content/Textures/EnkiBilal/TX_EnkiDetail.psd.meta @@ -106,6 +106,19 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: WebGL + maxTextureSize: 512 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Unheimlich_POC.slnx b/Unheimlich_POC.slnx index cd9695d4..a19c7e6a 100644 --- a/Unheimlich_POC.slnx +++ b/Unheimlich_POC.slnx @@ -1,11 +1,11 @@  - - + +