Merge pull request #131 from MidraLab/fix/load_model_default_shader

fix: DefaultのshaderをMToonに変更
MidraLab · Feb 5, 2025 · 563cc9f · 563cc9f
2 parents 926c5cf + 7606204
commit 563cc9f
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 6 deletions.
diff --git a/Assets/uDesktopMascot/Scripts/Common/ApplicationSettingData.cs b/Assets/uDesktopMascot/Scripts/Common/ApplicationSettingData.cs
@@ -112,6 +112,11 @@ public float RotationZ
                 if (_rotationZ < 0) _rotationZ += 360.0f;
             }
         }
+
+        /// <summary>
+        /// キャラクターのShaderにLilToonを使用するかどうか
+        /// </summary>
+        public bool UseLilToon { get; set; } = false;
     }
 
     /// <summary>

diff --git a/Assets/uDesktopMascot/Scripts/Manager/SystemManager.cs b/Assets/uDesktopMascot/Scripts/Manager/SystemManager.cs
@@ -240,6 +240,7 @@ public void DisposeWebServer()
         /// </summary>
         private void OnDestroy()
         {
+            ApplicationSettings.Instance.SaveSettings();
             _cancellationTokenSource?.Cancel();
             _cancellationTokenSource?.Dispose();
             _webServiceHost?.Dispose();

diff --git a/Assets/uDesktopMascot/Scripts/Utility/LoadCharacterModel.cs b/Assets/uDesktopMascot/Scripts/Utility/LoadCharacterModel.cs
@@ -76,14 +76,17 @@ public static async UniTask<GameObject> LoadModel(CancellationToken cancellation
                 }
             }
 
-            // シェーダーをlilToonに置き換える
-            bool shaderReplaceSuccess = ReplaceShadersWithLilToon(model);
-
-            if (!shaderReplaceSuccess)
+            if (characterSettings.UseLilToon)
             {
-                Log.Warning("シェーダーの置き換えに失敗したため、デフォルトのシェーダーを使用します。");
-            }
+                // シェーダーをlilToonに置き換える
+                bool shaderReplaceSuccess = ReplaceShadersWithLilToon(model);
 
+                if (!shaderReplaceSuccess)
+                {
+                    Log.Warning("シェーダーの置き換えに失敗したため、デフォルトのシェーダーを使用します。");
+                }
+            }
+
             return model;
         }