From fe4503a876fc0cadc92cabe3c0b9d95ba9063dae Mon Sep 17 00:00:00 2001 From: DeMuenu <96650288+DeMuenu@users.noreply.github.com> Date: Thu, 2 Oct 2025 16:30:48 +0200 Subject: [PATCH] Remove GhostWhiteShader and rename shaders for 2SP Deleted GhostWhiteShader and its meta file. Renamed LitParticles, BlendinShader, and Water shaders (and their meta files) to *_2SP variants, updating their internal shader names accordingly. This prepares the shader assets for the 2SP pipeline or naming convention. --- Shader/GhostWhiteShader.shader | 83 ------------------- Shader/GhostWhiteShader.shader.meta | 9 -- ...rticles.shader => LitParticles_2SP.shader} | 2 +- ...ader.meta => LitParticles_2SP.shader.meta} | 0 ...endinShader.shader => Standard_2SP.shader} | 2 +- ...r.shader.meta => Standard_2SP.shader.meta} | 0 Shader/{Water.shader => Water_2SP.shader} | 2 +- ...ater.shader.meta => Water_2SP.shader.meta} | 0 8 files changed, 3 insertions(+), 95 deletions(-) delete mode 100644 Shader/GhostWhiteShader.shader delete mode 100644 Shader/GhostWhiteShader.shader.meta rename Shader/{LitParticles.shader => LitParticles_2SP.shader} (99%) rename Shader/{LitParticles.shader.meta => LitParticles_2SP.shader.meta} (100%) rename Shader/{BlendinShader.shader => Standard_2SP.shader} (99%) rename Shader/{BlendinShader.shader.meta => Standard_2SP.shader.meta} (100%) rename Shader/{Water.shader => Water_2SP.shader} (99%) rename Shader/{Water.shader.meta => Water_2SP.shader.meta} (100%) diff --git a/Shader/GhostWhiteShader.shader b/Shader/GhostWhiteShader.shader deleted file mode 100644 index a9b005d..0000000 --- a/Shader/GhostWhiteShader.shader +++ /dev/null @@ -1,83 +0,0 @@ -Shader "DeMuenu/World/Hoppou/GhostWhite" -{ - Properties - { - _MainTex ("Texture", 2D) = "white" {} - _Color ("Color", Color) = (1,1,1,1) - _EmmissiveColor ("Emmissive Color", Color) = (1,1,1,1) - _EmmissiveStrength ("Emmissive Strength", Range(0,10)) = 0 - - _BaseColor ("Base Color", Color) = (0.06,0.08,0.1,1) - _FresnelColor ("Fresnel Color", Color) = (0.3,0.7,1,1) - _Power ("Fresnel Power", Range(0.1, 8)) = 3 - _Intensity ("Fresnel Intensity", Range(0, 4)) = 1 - } - SubShader - { - Tags { "RenderType"="Opaque" } - LOD 100 - - Pass - { - CGPROGRAM - #pragma vertex vert - #pragma fragment frag - // make fog work - #pragma multi_compile_fog - - #include "UnityCG.cginc" - - struct appdata - { - float4 vertex : POSITION; - float3 normal : NORMAL; - float2 uv : TEXCOORD0; - }; - - struct v2f - { - float2 uv : TEXCOORD0; - float4 vertex : SV_POSITION; - float3 worldNormal : TEXCOORD2; - float3 worldViewDir : TEXCOORD1; - }; - - sampler2D _MainTex; - float4 _MainTex_ST; - fixed4 _Color; - fixed4 _EmmissiveColor; - float _EmmissiveStrength; - fixed4 _BaseColor, _FresnelColor; - float _Power, _Intensity; - - v2f vert (appdata v) - { - v2f o; - o.vertex = UnityObjectToClipPos(v.vertex); - o.uv = TRANSFORM_TEX(v.uv, _MainTex); - o.worldNormal = UnityObjectToWorldNormal(v.normal); - float3 worldPos = mul(unity_ObjectToWorld, v.vertex).xyz; - o.worldViewDir = _WorldSpaceCameraPos - worldPos; - return o; - } - - fixed4 frag (v2f i) : SV_Target - { - float3 N = normalize(i.worldNormal); - float3 V = normalize(i.worldViewDir); - // Schlick-style rim: (1 - N·V)^power - float fresnel = pow(1.0 - saturate(dot(N, V)), _Power); - - // sample the texture - fixed4 col = tex2D(_MainTex, i.uv) * _Color ; - - - col = float4(col.rgb + _FresnelColor.rgb * (fresnel * _Intensity), 1); - - // apply fog - return col + (_EmmissiveColor * _EmmissiveStrength); - } - ENDCG - } - } -} diff --git a/Shader/GhostWhiteShader.shader.meta b/Shader/GhostWhiteShader.shader.meta deleted file mode 100644 index cf68595..0000000 --- a/Shader/GhostWhiteShader.shader.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: 0914d1e38b9fb9748b943666168cb363 -ShaderImporter: - externalObjects: {} - defaultTextures: [] - nonModifiableTextures: [] - userData: - assetBundleName: - assetBundleVariant: diff --git a/Shader/LitParticles.shader b/Shader/LitParticles_2SP.shader similarity index 99% rename from Shader/LitParticles.shader rename to Shader/LitParticles_2SP.shader index 893a091..9bd04e7 100644 --- a/Shader/LitParticles.shader +++ b/Shader/LitParticles_2SP.shader @@ -1,4 +1,4 @@ -Shader "DeMuenu/World/Hoppou/Particles/LitParticles" +Shader "DeMuenu/World/Hoppou/Particles/LitParticles_2SP" { Properties { diff --git a/Shader/LitParticles.shader.meta b/Shader/LitParticles_2SP.shader.meta similarity index 100% rename from Shader/LitParticles.shader.meta rename to Shader/LitParticles_2SP.shader.meta diff --git a/Shader/BlendinShader.shader b/Shader/Standard_2SP.shader similarity index 99% rename from Shader/BlendinShader.shader rename to Shader/Standard_2SP.shader index 83c70a6..6355548 100644 --- a/Shader/BlendinShader.shader +++ b/Shader/Standard_2SP.shader @@ -1,4 +1,4 @@ -Shader "DeMuenu/World/Hoppou/RevealStandart" +Shader "DeMuenu/World/Hoppou/Standard_2SP" { Properties { diff --git a/Shader/BlendinShader.shader.meta b/Shader/Standard_2SP.shader.meta similarity index 100% rename from Shader/BlendinShader.shader.meta rename to Shader/Standard_2SP.shader.meta diff --git a/Shader/Water.shader b/Shader/Water_2SP.shader similarity index 99% rename from Shader/Water.shader rename to Shader/Water_2SP.shader index 6157359..7b70d35 100644 --- a/Shader/Water.shader +++ b/Shader/Water_2SP.shader @@ -1,4 +1,4 @@ -Shader "DeMuenu/World/Hoppou/Water" +Shader "DeMuenu/World/Hoppou/WaterFlat_2SP" { Properties { diff --git a/Shader/Water.shader.meta b/Shader/Water_2SP.shader.meta similarity index 100% rename from Shader/Water.shader.meta rename to Shader/Water_2SP.shader.meta