From 43ac6663763145ae45ca67ef0bff728699e86e12 Mon Sep 17 00:00:00 2001 From: lilxyzw Date: Sun, 21 Nov 2021 01:01:21 +0900 Subject: [PATCH] 1.2.5 --- Assets/lilToon/CHANGELOG.md | 4 ++++ Assets/lilToon/CHANGELOG_JP.md | 4 ++++ Assets/lilToon/Editor/lilInspector.cs | 4 ++-- Assets/lilToon/README.md | 2 +- Assets/lilToon/README_JP.md | 2 +- Assets/lilToon/Shader/Includes/lil_common_macro.hlsl | 2 +- Assets/lilToon/Shader/Includes/lil_common_vert_fur.hlsl | 4 ++-- Assets/lilToon/Shader/Includes/lil_pass_forward_fur.hlsl | 2 +- Assets/lilToon/package.json | 2 +- version.json | 2 +- 10 files changed, 18 insertions(+), 10 deletions(-) diff --git a/Assets/lilToon/CHANGELOG.md b/Assets/lilToon/CHANGELOG.md index 7a39e2a1..5fb52b73 100644 --- a/Assets/lilToon/CHANGELOG.md +++ b/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). +## [1.2.5] - 2021-11-21 +### Fixed +- Fixed an issue where the fur shader wasn't handling fogs well + ## [1.2.4] - 2021-11-20 ### Added - `Border` and` Blur` properties for toon specular diff --git a/Assets/lilToon/CHANGELOG_JP.md b/Assets/lilToon/CHANGELOG_JP.md index f8f01092..3f90e2f1 100644 --- a/Assets/lilToon/CHANGELOG_JP.md +++ b/Assets/lilToon/CHANGELOG_JP.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). +## [1.2.5] - 2021-11-21 +### 修正 +- ファーシェーダーでフォグの処理がうまくできていなかったのを修正 + ## [1.2.4] - 2021-11-20 ### 追加 - 光沢のタイプのトゥーンに`範囲`と`ぼかし`パラメーターを追加 diff --git a/Assets/lilToon/Editor/lilInspector.cs b/Assets/lilToon/Editor/lilInspector.cs index d20b9710..5a16585c 100644 --- a/Assets/lilToon/Editor/lilInspector.cs +++ b/Assets/lilToon/Editor/lilInspector.cs @@ -137,8 +137,8 @@ public enum lilLightingPreset //------------------------------------------------------------------------------------------------------------------------------ // Constant - private const string currentVersionName = "1.2.4"; - private const int currentVersionValue = 17; + private const string currentVersionName = "1.2.5"; + private const int currentVersionValue = 18; private const string boothURL = "https://lilxyzw.booth.pm/"; private const string githubURL = "https://github.com/lilxyzw/lilToon"; diff --git a/Assets/lilToon/README.md b/Assets/lilToon/README.md index 04eec861..18bfecd0 100644 --- a/Assets/lilToon/README.md +++ b/Assets/lilToon/README.md @@ -1,5 +1,5 @@ # lilToon -Version 1.2.4 +Version 1.2.5 # Overview This shader is developed for services using avatars (VRChat, etc.) and has the following features. diff --git a/Assets/lilToon/README_JP.md b/Assets/lilToon/README_JP.md index 89ecdaa2..3333423d 100644 --- a/Assets/lilToon/README_JP.md +++ b/Assets/lilToon/README_JP.md @@ -1,5 +1,5 @@ # lilToon -Version 1.2.4 +Version 1.2.5 # 概要 アバターを用いたサービス（VRChat等）向けに開発したシェーダーで以下のような特徴があります。 diff --git a/Assets/lilToon/Shader/Includes/lil_common_macro.hlsl b/Assets/lilToon/Shader/Includes/lil_common_macro.hlsl index a8879060..61c8603a 100644 --- a/Assets/lilToon/Shader/Includes/lil_common_macro.hlsl +++ b/Assets/lilToon/Shader/Includes/lil_common_macro.hlsl @@ -1618,7 +1618,7 @@ struct lilLightData #else #define LIL_VERTEXLIGHT_FOG_TYPE float #define LIL_VERTEXLIGHT_FOG_COORDS(idx) float vlf : TEXCOORD##idx; - #define LIL_TRANSFER_FOG(i,o) o.vlf = 1.0 + #define LIL_TRANSFER_FOG(i,o) o.vlf = lilCalcFogFactor(i.positionCS.z) #define LIL_APPLY_FOG(col,i) LIL_APPLY_FOG_BASE(col,i.vlf) #define LIL_APPLY_FOG_COLOR(col,i,fogColor) LIL_APPLY_FOG_COLOR_BASE(col,i.vlf,fogColor) #endif diff --git a/Assets/lilToon/Shader/Includes/lil_common_vert_fur.hlsl b/Assets/lilToon/Shader/Includes/lil_common_vert_fur.hlsl index e64df97a..cf354e0f 100644 --- a/Assets/lilToon/Shader/Includes/lil_common_vert_fur.hlsl +++ b/Assets/lilToon/Shader/Includes/lil_common_vert_fur.hlsl @@ -262,7 +262,7 @@ void geom(triangle v2g input[3], inout TriangleStream outStream) #if defined(LIL_V2G_NORMAL_WS) float3 ndc = (input[0].normalWS +input[1].normalWS +input[2].normalWS) *0.333333333333; #endif - #if defined(LIL_V2G_VERTEXLIGHT_FOG) && (defined(LIL_USE_ADDITIONALLIGHT_VS) || defined(FOG_LINEAR) || defined(FOG_EXP) || defined(FOG_EXP2)) + #if defined(LIL_V2G_VERTEXLIGHT_FOG) && !(!defined(LIL_USE_ADDITIONALLIGHT_VS) && defined(LIL_HDRP)) LIL_VERTEXLIGHT_FOG_TYPE vlfc = (input[0].vlf + input[1].vlf + input[2].vlf) * 0.333333333333; #endif #if defined(LIL_PASS_MOTIONVECTOR_INCLUDED) @@ -313,7 +313,7 @@ void geom(triangle v2g input[3], inout TriangleStream outStream) #if defined(LIL_V2F_NORMAL_WS) output.normalWS = lerp(input[ii2].normalWS,ndc,lpmix); #endif - #if defined(LIL_V2G_VERTEXLIGHT_FOG) && (defined(LIL_USE_ADDITIONALLIGHT_VS) || defined(FOG_LINEAR) || defined(FOG_EXP) || defined(FOG_EXP2)) + #if defined(LIL_V2F_VERTEXLIGHT_FOG) && !(!defined(LIL_USE_ADDITIONALLIGHT_VS) && defined(LIL_HDRP)) output.vlf = lerp(input[ii2].vlf,vlfc,lpmix); #endif diff --git a/Assets/lilToon/Shader/Includes/lil_pass_forward_fur.hlsl b/Assets/lilToon/Shader/Includes/lil_pass_forward_fur.hlsl index 67182014..ec15816b 100644 --- a/Assets/lilToon/Shader/Includes/lil_pass_forward_fur.hlsl +++ b/Assets/lilToon/Shader/Includes/lil_pass_forward_fur.hlsl @@ -27,7 +27,7 @@ #define LIL_V2G_INDLIGHTCOLOR #endif #endif -#define LIL_V2G_FOG +#define LIL_V2G_VERTEXLIGHT_FOG #define LIL_V2G_FURVECTOR // g2f diff --git a/Assets/lilToon/package.json b/Assets/lilToon/package.json index 0f545175..e1475916 100644 --- a/Assets/lilToon/package.json +++ b/Assets/lilToon/package.json @@ -1,7 +1,7 @@ { "name": "jp.lilxyzw.liltoon", "displayName": "lilToon", - "version": "1.2.4", + "version": "1.2.5", "unity": "2017.1", "description": "Feature-rich toon shader.", "keywords": ["Toon", "Shader", "Material"], diff --git a/version.json b/version.json index 29e6ccb5..27478f2c 100644 --- a/version.json +++ b/version.json @@ -1 +1 @@ -{"latest_vertion_name": "1.2.4", "latest_vertion_value": 17} \ No newline at end of file +{"latest_vertion_name": "1.2.5", "latest_vertion_value": 18} \ No newline at end of file