Implement Lit( On the way).

Assets/Nova/Editor/Core/Scripts/ParticlesUberLitGUI.cs

@@ -250,6 +250,8 @@ protected override void MaterialChanged(Material material)
         {
             ParticlesUberUnlitMaterialPostProcessor.SetupMaterialKeywords(material);
             ParticlesUberUnlitMaterialPostProcessor.SetupMaterialBlendMode(material);
+            // todo テスト
+            material.EnableKeyword("_MAIN_LIGHT_CALCULATE_SHADOWS");
         }
 
         #region Foldout Properties

Assets/Nova/Runtime/Core/Shaders/ParticlesUber.hlsl → Assets/Nova/Editor/Core/Scripts/Shaders/ParticlesUber.hlsl

@@ -279,11 +279,11 @@ SamplerState GetEmissionMapSamplerState()
 
 // Sample the normal map.
 #ifdef _BASE_MAP_MODE_2D
-#define SAMPLE_NORMAL_MAP(uv, progress) SAMPLE_TEXTURE2D(_NormalMap, GetNormalMapSamplerState(), uv);
+#define SAMPLE_NORMAL_MAP(uv, progress) UnpackNormal(SAMPLE_TEXTURE2D(_NormalMap, GetNormalMapSamplerState(), uv));
 #elif _BASE_MAP_MODE_2D_ARRAY
-#define SAMPLE_NORMAL_MAP(uv, progress) SAMPLE_TEXTURE2D_ARRAY(_NormalMap2DArray, GetNormalMapSamplerState(), uv, progress);
+#define SAMPLE_NORMAL_MAP(uv, progress) UnpackNormal(SAMPLE_TEXTURE2D_ARRAY(_NormalMap2DArray, GetNormalMapSamplerState(), uv, progress));
 #elif _BASE_MAP_MODE_3D
-#define SAMPLE_NORMAL_MAP(uv, progress) SAMPLE_TEXTURE3D_LOD(_NormalMap3D, GetNormalMapSamplerState(), float3(uv, progress), 0);
+#define SAMPLE_NORMAL_MAP(uv, progress) UnpackNormal(SAMPLE_TEXTURE3D_LOD(_NormalMap3D, GetNormalMapSamplerState(), float3(uv, progress), 0));
 #endif
 
 // Sample the metallic map.

Assets/Nova/Runtime/Core/Shaders/ParticlesUberLit.hlsl → Assets/Nova/Editor/Core/Scripts/Shaders/ParticlesUberLit.hlsl

@@ -7,23 +7,33 @@
 struct AttributesLit
 {
     Attributes attributesUnlit;
+    #ifdef _NORMALMAP
     float4 tangentOS : TANGENT;
+    #endif
 };
 
 // Output data from the vertex shader.
 struct VaryingsLit
 {
     Varyings varyingsUnlit;
-    float3 positionWS : COLOR1;
-    float3 tangentWS : TANGENT;
+    float4 positionWS : COLOR1;
+    #ifdef _NORMALMAP
+    float4 tangentWS : TANGENT;
     float3 binormalWS : BINORMAL;
+    #endif
+    #if defined(REQUIRES_VERTEX_SHADOW_COORD_INTERPOLATOR)
+    float4 shadowCoord : COLOR2;
+    #endif
+    float3 vertexSH    : COLOR3; // SH
 
 };
 inline void InitializeFragmentInputLit(in out VaryingsLit input)
 {
     InitializeFragmentInput(input.varyingsUnlit);
+    #ifdef _NORMALMAP
     input.binormalWS = normalize(input.binormalWS);
     input.tangentWS = normalize(input.tangentWS);
+    #endif
 }
 
 

Assets/Nova/Runtime/Core/Shaders/ParticlesUberLit.shader → Assets/Nova/Editor/Core/Scripts/Shaders/ParticlesUberLit.shader

@@ -177,7 +177,7 @@ Shader "Nova/Particles/UberLit"
             #pragma shader_feature_local_fragment _VERTEX_ALPHA_AS_TRANSITION_PROGRESS
             #pragma shader_feature_local_fragment _ALPHAMODULATE_ENABLED
             #pragma shader_feature_local_fragment _ALPHATEST_ENABLED
-
+            
             // Base Map
             #pragma shader_feature_local _BASE_MAP_MODE_2D _BASE_MAP_MODE_2D_ARRAY _BASE_MAP_MODE_3D
             #pragma shader_feature_local_vertex _BASE_MAP_ROTATION_ENABLED
