Skip to content

Commit

Permalink
chore: Reverted the unaffected parts of the 1.8.4 changes to verify bugs
Browse files Browse the repository at this point in the history
  • Loading branch information
lilxyzw committed Dec 20, 2024
1 parent e0b7395 commit ae6a81d
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 18 deletions.
4 changes: 4 additions & 0 deletions Assets/lilToon/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.8.5] - 2024-12-20
### Changed
- Reverted the unaffected parts of the 1.8.4 changes to verify bugs

## [1.8.4] - 2024-12-12
### Added
- Shader optimization can now be skipped in NDMF's `Apply on Play`
Expand Down
4 changes: 4 additions & 0 deletions Assets/lilToon/CHANGELOG_JP.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.8.5] - 2024-12-20
### 変更
- 不具合検証のため1.8.4の変更箇所のうち影響のない部分を差し戻し

## [1.8.4] - 2024-12-12
### 追加
- NDMFの`Apply on Play`でシェーダー最適化をスキップできるように
Expand Down
2 changes: 1 addition & 1 deletion Assets/lilToon/Editor/lilConstants.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ namespace lilToon
{
public class lilConstants
{
public const string currentVersionName = "1.8.4";
public const string currentVersionName = "1.8.5";
public const int currentVersionValue = 44;

internal const string boothURL = "https://lilxyzw.booth.pm/";
Expand Down
8 changes: 0 additions & 8 deletions Assets/lilToon/Editor/lilOptimizer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -192,13 +192,9 @@ private static void RewriteInputHLSL(Dictionary<string, TexProp> dicT, Dictionar
{
string optHLSL = RewriteInputHLSLText(dicT, dicD, dicF, dicC);
string pathOpt = AssetDatabase.GUIDToAssetPath("571051a232e4af44a98389bda858df27");
var fi = new FileInfo(pathOpt);
var timeC = fi.CreationTime;
var timeW = fi.LastWriteTime;
var sw = new StreamWriter(pathOpt, false);
sw.Write(optHLSL);
sw.Close();
new FileInfo(pathOpt){CreationTime = timeC, LastWriteTime = timeW};
}

private static string RewriteInputHLSLText(Dictionary<string, TexProp> dicT, Dictionary<string, STProp> dicD, Dictionary<string, FloatProp> dicF, Dictionary<string, ColorProp> dicC)
Expand Down Expand Up @@ -319,15 +315,11 @@ internal static void ResetInputHLSL()
string pathBase = AssetDatabase.GUIDToAssetPath("8ff7f7d9c86e1154fb3aac5a8a8681bb");
string pathOpt = AssetDatabase.GUIDToAssetPath("571051a232e4af44a98389bda858df27");
if(string.IsNullOrEmpty(pathBase) || string.IsNullOrEmpty(pathOpt) || !File.Exists(pathBase) || !File.Exists(pathOpt)) return;
var fi = new FileInfo(pathOpt);
var timeC = fi.CreationTime;
var timeW = fi.LastWriteTime;
var sw = new StreamWriter(pathOpt, false);
var sr = new StreamReader(pathBase);
sw.Write(sr.ReadToEnd());
sw.Close();
sr.Close();
new FileInfo(pathOpt){CreationTime = timeC, LastWriteTime = timeW};
}

private static string GetIndent(int indent)
Expand Down
6 changes: 0 additions & 6 deletions Assets/lilToon/Editor/lilToonSetting.cs
Original file line number Diff line number Diff line change
Expand Up @@ -512,13 +512,7 @@ internal static void ApplyShaderSetting(lilToonSetting shaderSetting, string rep

string baseShaderPath = baseShaderFolderPath + Path.AltDirectorySeparatorChar + Path.GetFileNameWithoutExtension(shaderPath) + ".lilinternal";
if(!File.Exists(baseShaderPath)) continue;

// Change without updating FileInfo
var fi = new FileInfo(shaderPath);
var timeC = fi.CreationTime;
var timeW = fi.LastWriteTime;
File.WriteAllText(shaderPath, lilShaderContainer.UnpackContainer(baseShaderPath, null, doOptimize));
new FileInfo(shaderPath){CreationTime = timeC, LastWriteTime = timeW};
}
foreach(var shaderPath in shaderPathes)
{
Expand Down
4 changes: 2 additions & 2 deletions Assets/lilToon/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "jp.lilxyzw.liltoon",
"version": "1.8.4",
"version": "1.8.5",
"displayName": "lilToon",
"description": "Feature-rich toon shader.",
"unity": "2018.3",
Expand All @@ -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/1.8.4/jp.lilxyzw.liltoon-1.8.4.zip?",
"url" : "https://github.com/lilxyzw/lilToon/releases/download/1.8.5/jp.lilxyzw.liltoon-1.8.5.zip?",
"repo" : "https://lilxyzw.github.io/vpm-repos/vpm.json",
"legacyFolders" : {
"Assets\\lilToon" : "05d1d116436047941ad97d1b9064ee05"
Expand Down
2 changes: 1 addition & 1 deletion version.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"latest_vertion_name": "1.8.4", "latest_vertion_value": 44}
{"latest_vertion_name": "1.8.5", "latest_vertion_value": 44}

0 comments on commit ae6a81d

Please sign in to comment.