Task/1090 promotion issue (#109)

* * The next version is 0.6.1-preview * ModelToonEvAdsutemnt should be internal. * Fixed typo, Bigginer to Beginner. * removed sample.json under Samples~ folder. * Reverted LegacyGraphicsTest-2019.4 project setting files.
Unity-Technologies · Feb 23, 2022 · afacdd3 · afacdd3
1 parent 71a6e3b
commit afacdd3
Show file tree

Hide file tree

Showing 10 changed files with 18 additions and 32 deletions.
diff --git a/com.unity.toonshader/CHANGELOG.md b/com.unity.toonshader/CHANGELOG.md
@@ -1,4 +1,10 @@
 # Changelog
+## [0.6.1-preview] - 2022-02-24
+### Fixed:
+* typo in inspector.
+* removed .sample.json under Samples~ folder
+* Some unnecessary classes were public.
+
 ## [0.6.0-preview] - 2022-02-22
 ### Updated:
 * Replaced test VM to use gtx1080

diff --git a/com.unity.toonshader/Editor/ModelToonEvAdjustmentInspector.cs b/com.unity.toonshader/Editor/ModelToonEvAdjustmentInspector.cs
@@ -7,7 +7,7 @@ namespace UnityEditor.Rendering.Toon
 {
     [CustomEditor(typeof(ModelToonEvAdjustment))]
 
-    public class ModelToonEvAdjustmentInspector : Editor
+    internal class ModelToonEvAdjustmentInspector : Editor
     {
         SerializedObject m_SerializedObject;
 

diff --git a/com.unity.toonshader/Editor/UTS_GUIBase.cs b/com.unity.toonshader/Editor/UTS_GUIBase.cs
@@ -29,7 +29,7 @@ internal class UTS_GUIBase : UnityEditor.ShaderGUI
     {
         protected const float kVersionX = 0.0f;
         protected const float kVersionY = 6.0f;
-        protected const float kVersionZ = 0.0f;
+        protected const float kVersionZ = 1.0f;
 
         internal virtual string srpDefaultLightModeName { get; }
         internal virtual void TessellationSetting(Material materal) { }
@@ -901,7 +901,7 @@ public override void OnGUI(MaterialEditor materialEditor, MaterialProperty[] pro
                 }
                 else if (selectedUI == 1)
                 {
-                    _SimpleUI = true;   //UTS2 Biginner GUI
+                    _SimpleUI = true;   //UTS2 Beginner GUI
                 }
                 //Original/Custom GUI toggle button.
                 if (_OriginalInspector)
@@ -1405,7 +1405,7 @@ void GUI_OptionMenu(Material material)
             {
                 if (material.GetInt(ShaderPropSimpleUI) == 1)
                 {
-                    _SimpleUI = true; //UTS2 Custom GUI Biginner
+                    _SimpleUI = true; //UTS2 Custom GUI Beginner
                 }
                 else
                 {
@@ -1420,12 +1420,12 @@ void GUI_OptionMenu(Material material)
             {
                 if (GUILayout.Button("Pro / Full Control", middleButtonStyle))
                 {
-                    material.SetInt(ShaderPropSimpleUI, 1); //UTS2 Custom GUI Biginner
+                    material.SetInt(ShaderPropSimpleUI, 1); //UTS2 Custom GUI Beginner
                 }
             }
             else
             {
-                if (GUILayout.Button("Biginner", middleButtonStyle))
+                if (GUILayout.Button("Beginner", middleButtonStyle))
                 {
                     material.SetInt(ShaderPropSimpleUI, 0); //UTS2 Custom GUI Pro
                 }

diff --git a/com.unity.toonshader/Runtime/HDRP/Shaders/HDRPToon.shader b/com.unity.toonshader/Runtime/HDRP/Shaders/HDRPToon.shader
@@ -14,7 +14,7 @@ Shader "HDRP/Toon"
         [HideInInspector] [Enum(OFF, 0, ON, 1)] _isUnityToonshader("Material is touched by Unity Toon Shader", Int) = 1
         [HideInInspector] _utsVersionX("VersionX", Float) = 0
         [HideInInspector] _utsVersionY("VersionY", Float) = 6
-        [HideInInspector] _utsVersionZ("VersionZ", Float) = 0
+        [HideInInspector] _utsVersionZ("VersionZ", Float) = 1
 
 
         // Reminder. Color here are in linear but the UI (color picker) do the conversion sRGB to linear

diff --git a/com.unity.toonshader/Runtime/HDRP/Shaders/HDRPToonTessellation.shader b/com.unity.toonshader/Runtime/HDRP/Shaders/HDRPToonTessellation.shader
@@ -14,7 +14,7 @@ Shader "HDRP/ToonTessellation"
         [HideInInspector] [Enum(OFF, 0, ON, 1)] _isUnityToonshader("Material is touched by Unity Toon Shader", Int) = 1
         [HideInInspector] _utsVersionX("VersionX", Float) = 0
         [HideInInspector] _utsVersionY("VersionY", Float) = 6
-        [HideInInspector] _utsVersionZ("VersionZ", Float) = 0
+        [HideInInspector] _utsVersionZ("VersionZ", Float) = 1
 
 
         // Reminder. Color here are in linear but the UI (color picker) do the conversion sRGB to linear

diff --git a/com.unity.toonshader/Runtime/Legacy/Shaders/LegacyToon.shader b/com.unity.toonshader/Runtime/Legacy/Shaders/LegacyToon.shader
@@ -8,7 +8,7 @@ Shader "Toon (Built-in)" {
         [HideInInspector][Enum(OFF, 0, ON, 1)] _isUnityToonshader("Material is touched by Unity Toon Shader", Int) = 1
         [HideInInspector] _utsVersionX("VersionX", Float) = 0
         [HideInInspector] _utsVersionY("VersionY", Float) = 6
-        [HideInInspector] _utsVersionZ("VersionZ", Float) = 0
+        [HideInInspector] _utsVersionZ("VersionZ", Float) = 1
         [HideInInspector] _utsTechnique ("Technique", int ) = 0 //DWF
         [HideInInspector] _AutoRenderQueue("Automatic Render Queue ", int) = 1
 

diff --git a/com.unity.toonshader/Runtime/Legacy/Shaders/LegacyToonTessellation.shader b/com.unity.toonshader/Runtime/Legacy/Shaders/LegacyToonTessellation.shader
@@ -8,7 +8,7 @@ Shader "ToonTessellation (Built-in)" {
         [HideInInspector][Enum(OFF, 0, ON, 1)] _isUnityToonshader("Material is touched by Unity Toon Shader", Int) = 1
         [HideInInspector] _utsVersionX("VersionX", Float) = 0
         [HideInInspector] _utsVersionY("VersionY", Float) = 6
-        [HideInInspector] _utsVersionZ("VersionZ", Float) = 0
+        [HideInInspector] _utsVersionZ("VersionZ", Float) = 1
         [HideInInspector] _utsTechnique ("Technique", int ) = 0 //DWF
         [HideInInspector] _AutoRenderQueue("Automatic Render Queue ", int) = 1
 

diff --git a/com.unity.toonshader/Runtime/UniversalRP/Shaders/UniversalToon.shader b/com.unity.toonshader/Runtime/UniversalRP/Shaders/UniversalToon.shader
@@ -9,7 +9,7 @@ Shader "Universal Render Pipeline/Toon" {
         [HideInInspector] [Enum(OFF, 0, ON, 1)] _isUnityToonshader("Material is touched by Unity Toon Shader", Int) = 1
         [HideInInspector] _utsVersionX("VersionX", Float) = 0
         [HideInInspector] _utsVersionY("VersionY", Float) = 6
-        [HideInInspector] _utsVersionZ("VersionZ", Float) = 0
+        [HideInInspector] _utsVersionZ("VersionZ", Float) = 1
 
         [HideInInspector] _utsTechnique("Technique", int) = 0 //DWF
         [HideInInspector] _AutoRenderQueue("Automatic Render Queue ", int) = 1

diff --git a/com.unity.toonshader/Samples~/.sample.json b/com.unity.toonshader/Samples~/.sample.json
diff --git a/com.unity.toonshader/package.json b/com.unity.toonshader/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "com.unity.toonshader",
 	"displayName":"Unity Toon Shader",
-	"version": "0.6.0-preview",
+	"version": "0.6.1-preview",
 	"unity": "2019.4",
 	"description": "Unity Toon Shader (Unity-Chan Toon Shader 3) is a toon shader for images and video that is designed to meet the needs of creators working on cel-shaded 3DCG animations.\nUnlike other pre-render toon shaders, all features can be adjusted in real time on Unity, which is the greatest feature of UTS.\n\nUTS has great power and makes a wide variety of character designs possible, from cel-shaded to light novel illustration styles.\n\nUTS has the 3 basic layers of Base Color, 1st Shade Color, and 2nd Shade Color, colors and textures can also accept a wide variety of customization options, such as High Color, Rim Light, MatCap (sphere mapping), and Emissive (light emission).The level of gradation (feather) between colors can also be adjusted in Unity in real-time.\n\nMore precisely, View documentation above.",
     "samples": [