V1.02 Hotfix

Melioli · Aug 28, 2023 · b66e8dc · b66e8dc
1 parent ff77012
commit b66e8dc
Show file tree

Hide file tree

Showing 47 changed files with 58 additions and 47 deletions.
diff --git a/Scripts/ThryEditor/.gitattributes → Scripts/HoyoGUI/.gitattributes b/Scripts/ThryEditor/.gitattributes → Scripts/HoyoGUI/.gitattributes
diff --git a/Scripts/ThryEditor/CREDITS.txt → Scripts/HoyoGUI/CREDITS.txt b/Scripts/ThryEditor/CREDITS.txt → Scripts/HoyoGUI/CREDITS.txt
diff --git a/...s/ThryEditor/Editor/ChannelPreview.shader → Scripts/HoyoGUI/Editor/ChannelPreview.shader b/...s/ThryEditor/Editor/ChannelPreview.shader → Scripts/HoyoGUI/Editor/ChannelPreview.shader
diff --git a/Scripts/ThryEditor/Editor/Config.cs → Scripts/HoyoGUI/Editor/Config.cs b/Scripts/ThryEditor/Editor/Config.cs → Scripts/HoyoGUI/Editor/Config.cs
@@ -1,5 +1,5 @@
 // Material/Shader Inspector for Unity 2017/2018
-// Copyright (C) 2019 Thryrallo
+// Copyright (C) 2023 Thryrallo & Meliodas
 
 using System;
 using System.Collections;
@@ -10,7 +10,7 @@
 using UnityEditor;
 using UnityEngine;
 