@@ -243,12 +243,14 @@ Shader "Nova/Particles/UberLit"
             #pragma shader_feature_local_fragment _VERTEX_ALPHA_AS_TRANSITION_PROGRESS
             #pragma shader_feature_local_fragment _ALPHAMODULATE_ENABLED
             #pragma shader_feature_local_fragment _ALPHATEST_ENABLED
-
+            #pragma shader_feature_local _MAIN_LIGHT_CALCULATE_SHADOWS
+
             // Base Map
             #pragma shader_feature_local _BASE_MAP_MODE_2D _BASE_MAP_MODE_2D_ARRAY _BASE_MAP_MODE_3D
             #pragma shader_feature_local_vertex _BASE_MAP_ROTATION_ENABLED
             #pragma shader_feature_local_fragment _ _BASE_SAMPLER_STATE_POINT_MIRROR _BASE_SAMPLER_STATE_LINEAR_MIRROR _BASE_SAMPLER_STATE_TRILINEAR_MIRROR
 
+
             // Tint Color
             #pragma shader_feature_local _ _TINT_AREA_ALL _TINT_AREA_RIM
             #pragma shader_feature_local _ _TINT_COLOR_ENABLED _TINT_MAP_ENABLED _TINT_MAP_3D_ENABLED

Assets/Nova/Editor/Core/Scripts/Shaders/ParticlesUberLitForward.hlsl

@@ -0,0 +1,123 @@
+#ifndef NOVA_PARTICLESUBERLITFORWARD_INCLUDED
+#define NOVA_PARTICLESUBERLITFORWARD_INCLUDED
+
+#define FRAGMENT_USE_NORMAL_WS
+#define FRAGMENT_USE_VIEW_DIR_WS
+// todo If _SPECULARHIGHLIGHTS_OFF is defined, specular highlight is disabled.
+#define _SPECULARHIGHLIGHTS_OFF
+// todo If _ENVIRONMENTREFLECTIONS_OFF is defined, environment reflections are desabled。
+#define _ENVIRONMENTREFLECTIONS_OFF
+// todo If _NORMALMAP is defind, normal map is used.
+#define _NORMALMAP
+// todo If REQUIRES_VERTEX_SHADOW_COORD_INTERPOLATOR is defined, uv coords of shadow map is calculated in vertex shader.
+#define REQUIRES_VERTEX_SHADOW_COORD_INTERPOLATOR
+// todo If MAIN_LIGHT_CALCULATE_SHADOWS is defined, shadow are cast on the objects.
+#ifdef _MAIN_LIGHT_CALCULATE_SHADOWS
+#define MAIN_LIGHT_CALCULATE_SHADOWS
+#endif
+
+#include "ParticlesUberUnlitForward.hlsl"
+#include "Packages/com.unity.render-pipelines.universal/ShaderLibrary/Core.hlsl"
+#include "Packages/com.unity.render-pipelines.universal/ShaderLibrary/Lighting.hlsl"
+#include "ParticlesUberLit.hlsl"
+
+VaryingsLit vertLit(AttributesLit input)
+{
+    VaryingsLit output = (VaryingsLit)0;
+    output.varyingsUnlit = vert(input.attributesUnlit);
+
+    output.positionWS.xyz = TransformObjectToWorld(input.attributesUnlit.positionOS.xyz);
+
+    // Calculate tanget and binormal
+    #ifdef _NORMALMAP
+    output.tangentWS.xyz = TransformObjectToWorldDir(input.tangentOS.xyz, true);
+    output.tangentWS.w = input.tangentOS.w;
+    output.binormalWS = cross(output.varyingsUnlit.normalWS, output.tangentWS) * input.tangentOS.w;
+    #endif
+
+    half3 vertexLight = VertexLighting(output.positionWS, output.varyingsUnlit.normalWS);
+    half fogFactor = ComputeFogFactor(output.varyingsUnlit.positionHCS.z);
+    output.positionWS.w = fogFactor;
+
+    OUTPUT_SH(output.varyingsUnlit.normalWS.xyz, output.vertexSH);
+
+    #if defined(REQUIRES_VERTEX_SHADOW_COORD_INTERPOLATOR)
+    output.shadowCoord = TransformWorldToShadowCoord(output.positionWS.xyz);
+    #endif
+
+    return output;
+}
+half GetMetallic( float3 uvw )
+{
+    half4 metallic = SAMPLE_METALLIC_MAP(uvw.xy, uvw.z);
+    return metallic[(int)_MetallicMapChannelsX.x];;
+}
+half GetSmoothness( float3 uvw )
+{
+    const half4 smoothness = SAMPLE_SMOOTHNESS_MAP(uvw.xy, uvw.z);
+    return smoothness[(int)_SmoothnessMapChannelsX.x];
+}
+half4 fragLit(VaryingsLit input) : SV_Target
+{
+    Varyings inputUnlit = input.varyingsUnlit; 
+    half4 color = frag(inputUnlit);
+    SurfaceData surfaceData = (SurfaceData)0;
+    // OK
+    surfaceData.albedo = color.xyz;
+    // TODO Survey the SampleNormalTS Function in Particels.hlsl in URP package.
+    surfaceData.normalTS = SAMPLE_NORMAL_MAP(inputUnlit.baseMapUVAndProgresses.xy, inputUnlit.baseMapUVAndProgresses.z);
+    // TODO Specular Workflow is not implemented. 
+    // OK
+    surfaceData.metallic = GetMetallic(inputUnlit.baseMapUVAndProgresses.xyz);
+    // OK
+    surfaceData.specular = half3( 0, 0, 0);
+    surfaceData.smoothness = GetSmoothness(inputUnlit.baseMapUVAndProgresses.xyz);
+    surfaceData.alpha = color.a;
+    // The values of clearCoatMask,clearCoatSmoothness and occlusion is referenced from ParticlesLitInput.hlsl in UPR Package. 
+    surfaceData.clearCoatMask = 0;
+    surfaceData.clearCoatSmoothness = 1;
+    surfaceData.occlusion = 1;
+    // todo : What to do emission?
+    surfaceData.emission = 0;
+
+    InputData inputData = (InputData)0;
+    // OK
+    inputData.positionWS = input.positionWS.xyz;
+    #ifdef _NORMALMAP
+    // OK
+    inputData.normalWS = TransformTangentToWorld(
+        surfaceData.normalTS,
+        half3x3(
+            input.tangentWS.xyz,
+            input.binormalWS.xyz,
+            inputUnlit.normalWS.xyz));
+
+    #else
+    inputData.normalWS = inputUnlit.normalWS.xyz;
+    #endif
+    inputData.normalWS = NormalizeNormalPerPixel(inputData.normalWS);
+    // OK
+    inputData.viewDirectionWS = inputUnlit.viewDirWS;
+    #if defined(REQUIRES_VERTEX_SHADOW_COORD_INTERPOLATOR)
+    // OK
+    inputData.shadowCoord = input.shadowCoord;
+    #elif defined(MAIN_LIGHT_CALCULATE_SHADOWS)
+    // todo : Not implemented yet.
+    inputData.shadowCoord = TransformWorldToShadowCoord(input.positionWS.xyz);
+    #else
+    inputData.shadowCoord = float4(0, 0, 0, 0);
+    #endif
+    inputData.fogCoord = input.positionWS.w;
+    // todo : What to do vertexLighting? 
+
+    inputData.bakedGI = SampleSHPixel(input.vertexSH, inputData.normalWS);
+    inputData.normalizedScreenSpaceUV = GetNormalizedScreenSpaceUV(inputUnlit.positionHCS);
+    // The values of shadowMask and vertexLighting are referenced from ParticlesLitForwardPass.hlsl in UPR Package.
+    inputData.shadowMask = half4(1, 1, 1, 1);
+    inputData.vertexLighting = half3(0, 0, 0);
+
+    color = UniversalFragmentPBR(inputData, surfaceData);
+    return color;
+}
+
+#endif

Assets/Nova/Runtime/Core/Shaders/ParticlesUberUnlit.hlsl → Assets/Nova/Editor/Core/Scripts/Shaders/ParticlesUberUnlit.hlsl

@@ -7,7 +7,7 @@
 struct Attributes
 {
     float4 positionOS : POSITION;
-    float4 color : COLOR0;
+    float4 color : COLOR;
     float3 normalOS : NORMAL;
     float2 texcoord : TEXCOORD0;
     #ifndef NOVA_PARTICLE_INSTANCING_ENABLED