fix: get light direction from Adaptive Probe Volumes #362

Author: lilxyzw

Assets/lilToon/CHANGELOG.md

@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.3.1] - 2025-10-09
+### Fixed
+- Get light direction from Adaptive Probe Volumes 
+
 ## [2.3.0] - 2025-10-06
 ### Added
 - Adaptive Probe Volumes

Assets/lilToon/CHANGELOG_JP.md

@@ -4,11 +4,15 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.3.1] - 2025-10-09
+### 修正
+- Adaptive Probe Volumesからライト方向を取得するように
+
 ## [2.3.0] - 2025-10-06
 ### 追加
 - Adaptive Probe Volumes対応
 
-### Fixed
+### 修正
 - AudioLinkMaskが頂点シェーダーで動作しない
 - カスタムシェーダーのInspectorでエラー
 - 逆光ライトの透明度が反映されていない

Assets/lilToon/Shader/Includes/lil_common_functions.hlsl

@@ -1080,10 +1080,31 @@ void lilGetToonSHDoubleAPV(float3 lightDirection, float3 positionWS, float3 norm
     #endif
 }
 
+float3 lilGetFixedLightDirectionAPV(float3 positionWS, float3 normalWS, float4 lightDirectionOverride)
+{
+    float3 mainDir = LIL_MAINLIGHT_DIRECTION * lilLuminance(LIL_MAINLIGHT_COLOR);
+    float4 SHAr = unity_SHAr;
+    float4 SHAg = unity_SHAg;
+    float4 SHAb = unity_SHAb;
+    float3 V = normalize(lilViewDirection(positionWS));
+    APVSample apvSample = SampleAPV(positionWS, normalWS, lilGetRenderingLayer(), V);
+    if (apvSample.status != APV_SAMPLE_STATUS_INVALID)
+    {
+        apvSample.Decode();
+        SHAr = half4(apvSample.L1_R, apvSample.L0.r);
+        SHAg = half4(apvSample.L1_G, apvSample.L0.g);
+        SHAb = half4(apvSample.L1_B, apvSample.L0.b);
+    }
+
+    float3 sh9Dir = SHAr.xyz * 0.333333 + SHAg.xyz * 0.333333 + SHAb.xyz * 0.333333;
+    float3 L = float3(sh9Dir.x, abs(sh9Dir.y), sh9Dir.z) + mainDir + lilGetCustomLightDirection(lightDirectionOverride);
+    return L;
+}
+
 void lilGetLightColorDoubleAPV(float3 positionWS, float3 normalWS, out float3 lightColor, out float3 indLightColor)
 {
     float3 shMax, shMin;
-    lilGetToonSHDoubleAPV(lilGetLightDirectionForSH9(), positionWS, normalWS, shMax, shMin);
+    lilGetToonSHDoubleAPV(lilGetFixedLightDirectionAPV(positionWS, normalWS, float4(0,0.001,0,0)), positionWS, normalWS, shMax, shMin);
     lightColor = LIL_MAINLIGHT_COLOR + shMax;
     indLightColor = saturate(shMin);
 }

Assets/lilToon/Shader/Includes/lil_common_macro.hlsl

@@ -2124,6 +2124,13 @@ struct lilLightData
         LIL_APPLY_LTCGI(o) \
         LIL_APPLY_ADDITIONALLIGHT_TO_MAIN(i,o); \
         LIL_CORRECT_LIGHTCOLOR_VS(o.lightColor)
+#elif defined(PROBE_VOLUMES_L1) || defined(PROBE_VOLUMES_L2)
+    #define LIL_CALC_MAINLIGHT(i,o) \
+        lilLightData o; \
+        o.lightDirection = lilGetFixedLightDirectionAPV(i.positionWS, 0, _LightDirectionOverride); \
+        LIL_CALC_TWOLIGHT(i,o); \
+        LIL_APPLY_ADDITIONALLIGHT_TO_MAIN(i,o); \
+        LIL_CORRECT_LIGHTCOLOR_VS(o.lightColor)
 #else
     #define LIL_CALC_MAINLIGHT(i,o) \
         lilLightData o; \

Assets/lilToon/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jp.lilxyzw.liltoon",
-  "version": "2.3.0",
+  "version": "2.3.1",
   "displayName": "lilToon",
   "description": "Feature-rich toon shader.",
   "unity": "2022.3",
@@ -9,7 +9,7 @@
   "licensesUrl": "https://github.com/lilxyzw/lilToon/blob/master/Assets/lilToon/LICENSE",
   "license": "MIT",
   "keywords": ["Toon", "Shader", "Material"],
-  "url" : "https://github.com/lilxyzw/lilToon/releases/download/2.3.0/jp.lilxyzw.liltoon-2.3.0.zip?",
+  "url" : "https://github.com/lilxyzw/lilToon/releases/download/2.3.1/jp.lilxyzw.liltoon-2.3.1.zip?",
   "repo" : "https://lilxyzw.github.io/vpm-repos/vpm.json",
   "legacyFolders" : {
     "Assets\\lilToon" : "05d1d116436047941ad97d1b9064ee05"