Skip to content

Commit 748cdf7

Browse files
author
lilxyzw
committed
fix: rim light for VRCLV does not work
1 parent 65409df commit 748cdf7

File tree

6 files changed

+26
-10
lines changed

6 files changed

+26
-10
lines changed

‎Assets/lilToon/CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
44
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
55
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
66

7+
## [2.1.7] - 2025-08-05
8+
### Fixed
9+
- Rim light for VRCLV does not work
10+
711
## [2.1.6] - 2025-08-05
812
### Changed
913
- VRCLV optimization

‎Assets/lilToon/CHANGELOG_JP.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
44
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
55
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
66

7+
## [2.1.7] - 2025-08-05
8+
### 修正
9+
- VRCLV用リムライトが動作しない
10+
711
## [2.1.6] - 2025-08-05
812
### 変更
913
- VRCLVの最適化

‎Assets/lilToon/Editor/lilOptimizer.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,6 @@ private static string RewriteInputHLSLText(Dictionary<string, TexProp> dicT, Dic
205205
if(string.IsNullOrEmpty(pathBase) || string.IsNullOrEmpty(pathOpt) || !File.Exists(pathBase) || !File.Exists(pathOpt)) return null;
206206
var shader = Shader.Find("Hidden/ltspass_proponly");
207207
var sb = new StringBuilder();
208-
sb.AppendLine("#define LIL_INPUT_OPTIMIZED");
209208
var sr = new StreamReader(pathBase);
210209
string line;
211210
while ((line = sr.ReadLine()) != null)

‎Assets/lilToon/Editor/lilToonSetting.cs‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -545,6 +545,7 @@ public static string BuildShaderSettingStringMulti(lilToonSetting shaderSetting)
545545
return sb.ToString();
546546
}
547547

