From 63d0524d3c324f47457d3edf00af35909dbf5b58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gerard=20Gasc=C3=B3n?= <52170489+GerardGascon@users.noreply.github.com> Date: Tue, 16 Apr 2024 16:29:10 +0200 Subject: [PATCH] feat: Wind shader --- Assets/Prefabs/GardenRose.prefab | 16 +- Assets/Scenes/SampleScene.unity | 4 +- Assets/Scripts/View/Dependencies.cs | 2 +- Assets/Scripts/View/Scene.meta | 8 + Assets/Scripts/View/Scene/GardenFlower.cs | 14 ++ .../Scripts/View/Scene/GardenFlower.cs.meta | 11 ++ Assets/Shaders.meta | 8 + Assets/Shaders/GrowingFlower.mat | 45 ++++++ Assets/Shaders/GrowingFlower.mat.meta | 8 + Assets/Shaders/SpriteWind.shader | 144 ++++++++++++++++++ Assets/Shaders/SpriteWind.shader.meta | 9 ++ Assets/Shaders/Wind.mat | 45 ++++++ Assets/Shaders/Wind.mat.meta | 8 + 13 files changed, 318 insertions(+), 4 deletions(-) create mode 100644 Assets/Scripts/View/Scene.meta create mode 100644 Assets/Scripts/View/Scene/GardenFlower.cs create mode 100644 Assets/Scripts/View/Scene/GardenFlower.cs.meta create mode 100644 Assets/Shaders.meta create mode 100644 Assets/Shaders/GrowingFlower.mat create mode 100644 Assets/Shaders/GrowingFlower.mat.meta create mode 100644 Assets/Shaders/SpriteWind.shader create mode 100644 Assets/Shaders/SpriteWind.shader.meta create mode 100644 Assets/Shaders/Wind.mat create mode 100644 Assets/Shaders/Wind.mat.meta diff --git a/Assets/Prefabs/GardenRose.prefab b/Assets/Prefabs/GardenRose.prefab index c4cbb94..4c4c8d8 100644 --- a/Assets/Prefabs/GardenRose.prefab +++ b/Assets/Prefabs/GardenRose.prefab @@ -10,6 +10,7 @@ GameObject: m_Component: - component: {fileID: 4956538614995491313} - component: {fileID: 8356824105892962927} + - component: {fileID: 3858647786356030127} m_Layer: 0 m_Name: GardenRose m_TagString: Untagged @@ -52,7 +53,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: d1dd69c198f85784eb5adbc3dafeddca, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -84,3 +85,16 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!114 &3858647786356030127 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2147392553565862127} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a664b406e50e2054bb5d9dd2415d208a, type: 3} + m_Name: + m_EditorClassIdentifier: + sprite: {fileID: 8356824105892962927} diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index 7d7e4da..ee9d7ae 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -858,7 +858,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -8.399948, y: -7.7999573} + m_AnchoredPosition: {x: -8.399963, y: -7.7999573} m_SizeDelta: {x: 51.5091, y: 51.5091} m_Pivot: {x: 1, y: 1} --- !u!114 &439702001 @@ -1424,7 +1424,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: 60856d36f46f20845bc1fe2fea718085, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 diff --git a/Assets/Scripts/View/Dependencies.cs b/Assets/Scripts/View/Dependencies.cs index eb24ae0..3d82d3d 100644 --- a/Assets/Scripts/View/Dependencies.cs +++ b/Assets/Scripts/View/Dependencies.cs @@ -11,7 +11,7 @@ namespace View { public CustomInput CustomInput { private set; get; } private void Awake() { - Model = new Model(20, 5); + Model = new Model(1, 5); IExpressionInput input = FindObjectOfType(); IExpressionInput visibility = FindObjectOfType(); diff --git a/Assets/Scripts/View/Scene.meta b/Assets/Scripts/View/Scene.meta new file mode 100644 index 0000000..f4a2875 --- /dev/null +++ b/Assets/Scripts/View/Scene.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c1366d1a4dc80074e845d880fc05603e +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/View/Scene/GardenFlower.cs b/Assets/Scripts/View/Scene/GardenFlower.cs new file mode 100644 index 0000000..5c2f7e1 --- /dev/null +++ b/Assets/Scripts/View/Scene/GardenFlower.cs @@ -0,0 +1,14 @@ +using System; +using UnityEngine; +using Random = UnityEngine.Random; + +namespace View.Scene { + public class GardenFlower : MonoBehaviour { + [SerializeField] private SpriteRenderer sprite; + private static readonly int WindOffset = Shader.PropertyToID("_WindOffset"); + + private void Awake() { + sprite.material.SetFloat(WindOffset, Random.Range(0f, 2f * Mathf.PI)); + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/View/Scene/GardenFlower.cs.meta b/Assets/Scripts/View/Scene/GardenFlower.cs.meta new file mode 100644 index 0000000..5258fde --- /dev/null +++ b/Assets/Scripts/View/Scene/GardenFlower.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: a664b406e50e2054bb5d9dd2415d208a +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Shaders.meta b/Assets/Shaders.meta new file mode 100644 index 0000000..78cc7e6 --- /dev/null +++ b/Assets/Shaders.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 40c53337dd8aac34cabdd5debb660d9e +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Shaders/GrowingFlower.mat b/Assets/Shaders/GrowingFlower.mat new file mode 100644 index 0000000..12f319f --- /dev/null +++ b/Assets/Shaders/GrowingFlower.mat @@ -0,0 +1,45 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: GrowingFlower + m_Shader: {fileID: 4800000, guid: 7fca9ecfb5f525a4bb98a750615272f0, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _AlphaTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - PixelSnap: 0 + - _EnableExternalAlpha: 0 + - _WindAmplitude: 0.2 + - _WindOffset: 0 + - _WindSpeed: 0.5 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Flip: {r: 1, g: 1, b: 1, a: 1} + - _RendererColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/Shaders/GrowingFlower.mat.meta b/Assets/Shaders/GrowingFlower.mat.meta new file mode 100644 index 0000000..6525912 --- /dev/null +++ b/Assets/Shaders/GrowingFlower.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 60856d36f46f20845bc1fe2fea718085 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Shaders/SpriteWind.shader b/Assets/Shaders/SpriteWind.shader new file mode 100644 index 0000000..e5c12e5 --- /dev/null +++ b/Assets/Shaders/SpriteWind.shader @@ -0,0 +1,144 @@ +// Unity built-in shader source. Copyright (c) 2016 Unity Technologies. MIT license (see license.txt) + +Shader "Sprites/Wind" +{ + Properties + { + [PerRendererData] _MainTex ("Sprite Texture", 2D) = "white" {} + _Color ("Tint", Color) = (1,1,1,1) + + _WindSpeed ("Wind Speed", Float) = 1 + _WindAmplitude ("Wind Speed", Float) = 1 + [PerRendererData] _WindOffset ("Wind Offset", Float) = 0 + + [MaterialToggle] PixelSnap ("Pixel snap", Float) = 0 + [HideInInspector] _RendererColor ("RendererColor", Color) = (1,1,1,1) + [HideInInspector] _Flip ("Flip", Vector) = (1,1,1,1) + [PerRendererData] _AlphaTex ("External Alpha", 2D) = "white" {} + [PerRendererData] _EnableExternalAlpha ("Enable External Alpha", Float) = 0 + } + + SubShader + { + Tags + { + "Queue"="Transparent" + "IgnoreProjector"="True" + "RenderType"="Transparent" + "PreviewType"="Plane" + "CanUseSpriteAtlas"="True" + } + + Cull Off + Lighting Off + ZWrite Off + Blend One OneMinusSrcAlpha + + Pass + { + CGPROGRAM + #pragma vertex SpriteVert + #pragma fragment SpriteFrag + #pragma target 2.0 + #pragma multi_compile_instancing + #pragma multi_compile_local _ PIXELSNAP_ON + #pragma multi_compile _ ETC1_EXTERNAL_ALPHA + + #include "UnityCG.cginc" + + #ifdef UNITY_INSTANCING_ENABLED + + UNITY_INSTANCING_BUFFER_START(PerDrawSprite) + // SpriteRenderer.Color while Non-Batched/Instanced. + UNITY_DEFINE_INSTANCED_PROP(fixed4, unity_SpriteRendererColorArray) + // this could be smaller but that's how bit each entry is regardless of type + UNITY_DEFINE_INSTANCED_PROP(fixed2, unity_SpriteFlipArray) + UNITY_INSTANCING_BUFFER_END(PerDrawSprite) + + #define _RendererColor UNITY_ACCESS_INSTANCED_PROP(PerDrawSprite, unity_SpriteRendererColorArray) + #define _Flip UNITY_ACCESS_INSTANCED_PROP(PerDrawSprite, unity_SpriteFlipArray) + + #endif // instancing + + CBUFFER_START(UnityPerDrawSprite) + #ifndef UNITY_INSTANCING_ENABLED + fixed4 _RendererColor; + fixed2 _Flip; + #endif + float _EnableExternalAlpha; + CBUFFER_END + + // Material Color. + fixed4 _Color; + + // Material Wind + float _WindSpeed; + float _WindAmplitude; + float _WindOffset; + + struct appdata_t + { + float4 vertex : POSITION; + float4 color : COLOR; + float2 texcoord : TEXCOORD0; + UNITY_VERTEX_INPUT_INSTANCE_ID + }; + + struct v2f + { + float4 vertex : SV_POSITION; + fixed4 color : COLOR; + float2 texcoord : TEXCOORD0; + UNITY_VERTEX_OUTPUT_STEREO + }; + + inline float4 UnityFlipSprite(in float3 pos, in fixed2 flip) + { + return float4(pos.xy * flip, pos.z, 1.0); + } + + v2f SpriteVert(appdata_t IN) + { + v2f OUT; + + UNITY_SETUP_INSTANCE_ID(IN); + UNITY_INITIALIZE_VERTEX_OUTPUT_STEREO(OUT); + + OUT.vertex = UnityFlipSprite(IN.vertex, _Flip); + OUT.vertex.x += sin(_Time.y * _WindSpeed + _WindOffset) * _WindAmplitude * IN.texcoord.y; + OUT.vertex = UnityObjectToClipPos(OUT.vertex); + OUT.texcoord = IN.texcoord; + OUT.color = IN.color * _Color * _RendererColor; + + #ifdef PIXELSNAP_ON + OUT.vertex = UnityPixelSnap (OUT.vertex); + #endif + + return OUT; + } + + sampler2D _MainTex; + sampler2D _AlphaTex; + + fixed4 SampleSpriteTexture(float2 uv) + { + fixed4 color = tex2D(_MainTex, uv); + + #if ETC1_EXTERNAL_ALPHA + fixed4 alpha = tex2D (_AlphaTex, uv); + color.a = lerp (color.a, alpha.r, _EnableExternalAlpha); + #endif + + return color; + } + + fixed4 SpriteFrag(v2f IN) : SV_Target + { + fixed4 c = SampleSpriteTexture(IN.texcoord) * IN.color; + c.rgb *= c.a; + return c; + } + ENDCG + } + } +} \ No newline at end of file diff --git a/Assets/Shaders/SpriteWind.shader.meta b/Assets/Shaders/SpriteWind.shader.meta new file mode 100644 index 0000000..ae3fe53 --- /dev/null +++ b/Assets/Shaders/SpriteWind.shader.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 7fca9ecfb5f525a4bb98a750615272f0 +ShaderImporter: + externalObjects: {} + defaultTextures: [] + nonModifiableTextures: [] + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Shaders/Wind.mat b/Assets/Shaders/Wind.mat new file mode 100644 index 0000000..be705ca --- /dev/null +++ b/Assets/Shaders/Wind.mat @@ -0,0 +1,45 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Wind + m_Shader: {fileID: 4800000, guid: 7fca9ecfb5f525a4bb98a750615272f0, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _AlphaTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - PixelSnap: 0 + - _EnableExternalAlpha: 0 + - _WindAmplitude: 0.5 + - _WindOffset: 0 + - _WindSpeed: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Flip: {r: 1, g: 1, b: 1, a: 1} + - _RendererColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/Shaders/Wind.mat.meta b/Assets/Shaders/Wind.mat.meta new file mode 100644 index 0000000..978b366 --- /dev/null +++ b/Assets/Shaders/Wind.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d1dd69c198f85784eb5adbc3dafeddca +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: