add : deployed uvs for theater & fix sam fog

2026-06-15 19:47:26 +02:00
parent e41716af4c
commit 6cff4595e1
27 changed files with 1096 additions and 214 deletions
@@ -52,6 +52,7 @@ Material:
    m_Ints: []
    m_Floats:
    - _DepthAtten: 1
+    - _FogStartTime: 0
    - _GrainAmount: 0.05
    - _IntersectionAtten: 10
    - _MaskID: 0
@@ -59,9 +60,9 @@ Material:
    - _QueueControl: 0
    - _QueueOffset: 0
    - _SpikeAmount: 2
-    - _SpikeScale: 3
-    - _SpikeSpeed: -2
-    - _SpikeTilt: 50
+    - _SpikeScale: 2
+    - _SpikeSpeed: 0.5
+    - _SpikeTilt: 30
    m_Colors:
    - _ColorA: {r: 0.8301887, g: 0.105731584, b: 0.105731584, a: 1}
    - _ColorB: {r: 0, g: 0, b: 0, a: 1}
@@ -0,0 +1,46 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &-5376756454538289968
+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: Unity.RenderPipelines.Universal.Editor::UnityEditor.Rendering.Universal.AssetVersion
+  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_Fog_Scarecrow Variant
+  m_Shader: {fileID: -6465566751694194690, guid: 0f1522c6af8cc4d47a4bbc5401f58523, type: 3}
+  m_Parent: {fileID: 2100000, guid: 117e9e9e3329f314aaaf2742287b0591, type: 2}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses:
+  - MOTIONVECTORS
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs: []
+    m_Ints: []
+    m_Floats: []
+    m_Colors:
+    - _ColorA: {r: 0.8301887, g: 0.4738341, b: 0.7347755, a: 0.43137255}
+    - _ColorB: {r: 0.3679245, g: 0.15792987, b: 0.30295476, a: 0.50980395}
+  m_BuildTextureStacks: []
+  m_AllowLocking: 1
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 72c764e7fc07bd64dbc879f342f4ed5e
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
@@ -20,6 +20,7 @@ void Fog_float
    float SpikeSpeed,
    float PaintSteps,
    float GrainAmount,
+    float FogStartTime,
    out float3 Output,
    out float Alpha
 )
@@ -28,7 +29,9 @@ void Fog_float
    float depth = distance(camPos, PositionWS);
    float depthAtten = lerp(1, smoothstep(5, 30, depth), DepthAtten);

-    float t = _Time.y * .7;
+    
+
+    float t = (_Time.y - FogStartTime) * .7;
    float s = lerp(Scale.x, 1, .3);

    // Base sampling position, scrolling over time
@@ -50,6 +50,9 @@
        },
        {
            "m_Id": "30b6d5822ed140f286d044aad95b4692"
+        },
+        {
+            "m_Id": "0a505f19b2154fa18a76ff4be11b54c2"
        }
    ],
    "m_Keywords": [],
@@ -179,6 +182,9 @@
        },
        {
            "m_Id": "49b42d33148e41cd9956d11fe5a3e6c8"
+        },
+        {
+            "m_Id": "a4c6c063d67e41c7849bcba609c723b3"
        }
    ],
    "m_GroupDatas": [],
@@ -520,6 +526,20 @@
                "m_SlotId": 0
            }
        },
+        {
+            "m_OutputSlot": {
+                "m_Node": {
+                    "m_Id": "a4c6c063d67e41c7849bcba609c723b3"
+                },
+                "m_SlotId": 0
+            },
+            "m_InputSlot": {
+                "m_Node": {
+                    "m_Id": "cd9b6500316e4beabbb4e8a42c14ce9d"
+                },
+                "m_SlotId": 17
+            }
+        },
        {
            "m_OutputSlot": {
                "m_Node": {
@@ -705,8 +725,8 @@
    ],
    "m_VertexContext": {
        "m_Position": {
-            "x": 0.0,
-            "y": 0.0
+            "x": 0.00002562999725341797,
+            "y": -30.99998664855957
        },
        "m_Blocks": [
            {
@@ -1012,6 +1032,50 @@
    }
 }

+{
+    "m_SGVersion": 1,
+    "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty",
+    "m_ObjectId": "0a505f19b2154fa18a76ff4be11b54c2",
+    "m_Guid": {
+        "m_GuidSerialized": "aeb17752-ea5d-4749-a30f-a0597886b68f"
+    },
+    "promotedFromAssetID": "",
+    "promotedFromCategoryName": "",
+    "promotedOrdering": -1,
+    "m_Name": "FogStartTime",
+    "m_DefaultRefNameVersion": 1,
+    "m_RefNameGeneratedByDisplayName": "FogStartTime",
+    "m_DefaultReferenceName": "_FogStartTime",
+    "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": 0,
    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
@@ -2206,6 +2270,22 @@
    }
 }

+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "4d6cc0e11c05499bb28392f1175b2b3f",
+    "m_Id": 17,
+    "m_DisplayName": "FogStartTime",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_ShaderOutputName": "FogStartTime",
+    "m_StageCapability": 3,
+    "m_Value": 0.0,
+    "m_DefaultValue": 0.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
 {
    "m_SGVersion": 0,
    "m_Type": "UnityEditor.ShaderGraph.PropertyNode",
@@ -3336,6 +3416,9 @@
        },
        {
            "m_Id": "d45fe3dfb3ac4a6791b106ac03552c74"
+        },
+        {
+            "m_Id": "0a505f19b2154fa18a76ff4be11b54c2"
        }
    ]
 }
@@ -3473,6 +3556,22 @@
    "m_SerializedDescriptor": "VertexDescription.Tangent"
 }

+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "8e4f5e366d4c4221bd9dff96ec672dd6",
+    "m_Id": 0,
+    "m_DisplayName": "FogStartTime",
+    "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": 2,
    "m_Type": "UnityEditor.ShaderGraph.TransformNode",
@@ -3832,6 +3931,42 @@
    "m_DepthSamplingMode": 2
 }

+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.PropertyNode",
+    "m_ObjectId": "a4c6c063d67e41c7849bcba609c723b3",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "Property",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": -663.7021484375,
+            "y": 973.1943969726563,
+            "width": 0.0,
+            "height": 0.0
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "8e4f5e366d4c4221bd9dff96ec672dd6"
+        }
+    ],
+    "synonyms": [],
+    "m_Precision": 0,
+    "m_PreviewExpanded": true,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    },
+    "m_Property": {
+        "m_Id": "0a505f19b2154fa18a76ff4be11b54c2"
+    }
+}
+
 {
    "m_SGVersion": 0,
    "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot",
@@ -4823,6 +4958,9 @@
        {
            "m_Id": "6e1e2ffcb5794bbaa6262156e175e539"
        },
+        {
+            "m_Id": "4d6cc0e11c05499bb28392f1175b2b3f"
+        },
        {
            "m_Id": "5ba5e0c48f2945efbada98663c457b7b"
        },