548+
internal static bool isOptimize = false;
548549
public static string BuildShaderSettingString(lilToonSetting shaderSetting, bool isFile)
549550
{
550551
var sb = new StringBuilder();
@@ -625,11 +626,13 @@ public static string BuildShaderSettingString(lilToonSetting shaderSetting, bool
625626
if (shaderSetting.LIL_FEATURE_Main2ndTex) sb.AppendLine("#define LIL_FEATURE_Main2ndTex");
626627
if (shaderSetting.LIL_FEATURE_Main2ndBlendMask) sb.AppendLine("#define LIL_FEATURE_Main2ndBlendMask");
627628
if (shaderSetting.LIL_FEATURE_Main2ndDissolveMask) sb.AppendLine("#define LIL_FEATURE_Main2ndDissolveMask");
628-
/*if (shaderSetting.LIL_FEATURE_Main2ndDissolveNoiseMask)*/ sb.AppendLine("#define LIL_FEATURE_Main2ndDissolveNoiseMask");
629+
/*if (shaderSetting.LIL_FEATURE_Main2ndDissolveNoiseMask)*/
630+
sb.AppendLine("#define LIL_FEATURE_Main2ndDissolveNoiseMask");
629631
if (shaderSetting.LIL_FEATURE_Main3rdTex) sb.AppendLine("#define LIL_FEATURE_Main3rdTex");
630632
if (shaderSetting.LIL_FEATURE_Main3rdBlendMask) sb.AppendLine("#define LIL_FEATURE_Main3rdBlendMask");
631633
if (shaderSetting.LIL_FEATURE_Main3rdDissolveMask) sb.AppendLine("#define LIL_FEATURE_Main3rdDissolveMask");
632-
/*if (shaderSetting.LIL_FEATURE_Main3rdDissolveNoiseMask)*/ sb.AppendLine("#define LIL_FEATURE_Main3rdDissolveNoiseMask");
634+
/*if (shaderSetting.LIL_FEATURE_Main3rdDissolveNoiseMask)*/
635+
sb.AppendLine("#define LIL_FEATURE_Main3rdDissolveNoiseMask");
633636
if (shaderSetting.LIL_FEATURE_AlphaMask) sb.AppendLine("#define LIL_FEATURE_AlphaMask");
634637
if (shaderSetting.LIL_FEATURE_BumpMap) sb.AppendLine("#define LIL_FEATURE_BumpMap");
635638
if (shaderSetting.LIL_FEATURE_Bump2ndMap) sb.AppendLine("#define LIL_FEATURE_Bump2ndMap");
@@ -668,7 +671,8 @@ public static string BuildShaderSettingString(lilToonSetting shaderSetting, bool
668671
if (shaderSetting.LIL_FEATURE_AudioLinkMask) sb.AppendLine("#define LIL_FEATURE_AudioLinkMask");
669672
if (shaderSetting.LIL_FEATURE_AudioLinkLocalMap) sb.AppendLine("#define LIL_FEATURE_AudioLinkLocalMap");
670673
if (shaderSetting.LIL_FEATURE_DissolveMask) sb.AppendLine("#define LIL_FEATURE_DissolveMask");
671-
/*if (shaderSetting.LIL_FEATURE_DissolveNoiseMask)*/ sb.AppendLine("#define LIL_FEATURE_DissolveNoiseMask");
674+
/*if (shaderSetting.LIL_FEATURE_DissolveNoiseMask)*/
675+
sb.AppendLine("#define LIL_FEATURE_DissolveNoiseMask");
672676
if (shaderSetting.LIL_FEATURE_OutlineTex) sb.AppendLine("#define LIL_FEATURE_OutlineTex");
673677
if (shaderSetting.LIL_FEATURE_OutlineWidthMask) sb.AppendLine("#define LIL_FEATURE_OutlineWidthMask");
674678
if (shaderSetting.LIL_FEATURE_OutlineVectorTex) sb.AppendLine("#define LIL_FEATURE_OutlineVectorTex");
@@ -691,6 +695,7 @@ public static string BuildShaderSettingString(lilToonSetting shaderSetting, bool
691695
if (!shaderSetting.LIL_OPTIMIZE_USE_VERTEXLIGHT) sb.AppendLine("#pragma lil_skip_variants_addlight");
692696
if (!shaderSetting.LIL_OPTIMIZE_USE_LIGHTMAP) sb.AppendLine("#pragma lil_skip_variants_lightmaps");
693697
}
698+
if (isOptimize) sb.AppendLine("#define LIL_INPUT_OPTIMIZED");
694699
return sb.ToString();
695700
}
696701

@@ -814,15 +819,15 @@ internal static void ApplyShaderSettingOptimized(bool loadBuildScene = true, Lis
814819
ApplyShaderSetting(shaderSetting, "[lilToon] PreprocessBuild", shaders);
815820
AssetDatabase.Refresh();
816821
}
817-
822+
818823
internal static void GetOptimizedSetting(Material[] materials, AnimationClip[] clips, out string usedShaders, out string optimizedHLSL, out string shaderSettingText)
819824
{
820825
usedShaders = null;
821826
optimizedHLSL = null;
822827
shaderSettingText = null;
823828

824829
var shaders = GetShaderListFromGameObject(materials, clips);
825-
if(shaders.Count() == 0) return;
830+
if (shaders.Count() == 0) return;
826831

827832
usedShaders = string.Join(Environment.NewLine, shaders.Select(s => s.name).Distinct().ToArray());
828833

@@ -833,13 +838,13 @@ internal static void GetOptimizedSetting(Material[] materials, AnimationClip[] c
833838
optimizedHLSL = lilOptimizer.GetOptimizedText(materials, clips);
834839

835840
// Get materials
836-
foreach(var material in materials)
841+
foreach (var material in materials)
837842
{
838843
SetupShaderSettingFromMaterial(material, ref shaderSetting);
839844
}
840845

841846
// Get animations
842-
foreach(var clip in clips)
847+
foreach (var clip in clips)
843848
{
844849
SetupShaderSettingFromAnimationClip(clip, ref shaderSetting, true);
845850
}

‎Assets/lilToon/External/Editor/VRChatModule.cs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ public bool OnBuildRequested(VRCSDKRequestedBuildType requestedBuildType)
4646

4747
public bool OnPreprocessAvatar(GameObject avatarGameObject)
4848
{
49+
lilToonSetting.isOptimize = true;
4950
try
5051
{
5152
lilToonSetting shaderSetting = null;
@@ -64,11 +65,13 @@ public bool OnPreprocessAvatar(GameObject avatarGameObject)
6465
Debug.LogException(e);
6566
Debug.Log("[lilToon] OnPreprocessAvatar() failed");
6667
}
68+
lilToonSetting.isOptimize = false;
6769
return true;
6870
}
6971

7072
public bool OnPreprocessAvatars(GameObject[] avatarGameObjects)
7173
{
74+
lilToonSetting.isOptimize = true;
7275
try
7376
{
7477
lilToonSetting shaderSetting = null;
@@ -87,6 +90,7 @@ public bool OnPreprocessAvatars(GameObject[] avatarGameObjects)
8790
Debug.LogException(e);
8891
Debug.Log("[lilToon] OnPreprocessAvatars() failed");
8992
}
93+
lilToonSetting.isOptimize = false;
9094
return true;
9195
}
9296

‎Assets/lilToon/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "jp.lilxyzw.liltoon",
3-
"version": "2.1.6",
3+
"version": "2.1.7",
44
"displayName": "lilToon",
55
"description": "Feature-rich toon shader.",
66
"unity": "2022.3",
@@ -9,7 +9,7 @@
99
"licensesUrl": "https://github.com/lilxyzw/lilToon/blob/master/Assets/lilToon/LICENSE",
1010
"license": "MIT",
1111
"keywords": ["Toon", "Shader", "Material"],
12-
"url" : "https://github.com/lilxyzw/lilToon/releases/download/2.1.6/jp.lilxyzw.liltoon-2.1.6.zip?",
12+
"url" : "https://github.com/lilxyzw/lilToon/releases/download/2.1.7/jp.lilxyzw.liltoon-2.1.7.zip?",
1313
"repo" : "https://lilxyzw.github.io/vpm-repos/vpm.json",
1414
"legacyFolders" : {
1515
"Assets\\lilToon" : "05d1d116436047941ad97d1b9064ee05"

0 commit comments

Comments
 (0)