-namespace Thry
+namespace Hoyo
 {
     public class Config
     {

diff --git a/Scripts/ThryEditor/Editor/DataStructs.cs → Scripts/HoyoGUI/Editor/DataStructs.cs b/Scripts/ThryEditor/Editor/DataStructs.cs → Scripts/HoyoGUI/Editor/DataStructs.cs
@@ -1,5 +1,5 @@
 // Material/Shader Inspector for Unity 2017/2018
-// Copyright (C) 2019 Thryrallo
+// Copyright (C) 2023 Thryrallo & Meliodas
 
 using System;
 using System.Collections;
@@ -10,7 +10,7 @@
 using UnityEngine;
 using UnityEngine.Rendering;
 
-namespace Thry
+namespace Hoyo
 {
     #region Constants
     public class PATH

diff --git a/Scripts/ThryEditor/Editor/DecalGizmos.shader → Scripts/HoyoGUI/Editor/DecalGizmos.shader b/Scripts/ThryEditor/Editor/DecalGizmos.shader → Scripts/HoyoGUI/Editor/DecalGizmos.shader
diff --git a/Scripts/ThryEditor/Editor/DecalSceneTool.cs → Scripts/HoyoGUI/Editor/DecalSceneTool.cs b/Scripts/ThryEditor/Editor/DecalSceneTool.cs → Scripts/HoyoGUI/Editor/DecalSceneTool.cs
@@ -3,7 +3,7 @@
 using UnityEditor;
 using UnityEngine;
 
-namespace Thry
+namespace Hoyo
 {
     public class DecalSceneTool
     {

diff --git a/Scripts/ThryEditor/Editor/DecalTool.cs → Scripts/HoyoGUI/Editor/DecalTool.cs b/Scripts/ThryEditor/Editor/DecalTool.cs → Scripts/HoyoGUI/Editor/DecalTool.cs
@@ -1,7 +1,7 @@
 using UnityEditor;
 using UnityEngine;
 
-namespace Thry
+namespace Hoyo
 {
     public class DecalTool : EditorWindow
     {

diff --git a/Scripts/ThryEditor/Editor/Drawers.cs → Scripts/HoyoGUI/Editor/Drawers.cs b/Scripts/ThryEditor/Editor/Drawers.cs → Scripts/HoyoGUI/Editor/Drawers.cs
@@ -1,5 +1,5 @@
 // Material/Shader Inspector for Unity 2017/2018
-// Copyright (C) 2019 Thryrallo
+// Copyright (C) 2023 Thryrallo & Meliodas
 
 using System;
 using System.Collections;
@@ -10,7 +10,7 @@
 using UnityEditor;
 using UnityEngine;
 
-namespace Thry
+namespace Hoyo
 {
     #region Texture Drawers
     public class ThryTextureDrawer : MaterialPropertyDrawer

diff --git a/Scripts/ThryEditor/Editor/EditorLocale.cs → Scripts/HoyoGUI/Editor/EditorLocale.cs b/Scripts/ThryEditor/Editor/EditorLocale.cs → Scripts/HoyoGUI/Editor/EditorLocale.cs
@@ -3,7 +3,7 @@
 using UnityEditor;
 using UnityEngine;
 
-namespace Thry
+namespace Hoyo
 {
     public class EditorLocale
     {

diff --git a/Scripts/ThryEditor/Editor/EditorStructs.cs → Scripts/HoyoGUI/Editor/EditorStructs.cs b/Scripts/ThryEditor/Editor/EditorStructs.cs → Scripts/HoyoGUI/Editor/EditorStructs.cs
@@ -4,11 +4,11 @@
 using System.Linq;
 using System.Reflection;
 using System.Text.RegularExpressions;
-using Thry.ThryEditor;
+using Hoyo.ThryEditor;
 using UnityEditor;
 using UnityEngine;
 
-namespace Thry
+namespace Hoyo
 {
     public class CRect
     {

diff --git a/Scripts/ThryEditor/Editor/GUIHelper.cs → Scripts/HoyoGUI/Editor/GUIHelper.cs b/Scripts/ThryEditor/Editor/GUIHelper.cs → Scripts/HoyoGUI/Editor/GUIHelper.cs
@@ -7,7 +7,7 @@
 using UnityEditor;
 using UnityEngine;
 
-namespace Thry
+namespace Hoyo
 {
     public class GuiHelper
     {

diff --git a/Scripts/ThryEditor/Editor/GradiantEditor.cs → Scripts/HoyoGUI/Editor/GradiantEditor.cs b/Scripts/ThryEditor/Editor/GradiantEditor.cs → Scripts/HoyoGUI/Editor/GradiantEditor.cs
@@ -1,5 +1,5 @@
 // Material/Shader Inspector for Unity 2017/2018
-// Copyright (C) 2019 Thryrallo
+// Copyright (C) 2023 Thryrallo & Meliodas
 
 using System;
 using System.Collections;
@@ -9,7 +9,7 @@
 using UnityEditor;
 using UnityEngine;
 
-namespace Thry
+namespace Hoyo
 {
     public class GradientEditor : EditorWindow
     {

diff --git a/Scripts/ThryEditor/Editor/GradientEditor2.cs → Scripts/HoyoGUI/Editor/GradientEditor2.cs b/Scripts/ThryEditor/Editor/GradientEditor2.cs → Scripts/HoyoGUI/Editor/GradientEditor2.cs
@@ -5,7 +5,7 @@
 using UnityEditor;
 using UnityEngine;
 
-namespace Thry
+namespace Hoyo
 {
     public class GradientEditor2 : EditorWindow
     {

diff --git a/Scripts/ThryEditor/Editor/Helper.cs → Scripts/HoyoGUI/Editor/Helper.cs b/Scripts/ThryEditor/Editor/Helper.cs → Scripts/HoyoGUI/Editor/Helper.cs
@@ -1,5 +1,5 @@
 // Material/Shader Inspector for Unity 2017/2018
-// Copyright (C) 2019 Thryrallo
+// Copyright (C) 2023 Thryrallo & Meliodas
 
 using System;
 using System.Collections;
@@ -20,7 +20,7 @@
 using UnityEngine.Networking;
 using UnityEngine.Profiling;
 
-namespace Thry
+namespace Hoyo
 {
     static class StringExtensions
     {

diff --git a/Scripts/ThryEditor/Editor/HelperWeb.cs → Scripts/HoyoGUI/Editor/HelperWeb.cs b/Scripts/ThryEditor/Editor/HelperWeb.cs → Scripts/HoyoGUI/Editor/HelperWeb.cs
@@ -1,5 +1,5 @@
 // Material/Shader Inspector for Unity 2017/2018
-// Copyright (C) 2019 Thryrallo
+// Copyright (C) 2023 Thryrallo & Meliodas
 
 using System;
 using System.Collections;
@@ -13,7 +13,7 @@
 using UnityEngine;
 using UnityEngine.Networking;
 
-namespace Thry
+namespace Hoyo
 {
     public class WebHelper
     {

diff --git a/Scripts/ThryEditor/Editor/Localization.cs → Scripts/HoyoGUI/Editor/Localization.cs b/Scripts/ThryEditor/Editor/Localization.cs → Scripts/HoyoGUI/Editor/Localization.cs
@@ -7,7 +7,7 @@
 using UnityEditor;
 using UnityEngine;
 
-namespace Thry{
+namespace Hoyo{
     public class Localization : ScriptableObject
     {
         [SerializeField] Shader[] ValidateWithShaders;

diff --git a/Scripts/ThryEditor/Editor/MaterialLinker.cs → Scripts/HoyoGUI/Editor/MaterialLinker.cs b/Scripts/ThryEditor/Editor/MaterialLinker.cs → Scripts/HoyoGUI/Editor/MaterialLinker.cs
@@ -3,7 +3,7 @@
 using UnityEditor;
 using UnityEngine;
 
-namespace Thry
+namespace Hoyo
 {
     public class MaterialLinker
     {

diff --git a/Scripts/ThryEditor/Editor/Mediator.cs → Scripts/HoyoGUI/Editor/Mediator.cs b/Scripts/ThryEditor/Editor/Mediator.cs → Scripts/HoyoGUI/Editor/Mediator.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using UnityEngine;
 
-namespace Thry
+namespace Hoyo
 {
     public class Mediator
     {

diff --git a/Scripts/ThryEditor/Editor/Parser.cs → Scripts/HoyoGUI/Editor/Parser.cs b/Scripts/ThryEditor/Editor/Parser.cs → Scripts/HoyoGUI/Editor/Parser.cs
@@ -1,5 +1,5 @@
 // Material/Shader Inspector for Unity 2017/2018
-// Copyright (C) 2019 Thryrallo
+// Copyright (C) 2023 Thryrallo & Meliodas
 
 using System;
 using System.Collections;
@@ -10,7 +10,7 @@
 using UnityEditor;
 using UnityEngine;
 
-namespace Thry
+namespace Hoyo
 {
     public class Parser
     {

diff --git a/Scripts/ThryEditor/Editor/ParserTests.txt → Scripts/HoyoGUI/Editor/ParserTests.txt b/Scripts/ThryEditor/Editor/ParserTests.txt → Scripts/HoyoGUI/Editor/ParserTests.txt
diff --git a/Scripts/ThryEditor/Editor/Presets.cs → Scripts/HoyoGUI/Editor/Presets.cs b/Scripts/ThryEditor/Editor/Presets.cs → Scripts/HoyoGUI/Editor/Presets.cs
@@ -6,7 +6,7 @@
 using UnityEditor;
 using UnityEngine;
 
-namespace Thry.ThryEditor
+namespace Hoyo.ThryEditor
 {
     public class Presets : AssetPostprocessor
     {

diff --git a/Scripts/ThryEditor/Editor/Settings.cs → Scripts/HoyoGUI/Editor/Settings.cs b/Scripts/ThryEditor/Editor/Settings.cs → Scripts/HoyoGUI/Editor/Settings.cs
@@ -1,5 +1,5 @@
 // Material/Shader Inspector for Unity 2017/2018
-// Copyright (C) 2019 Thryrallo
+// Copyright (C) 2023 Thryrallo & Meliodas
 
 using System;
 using System.Collections;
@@ -11,7 +11,7 @@
 using UnityEditor.PackageManager;
 using UnityEngine;
 
-namespace Thry
+namespace Hoyo
 {
     public abstract class ModuleSettings
     {
@@ -74,7 +74,7 @@ private void InitVariables()
             _is_init = true;
 
             if (thry_message == null)
-                WebHelper.DownloadStringASync(Thry.URL.SETTINGS_MESSAGE_URL, (Action<string>)delegate (string s) { thry_message = Parser.Deserialize<ButtonData>(s); });
+                WebHelper.DownloadStringASync(Hoyo.URL.SETTINGS_MESSAGE_URL, (Action<string>)delegate (string s) { thry_message = Parser.Deserialize<ButtonData>(s); });
         }
 
         //------------------Main GUI

diff --git a/Scripts/ThryEditor/Editor/ShaderOptimizer.cs → Scripts/HoyoGUI/Editor/ShaderOptimizer.cs b/Scripts/ThryEditor/Editor/ShaderOptimizer.cs → Scripts/HoyoGUI/Editor/ShaderOptimizer.cs
@@ -48,7 +48,7 @@
 using VRC.SDK3.Avatars.Components;
 #endif
 
-namespace Thry
+namespace Hoyo
 {
 
     public enum LightMode
@@ -1996,7 +1996,7 @@ public void OnProcessShader(Shader shader, UnityEditor.Rendering.ShaderSnippetDa
                     return;
 
                 // Strip shaders from the build under the following conditions:
-                // - Has the property "shader_is_using_thry_editor", which should be present on all shaders using ThryEditor (even if it's not using the optimizer)
+                // - Has the property "shader_is_using_thry_editor", which should be present on all shaders using HoyoEditor (even if it's not using the optimizer)
                 // - Has the property "_ShaderOptimizerEnabled", indicating the shader is using the optimizer
                 // - Doesn't have a name starting with "Hidden/Locked/", indicating the shader is unlocked
                 bool shouldStrip = shader.FindPropertyIndex("shader_is_using_thry_editor") >= 0 && shader.FindPropertyIndex("_ShaderOptimizerEnabled") >= 0 && !shader.name.StartsWith("Hidden/Locked/");

diff --git a/...pts/ThryEditor/Editor/ShaderTranslator.cs → Scripts/HoyoGUI/Editor/ShaderTranslator.cs b/...pts/ThryEditor/Editor/ShaderTranslator.cs → Scripts/HoyoGUI/Editor/ShaderTranslator.cs
@@ -6,9 +6,9 @@
 using System.Text.RegularExpressions;
 using UnityEditor;
 using UnityEngine;
-using static Thry.ThryEditor.ShaderTranslator;
+using static Hoyo.ThryEditor.ShaderTranslator;
 
-namespace Thry.ThryEditor
+namespace Hoyo.ThryEditor
 {
     public class ShaderTranslator : ScriptableObject
     {

diff --git a/Scripts/ThryEditor/Editor/Styles.cs → Scripts/HoyoGUI/Editor/Styles.cs b/Scripts/ThryEditor/Editor/Styles.cs → Scripts/HoyoGUI/Editor/Styles.cs
@@ -1,13 +1,13 @@
 // Material/Shader Inspector for Unity 2017/2018
-// Copyright (C) 2019 Thryrallo
+// Copyright (C) 2023 Thryrallo & Meliodas
 
 using System;
 using System.Collections;
 using System.Collections.Generic;
 using UnityEditor;
 using UnityEngine;
 
-namespace Thry
+namespace Hoyo
 {
     public class Styles
     {

diff --git a/Scripts/ThryEditor/Editor/TexturePacker.cs → Scripts/HoyoGUI/Editor/TexturePacker.cs b/Scripts/ThryEditor/Editor/TexturePacker.cs → Scripts/HoyoGUI/Editor/TexturePacker.cs
@@ -6,7 +6,7 @@
 using UnityEditor;
 using UnityEngine;
 
-namespace Thry
+namespace Hoyo
 {
     public class TexturePacker : EditorWindow
     {

diff --git a/.../ThryEditor/Editor/TexturePackerConfig.cs → ...pts/HoyoGUI/Editor/TexturePackerConfig.cs b/.../ThryEditor/Editor/TexturePackerConfig.cs → ...pts/HoyoGUI/Editor/TexturePackerConfig.cs
@@ -1,9 +1,9 @@
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
-using static Thry.TexturePacker;
+using static Hoyo.TexturePacker;
 
-namespace Thry
+namespace Hoyo
 {
     public class TexturePackerConfig : ScriptableObject
     {

diff --git a/...itor/Editor/ThryAssemblyDefinition.asmdef → ...oGUI/Editor/ThryAssemblyDefinition.asmdef b/...itor/Editor/ThryAssemblyDefinition.asmdef → ...oGUI/Editor/ThryAssemblyDefinition.asmdef
@@ -1,5 +1,5 @@
 {
-    "name": "ThryAssemblyDefinitionMeli",
+    "name": "ThryAssemblyDefinitionHoyoToon",
     "references": [],
     "includePlatforms": [
         "Editor"

diff --git a/Scripts/ThryEditor/Editor/ThryEditor.cs → Scripts/HoyoGUI/Editor/ThryEditor.cs b/Scripts/ThryEditor/Editor/ThryEditor.cs → Scripts/HoyoGUI/Editor/ThryEditor.cs
@@ -1,18 +1,18 @@
 // Material/Shader Inspector for Unity 2017/2018
-// Copyright (C) 2019 Thryrallo
+// Copyright (C) 2023 Thryrallo & Meliodas
 
 using System.Collections.Generic;
 using System.IO;
 using System.Text.RegularExpressions;
 using UnityEditor;
 using UnityEngine;
-using Thry;
+using Hoyo;
 using System;
 using System.Reflection;
 using System.Linq;
-using Thry.ThryEditor;
+using Hoyo.ThryEditor;
 
-namespace Thry
+namespace Hoyo
 {
     public class ShaderEditor : ShaderGUI
     {
@@ -118,7 +118,7 @@ public bool HasMixedCustomPropertySuffix
                     return labels;
                 }
                 string path = AssetDatabase.GUIDToAssetPath(guids[0]);
-                string[] data = Regex.Split(Thry.FileHelper.ReadFileIntoString(path), @"\r?\n");
+                string[] data = Regex.Split(Hoyo.FileHelper.ReadFileIntoString(path), @"\r?\n");
                 foreach (string d in data)
                 {
                     string[] set = Regex.Split(d, ":=");

diff --git a/Scripts/ThryEditor/Editor/ThryFileBuilder.cs → Scripts/HoyoGUI/Editor/ThryFileBuilder.cs b/Scripts/ThryEditor/Editor/ThryFileBuilder.cs → Scripts/HoyoGUI/Editor/ThryFileBuilder.cs
@@ -5,7 +5,7 @@
 using UnityEditor;
 using UnityEngine;
 
-namespace Thry {
+namespace Hoyo {
     public class ThryFileCreator {
 
         [MenuItem("Thry/ShaderUI/UI Creator Helper/Create Label Boiler", false, priority = 40)]

diff --git a/...ryEditor/Editor/ThryTexturePacker.compute → .../HoyoGUI/Editor/ThryTexturePacker.compute b/...ryEditor/Editor/ThryTexturePacker.compute → .../HoyoGUI/Editor/ThryTexturePacker.compute
diff --git a/Scripts/ThryEditor/Editor/UnitTests.cs → Scripts/HoyoGUI/Editor/UnitTests.cs b/Scripts/ThryEditor/Editor/UnitTests.cs → Scripts/HoyoGUI/Editor/UnitTests.cs
@@ -4,7 +4,7 @@
 using UnityEditor;
 using UnityEngine;
 
-namespace Thry
+namespace Hoyo
 {
     public class UnitTests
     {

diff --git a/Scripts/ThryEditor/Editor/Unity.cs → Scripts/HoyoGUI/Editor/UnityHY.cs b/Scripts/ThryEditor/Editor/Unity.cs → Scripts/HoyoGUI/Editor/UnityHY.cs
@@ -1,5 +1,5 @@
 // Material/Shader Inspector for Unity 2017/2018
-// Copyright (C) 2019 Thryrallo
+// Copyright (C) 2023 Thryrallo & Meliodas
 
 using System;
 using System.Collections;
@@ -10,7 +10,7 @@
 using UnityEditor;
 using UnityEngine;
 
-namespace Thry
+namespace Hoyo
 {
     public class UnityHelper
     {

diff --git a/Scripts/ThryEditor/Examples/Example1.shader → Scripts/HoyoGUI/Examples/Example1.shader b/Scripts/ThryEditor/Examples/Example1.shader → Scripts/HoyoGUI/Examples/Example1.shader
diff --git a/Scripts/ThryEditor/Examples/Example2.shader → Scripts/HoyoGUI/Examples/Example2.shader b/Scripts/ThryEditor/Examples/Example2.shader → Scripts/HoyoGUI/Examples/Example2.shader
diff --git a/.../ThryEditor/Examples/ThryLabelExample.txt → ...pts/HoyoGUI/Examples/ThryLabelExample.txt b/.../ThryEditor/Examples/ThryLabelExample.txt → ...pts/HoyoGUI/Examples/ThryLabelExample.txt
diff --git a/...hryEditor/Examples/ThryPresetsExample.txt → ...s/HoyoGUI/Examples/ThryPresetsExample.txt b/...hryEditor/Examples/ThryPresetsExample.txt → ...s/HoyoGUI/Examples/ThryPresetsExample.txt
diff --git a/...ryEditor/Examples/thry_locale_example.csv → .../HoyoGUI/Examples/thry_locale_example.csv b/...ryEditor/Examples/thry_locale_example.csv → .../HoyoGUI/Examples/thry_locale_example.csv
diff --git a/Scripts/ThryEditor/LICENSE → Scripts/HoyoGUI/LICENSE b/Scripts/ThryEditor/LICENSE → Scripts/HoyoGUI/LICENSE
diff --git a/Scripts/ThryEditor/README.md → Scripts/HoyoGUI/README.md b/Scripts/ThryEditor/README.md → Scripts/HoyoGUI/README.md
diff --git a/Scripts/ThryEditor/Resources/decal_gizmo.png → Scripts/HoyoGUI/Resources/decal_gizmo.png b/Scripts/ThryEditor/Resources/decal_gizmo.png → Scripts/HoyoGUI/Resources/decal_gizmo.png
diff --git a/...yEditor/Resources/thryEditor_iconThry.png → ...HoyoGUI/Resources/thryEditor_iconThry.png b/...yEditor/Resources/thryEditor_iconThry.png → ...HoyoGUI/Resources/thryEditor_iconThry.png
diff --git a/.../ThryEditor/Resources/thryEditor_link.png → ...pts/HoyoGUI/Resources/thryEditor_link.png b/.../ThryEditor/Resources/thryEditor_link.png → ...pts/HoyoGUI/Resources/thryEditor_link.png
diff --git a/Scripts/ThryEditor/docs.html → Scripts/HoyoGUI/docs.html b/Scripts/ThryEditor/docs.html → Scripts/HoyoGUI/docs.html
diff --git a/Scripts/ThryEditor/thry_editor_locale.csv → Scripts/HoyoGUI/thry_editor_locale.csv b/Scripts/ThryEditor/thry_editor_locale.csv → Scripts/HoyoGUI/thry_editor_locale.csv