TimelineImprovements
This commit is contained in:
1 parent
e312131725
commit
f927552adc
2211 files changed
+115416
-540944
No files matched your search
@@ -13,6 +13,6 @@ AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 178415
|
||||
packageName: MK Toon - Stylized Shader
|
||||
packageVersion: 3.5.0C
|
||||
packageVersion: 3.5.0D
|
||||
assetPath: Assets/MK/MKToon/Editor/Base/FeatureComponents/OutlineComponent.cs
|
||||
uploadId: 1012352
|
||||
uploadId: 1023756
|
||||
@@ -18,7 +18,11 @@ using EditorHelper = MK.Toon.Editor.EditorHelper;
|
||||
|
||||
namespace MK.Toon.Editor
|
||||
{
|
||||
#if UNITY_6000_5_OR_NEWER
|
||||
internal sealed partial class ParticlesComponent : ShaderGUI
|
||||
#else
|
||||
internal sealed class ParticlesComponent : ShaderGUI
|
||||
#endif
|
||||
{
|
||||
internal bool active { get { return _particlesBehavior != null; } }
|
||||
|
||||
|
||||
@@ -13,6 +13,6 @@ AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 178415
|
||||
packageName: MK Toon - Stylized Shader
|
||||
packageVersion: 3.5.0C
|
||||
packageVersion: 3.5.0D
|
||||
assetPath: Assets/MK/MKToon/Editor/Base/FeatureComponents/ParticlesComponent.cs
|
||||
uploadId: 1012352
|
||||
uploadId: 1023756
|
||||
@@ -13,6 +13,6 @@ AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 178415
|
||||
packageName: MK Toon - Stylized Shader
|
||||
packageVersion: 3.5.0C
|
||||
packageVersion: 3.5.0D
|
||||
assetPath: Assets/MK/MKToon/Editor/Base/FeatureComponents/RefractionComponent.cs
|
||||
uploadId: 1012352
|
||||
uploadId: 1023756
|
||||
@@ -13,6 +13,6 @@ AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 178415
|
||||
packageName: MK Toon - Stylized Shader
|
||||
packageVersion: 3.5.0C
|
||||
packageVersion: 3.5.0D
|
||||
assetPath: Assets/MK/MKToon/Editor/Base/PhysicallyBasedEditorBase.cs
|
||||
uploadId: 1012352
|
||||
uploadId: 1023756
|
||||
@@ -13,6 +13,6 @@ AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 178415
|
||||
packageName: MK Toon - Stylized Shader
|
||||
packageVersion: 3.5.0C
|
||||
packageVersion: 3.5.0D
|
||||
assetPath: Assets/MK/MKToon/Editor/Base/SimpleEditorBase.cs
|
||||
uploadId: 1012352
|
||||
uploadId: 1023756
|
||||
@@ -102,6 +102,7 @@ namespace MK.Toon.Editor
|
||||
/////////////////
|
||||
// Advanced //
|
||||
/////////////////
|
||||
protected MaterialProperty _transparentReceiveFog;
|
||||
protected MaterialProperty _screenSpaceReflections;
|
||||
protected MaterialProperty _screenSpaceReflectionsContributeTransparent;
|
||||
protected MaterialProperty _renderPriority;
|
||||
@@ -189,6 +190,7 @@ namespace MK.Toon.Editor
|
||||
_dissolveBorderSize = FindProperty(Properties.dissolveBorderSize.uniform.name, props);
|
||||
_dissolveBorderColor = FindProperty(Properties.dissolveBorderColor.uniform.name, props);
|
||||
|
||||
_transparentReceiveFog = FindProperty(Properties.transparentReceiveFog.uniform.name, props, false);
|
||||
_screenSpaceReflectionsContributeTransparent = FindProperty(Properties.screenSpaceReflectionsContributeTransparent.uniform.name, props, false);
|
||||
_renderPriority = FindProperty(Properties.renderPriority.uniform.name, props);
|
||||
_alembicMotionVectors = FindProperty(Properties.alembicMotionVectors.uniform.name, props, false);
|
||||
@@ -688,8 +690,12 @@ namespace MK.Toon.Editor
|
||||
|
||||
protected void DrawScreenSpaceReflections(MaterialEditor materialEditor, Material material)
|
||||
{
|
||||
#if URP_SCREEN_SPACE_REFLECTION
|
||||
bool isTransparent = material.renderQueue >= (int) UnityEngine.Rendering.RenderQueue.Transparent;
|
||||
#if MK_URP && UNITY_6000_6_OR_NEWER
|
||||
bool isTransparent = Properties.surface.GetValue(material) == Surface.Transparent;
|
||||
#if UNITY_6000_7_OR_NEWER
|
||||
if(_transparentReceiveFog != null && isTransparent)
|
||||
materialEditor.ShaderProperty(_transparentReceiveFog, "Receive Fog");
|
||||
#endif
|
||||
if(_screenSpaceReflections != null)
|
||||
materialEditor.ShaderProperty(_screenSpaceReflections, UI.screenSpaceReflections);
|
||||
if(_screenSpaceReflectionsContributeTransparent != null && isTransparent)
|
||||
@@ -824,12 +830,12 @@ namespace MK.Toon.Editor
|
||||
|
||||
private void ManageKeywordsScreenSpaceReflections(Material material)
|
||||
{
|
||||
#if URP_SCREEN_SPACE_REFLECTION
|
||||
bool isTransparent = material.renderQueue >= (int) UnityEngine.Rendering.RenderQueue.Transparent;
|
||||
#if MK_URP && UNITY_6000_6_OR_NEWER
|
||||
bool isTransparent = Properties.surface.GetValue(material) == Surface.Transparent;
|
||||
if(_screenSpaceReflections != null)
|
||||
EditorHelper.SetKeyword(Properties.screenSpaceReflections.GetValue(material) == false, "_SCREENSPACEREFLECTIONS_OFF", material);
|
||||
if(_screenSpaceReflectionsContributeTransparent != null && isTransparent)
|
||||
EditorHelper.SetKeyword(Properties.screenSpaceReflectionsContributeTransparent.GetValue(material) == false && material.renderQueue >= (int) UnityEngine.Rendering.RenderQueue.Transparent, "_SCREENSPACEREFLECTIONSCONTRIBUTETRANSPARENT_OFF", material);
|
||||
if(_screenSpaceReflectionsContributeTransparent != null)
|
||||
EditorHelper.SetKeyword(Properties.screenSpaceReflectionsContributeTransparent.GetValue(material) == false && isTransparent, "_SCREENSPACEREFLECTIONSCONTRIBUTETRANSPARENT_OFF", material);
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
@@ -13,6 +13,6 @@ AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 178415
|
||||
packageName: MK Toon - Stylized Shader
|
||||
packageVersion: 3.5.0C
|
||||
packageVersion: 3.5.0D
|
||||
assetPath: Assets/MK/MKToon/Editor/Base/UnlitEditorBase.cs
|
||||
uploadId: 1012352
|
||||
uploadId: 1023756
|
||||
@@ -193,6 +193,6 @@ AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 178415
|
||||
packageName: MK Toon - Stylized Shader
|
||||
packageVersion: 3.5.0C
|
||||
packageVersion: 3.5.0D
|
||||
assetPath: Assets/MK/MKToon/Editor/CardImage.png
|
||||
uploadId: 1012352
|
||||
uploadId: 1023756
|
||||
@@ -13,6 +13,6 @@ AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 178415
|
||||
packageName: MK Toon - Stylized Shader
|
||||
packageVersion: 3.5.0C
|
||||
packageVersion: 3.5.0D
|
||||
assetPath: Assets/MK/MKToon/Editor/Common.cs
|
||||
uploadId: 1012352
|
||||
uploadId: 1023756
|
||||
@@ -23,7 +23,11 @@ using Configuration = MK.Toon.Editor.InstallWizard.Configuration;
|
||||
namespace MK.Toon.Editor.InstallWizard
|
||||
{
|
||||
//[CreateAssetMenu(fileName = "Configuration", menuName = "MK/Install Wizard/Create Configuration Asset")]
|
||||
#if UNITY_6000_5_OR_NEWER
|
||||
public sealed partial class Configuration : ScriptableObject
|
||||
#else
|
||||
public sealed class Configuration : ScriptableObject
|
||||
#endif
|
||||
{
|
||||
#pragma warning disable CS0414
|
||||
public static bool isReady
|
||||
@@ -168,7 +172,7 @@ namespace MK.Toon.Editor.InstallWizard
|
||||
}
|
||||
|
||||
#if UNITY_6000_5_OR_NEWER
|
||||
[Unity.Scripting.LifecycleManagement.AutoStaticsCleanup]
|
||||
[Unity.Scripting.LifecycleManagement.NoAutoStaticsCleanup]
|
||||
#endif
|
||||
private readonly static List<GlobalShaderFeatureBase> _globalShaderFeaturesTemplate = new List<GlobalShaderFeatureBase>()
|
||||
{
|
||||
|
||||
@@ -13,6 +13,6 @@ AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 178415
|
||||
packageName: MK Toon - Stylized Shader
|
||||
packageVersion: 3.5.0C
|
||||
packageVersion: 3.5.0D
|
||||
assetPath: Assets/MK/MKToon/Editor/Configuration.cs
|
||||
uploadId: 1012352
|
||||
uploadId: 1023756
|
||||
@@ -13,6 +13,6 @@ AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 178415
|
||||
packageName: MK Toon - Stylized Shader
|
||||
packageVersion: 3.5.0C
|
||||
packageVersion: 3.5.0D
|
||||
assetPath: Assets/MK/MKToon/Editor/GlobalShaderFeature.cs
|
||||
uploadId: 1012352
|
||||
uploadId: 1023756
|
||||
@@ -15,7 +15,11 @@ namespace MK.Toon.Editor
|
||||
public static partial class EditorHelper
|
||||
{
|
||||
//Based on unity builtin styles
|
||||
#if UNITY_6000_5_OR_NEWER
|
||||
internal static partial class EditorStyles
|
||||
#else
|
||||
internal static class EditorStyles
|
||||
#endif
|
||||
{
|
||||
internal static readonly GUIStyle rightAlignetLabel = new GUIStyle(UnityEditor.EditorStyles.label) { alignment = TextAnchor.MiddleRight };
|
||||
|
||||
|
||||
@@ -13,6 +13,6 @@ AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 178415
|
||||
packageName: MK Toon - Stylized Shader
|
||||
packageVersion: 3.5.0C
|
||||
packageVersion: 3.5.0D
|
||||
assetPath: Assets/MK/MKToon/Editor/Helper/EditorHelper.EditorStyles.cs
|
||||
uploadId: 1012352
|
||||
uploadId: 1023756
|
||||
@@ -13,6 +13,6 @@ AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 178415
|
||||
packageName: MK Toon - Stylized Shader
|
||||
packageVersion: 3.5.0C
|
||||
packageVersion: 3.5.0D
|
||||
assetPath: Assets/MK/MKToon/Editor/Helper/EditorHelper.cs
|
||||
uploadId: 1012352
|
||||
uploadId: 1023756
|
||||
@@ -13,6 +13,6 @@ AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 178415
|
||||
packageName: MK Toon - Stylized Shader
|
||||
packageVersion: 3.5.0C
|
||||
packageVersion: 3.5.0D
|
||||
assetPath: Assets/MK/MKToon/Editor/Helper/MKToonColorHDRRGBDrawer.cs
|
||||
uploadId: 1012352
|
||||
uploadId: 1023756
|
||||
@@ -13,6 +13,6 @@ AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 178415
|
||||
packageName: MK Toon - Stylized Shader
|
||||
packageVersion: 3.5.0C
|
||||
packageVersion: 3.5.0D
|
||||
assetPath: Assets/MK/MKToon/Editor/Helper/MKToonColorRGBDrawer.cs
|
||||
uploadId: 1012352
|
||||
uploadId: 1023756
|
||||
@@ -13,6 +13,6 @@ AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 178415
|
||||
packageName: MK Toon - Stylized Shader
|
||||
packageVersion: 3.5.0C
|
||||
packageVersion: 3.5.0D
|
||||
assetPath: Assets/MK/MKToon/Editor/Helper/MKToonFloatABSDrawer.cs
|
||||
uploadId: 1012352
|
||||
uploadId: 1023756
|
||||
@@ -13,6 +13,6 @@ AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 178415
|
||||
packageName: MK Toon - Stylized Shader
|
||||
packageVersion: 3.5.0C
|
||||
packageVersion: 3.5.0D
|
||||
assetPath: Assets/MK/MKToon/Editor/Helper/MKToonIntSliderDrawer.cs
|
||||
uploadId: 1012352
|
||||
uploadId: 1023756
|
||||
@@ -13,6 +13,6 @@ AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 178415
|
||||
packageName: MK Toon - Stylized Shader
|
||||
packageVersion: 3.5.0C
|
||||
packageVersion: 3.5.0D
|
||||
assetPath: Assets/MK/MKToon/Editor/Helper/MKToonIntVector3Drawer.cs
|
||||
uploadId: 1012352
|
||||
uploadId: 1023756
|
||||
@@ -13,6 +13,6 @@ AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 178415
|
||||
packageName: MK Toon - Stylized Shader
|
||||
packageVersion: 3.5.0C
|
||||
packageVersion: 3.5.0D
|
||||
assetPath: Assets/MK/MKToon/Editor/Helper/MaterialPropertyDrawer.cs
|
||||
uploadId: 1012352
|
||||
uploadId: 1023756
|
||||
@@ -15,14 +15,18 @@ using UnityEditor;
|
||||
using Configuration = MK.Toon.Editor.InstallWizard.Configuration;
|
||||
namespace MK.Toon.Editor.InstallWizard
|
||||
{
|
||||
#if UNITY_6000_5_OR_NEWER
|
||||
public sealed partial class InstallWizard : EditorWindow
|
||||
#else
|
||||
public sealed class InstallWizard : EditorWindow
|
||||
#endif
|
||||
{
|
||||
#if UNITY_6000_5_OR_NEWER
|
||||
[Unity.Scripting.LifecycleManagement.AutoStaticsCleanup]
|
||||
#endif
|
||||
public static InstallWizard instance = null;
|
||||
#pragma warning disable CS0414
|
||||
private static readonly string _version = "3.5.0C";
|
||||
private static readonly string _version = "3.5.0D";
|
||||
#pragma warning restore CS0414
|
||||
|
||||
private static readonly Vector2Int _referenceResolution = new Vector2Int(2560, 1440);
|
||||
|
||||
@@ -13,6 +13,6 @@ AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 178415
|
||||
packageName: MK Toon - Stylized Shader
|
||||
packageVersion: 3.5.0C
|
||||
packageVersion: 3.5.0D
|
||||
assetPath: Assets/MK/MKToon/Editor/InstallWizard.cs
|
||||
uploadId: 1012352
|
||||
uploadId: 1023756
|
||||
@@ -9,6 +9,6 @@ AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 178415
|
||||
packageName: MK Toon - Stylized Shader
|
||||
packageVersion: 3.5.0C
|
||||
packageVersion: 3.5.0D
|
||||
assetPath: Assets/MK/MKToon/Editor/MK.Toon.Editor.asmdef
|
||||
uploadId: 1012352
|
||||
uploadId: 1023756
|
||||
@@ -99,18 +99,18 @@ MonoBehaviour:
|
||||
- rid: 10
|
||||
- rid: 11
|
||||
_globalShaderFeaturesTemp:
|
||||
- rid: 294551663562981689
|
||||
- rid: 294551663562981690
|
||||
- rid: 294551663562981691
|
||||
- rid: 294551663562981692
|
||||
- rid: 294551663562981693
|
||||
- rid: 294551663562981694
|
||||
- rid: 294551663562981695
|
||||
- rid: 294551663562981696
|
||||
- rid: 294551663562981697
|
||||
- rid: 294551663562981698
|
||||
- rid: 294551663562981699
|
||||
- rid: 294551663562981700
|
||||
- rid: 3316590424316969158
|
||||
- rid: 3316590424316969159
|
||||
- rid: 3316590424316969160
|
||||
- rid: 3316590424316969161
|
||||
- rid: 3316590424316969162
|
||||
- rid: 3316590424316969163
|
||||
- rid: 3316590424316969164
|
||||
- rid: 3316590424316969165
|
||||
- rid: 3316590424316969166
|
||||
- rid: 3316590424316969167
|
||||
- rid: 3316590424316969168
|
||||
- rid: 3316590424316969169
|
||||
references:
|
||||
version: 2
|
||||
RefIds:
|
||||
@@ -244,7 +244,7 @@ MonoBehaviour:
|
||||
_compileDirectives: []
|
||||
_name: Linear Light Attenuation
|
||||
_tooltip: Changes the light attenuation for non-directional lights more linear (Approximately like builtin renderpipeline).
|
||||
- rid: 294551663562981689
|
||||
- rid: 3316590424316969158
|
||||
type: {class: GlobalShaderFeature, ns: MK.Toon.Editor, asm: MK.Toon.Editor}
|
||||
data:
|
||||
_mode: 0
|
||||
@@ -254,7 +254,7 @@ MonoBehaviour:
|
||||
_compileDirectives: []
|
||||
_name: Multiply vertex color with albedo
|
||||
_tooltip: Multiplies vertex color into the albedo Color.
|
||||
- rid: 294551663562981690
|
||||
- rid: 3316590424316969159
|
||||
type: {class: GlobalShaderFeature, ns: MK.Toon.Editor, asm: MK.Toon.Editor}
|
||||
data:
|
||||
_mode: 0
|
||||
@@ -270,7 +270,7 @@ MonoBehaviour:
|
||||
- MK_TOON_OUTLINE_FADING_INVERSE_EXPONENTIAL
|
||||
_name: Outline Distance Fading
|
||||
_tooltip: Enable outline distance based fading.
|
||||
- rid: 294551663562981691
|
||||
- rid: 3316590424316969160
|
||||
type: {class: GlobalShaderFeature, ns: MK.Toon.Editor, asm: MK.Toon.Editor}
|
||||
data:
|
||||
_mode: 0
|
||||
@@ -280,7 +280,7 @@ MonoBehaviour:
|
||||
_compileDirectives: []
|
||||
_name: Force Point Filtering
|
||||
_tooltip: Forces point filtering on textures.
|
||||
- rid: 294551663562981692
|
||||
- rid: 3316590424316969161
|
||||
type: {class: GlobalShaderFeature, ns: MK.Toon.Editor, asm: MK.Toon.Editor}
|
||||
data:
|
||||
_mode: 0
|
||||
@@ -290,7 +290,7 @@ MonoBehaviour:
|
||||
_compileDirectives: []
|
||||
_name: Dissolve Projection Screen Space
|
||||
_tooltip: Forces dissolve projection into screen space.
|
||||
- rid: 294551663562981693
|
||||
- rid: 3316590424316969162
|
||||
type: {class: GlobalShaderFeature, ns: MK.Toon.Editor, asm: MK.Toon.Editor}
|
||||
data:
|
||||
_mode: 1
|
||||
@@ -300,7 +300,7 @@ MonoBehaviour:
|
||||
_compileDirectives: []
|
||||
_name: Enable Local Antialiasing
|
||||
_tooltip: Enables local antialiasing except for mobile devices.
|
||||
- rid: 294551663562981694
|
||||
- rid: 3316590424316969163
|
||||
type: {class: GlobalShaderFeature, ns: MK.Toon.Editor, asm: MK.Toon.Editor}
|
||||
data:
|
||||
_mode: 0
|
||||
@@ -312,7 +312,7 @@ MonoBehaviour:
|
||||
- MK_TOON_ALLOW_DETAIL_MAPS_UV_7
|
||||
_name: Detail UV Sets
|
||||
_tooltip: Enable a secondary uv set for the detail albedo and normal maps.
|
||||
- rid: 294551663562981695
|
||||
- rid: 3316590424316969164
|
||||
type: {class: GlobalShaderFeature, ns: MK.Toon.Editor, asm: MK.Toon.Editor}
|
||||
data:
|
||||
_mode: 0
|
||||
@@ -324,7 +324,7 @@ MonoBehaviour:
|
||||
- MK_TOON_STYLIZE_SYSTEM_SHADOWS
|
||||
_name: Stylize System Shadows
|
||||
_tooltip: Stylizes the system shadows like the lighting. Be careful with the thresholds!
|
||||
- rid: 294551663562981696
|
||||
- rid: 3316590424316969165
|
||||
type: {class: GlobalShaderFeature, ns: MK.Toon.Editor, asm: MK.Toon.Editor}
|
||||
data:
|
||||
_mode: 0
|
||||
@@ -334,7 +334,7 @@ MonoBehaviour:
|
||||
_compileDirectives: []
|
||||
_name: Legacy Noise
|
||||
_tooltip: Enables the legacy noise calculation for animation and outline noise.
|
||||
- rid: 294551663562981697
|
||||
- rid: 3316590424316969166
|
||||
type: {class: GlobalShaderFeature, ns: MK.Toon.Editor, asm: MK.Toon.Editor}
|
||||
data:
|
||||
_mode: 0
|
||||
@@ -344,7 +344,7 @@ MonoBehaviour:
|
||||
_compileDirectives: []
|
||||
_name: Regular Screen Space UV
|
||||
_tooltip: Enables the regular screen space uv for screen spaced effects instead MK Toons customized screen space uv.
|
||||
- rid: 294551663562981698
|
||||
- rid: 3316590424316969167
|
||||
type: {class: GlobalShaderFeature, ns: MK.Toon.Editor, asm: MK.Toon.Editor}
|
||||
data:
|
||||
_mode: 0
|
||||
@@ -354,7 +354,7 @@ MonoBehaviour:
|
||||
_compileDirectives: []
|
||||
_name: Legacy Screen Scaling
|
||||
_tooltip: Enables legacy screen spaced scaling for artistic textures and outlines in clip space.
|
||||
- rid: 294551663562981699
|
||||
- rid: 3316590424316969168
|
||||
type: {class: GlobalShaderFeature, ns: MK.Toon.Editor, asm: MK.Toon.Editor}
|
||||
data:
|
||||
_mode: 0
|
||||
@@ -364,7 +364,7 @@ MonoBehaviour:
|
||||
_compileDirectives: []
|
||||
_name: Multi Pass Scaling
|
||||
_tooltip: "Enables correct scaling for artistic textures and outlines in clip space. \n\n This should only be enabled if your XR Render Mode is set to \"Multi Pass\". \n\n This is required because there is no workaround to detect the \"Multi Pass\" rendering mode, when using XR."
|
||||
- rid: 294551663562981700
|
||||
- rid: 3316590424316969169
|
||||
type: {class: GlobalShaderFeature, ns: MK.Toon.Editor, asm: MK.Toon.Editor}
|
||||
data:
|
||||
_mode: 0
|
||||
|
||||
@@ -10,6 +10,6 @@ AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 178415
|
||||
packageName: MK Toon - Stylized Shader
|
||||
packageVersion: 3.5.0C
|
||||
packageVersion: 3.5.0D
|
||||
assetPath: Assets/MK/MKToon/Editor/MKToonConfiguration.asset
|
||||
uploadId: 1012352
|
||||
uploadId: 1023756
|
||||
@@ -13,6 +13,6 @@ AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 178415
|
||||
packageName: MK Toon - Stylized Shader
|
||||
packageVersion: 3.5.0C
|
||||
packageVersion: 3.5.0D
|
||||
assetPath: Assets/MK/MKToon/Editor/MaterialUpgrader.cs
|
||||
uploadId: 1012352
|
||||
uploadId: 1023756
|
||||
@@ -11,41 +11,45 @@ using MK.Toon;
|
||||
|
||||
namespace MK.Toon.Editor
|
||||
{
|
||||
#if UNITY_6000_5_OR_NEWER
|
||||
internal static partial class EditorProperties
|
||||
#else
|
||||
internal static class EditorProperties
|
||||
#endif
|
||||
{
|
||||
/////////////////
|
||||
// Editor Only //
|
||||
/////////////////
|
||||
#if UNITY_6000_5_OR_NEWER
|
||||
[Unity.Scripting.LifecycleManagement.AutoStaticsCleanup]
|
||||
[Unity.Scripting.LifecycleManagement.NoAutoStaticsCleanup]
|
||||
#endif
|
||||
internal static readonly BoolProperty initialized = new BoolProperty(Uniforms.initialized);
|
||||
#if UNITY_6000_5_OR_NEWER
|
||||
[Unity.Scripting.LifecycleManagement.AutoStaticsCleanup]
|
||||
[Unity.Scripting.LifecycleManagement.NoAutoStaticsCleanup]
|
||||
#endif
|
||||
internal static readonly BoolProperty optionsTab = new BoolProperty(Uniforms.optionsTab);
|
||||
#if UNITY_6000_5_OR_NEWER
|
||||
[Unity.Scripting.LifecycleManagement.AutoStaticsCleanup]
|
||||
[Unity.Scripting.LifecycleManagement.NoAutoStaticsCleanup]
|
||||
#endif
|
||||
internal static readonly BoolProperty inputTab = new BoolProperty(Uniforms.inputTab);
|
||||
#if UNITY_6000_5_OR_NEWER
|
||||
[Unity.Scripting.LifecycleManagement.AutoStaticsCleanup]
|
||||
[Unity.Scripting.LifecycleManagement.NoAutoStaticsCleanup]
|
||||
#endif
|
||||
internal static readonly BoolProperty stylizeTab = new BoolProperty(Uniforms.stylizeTab);
|
||||
#if UNITY_6000_5_OR_NEWER
|
||||
[Unity.Scripting.LifecycleManagement.AutoStaticsCleanup]
|
||||
[Unity.Scripting.LifecycleManagement.NoAutoStaticsCleanup]
|
||||
#endif
|
||||
internal static readonly BoolProperty advancedTab = new BoolProperty(Uniforms.advancedTab);
|
||||
#if UNITY_6000_5_OR_NEWER
|
||||
[Unity.Scripting.LifecycleManagement.AutoStaticsCleanup]
|
||||
[Unity.Scripting.LifecycleManagement.NoAutoStaticsCleanup]
|
||||
#endif
|
||||
internal static readonly BoolProperty particlesTab = new BoolProperty(Uniforms.particlesTab);
|
||||
#if UNITY_6000_5_OR_NEWER
|
||||
[Unity.Scripting.LifecycleManagement.AutoStaticsCleanup]
|
||||
[Unity.Scripting.LifecycleManagement.NoAutoStaticsCleanup]
|
||||
#endif
|
||||
internal static readonly BoolProperty outlineTab = new BoolProperty(Uniforms.outlineTab);
|
||||
#if UNITY_6000_5_OR_NEWER
|
||||
[Unity.Scripting.LifecycleManagement.AutoStaticsCleanup]
|
||||
[Unity.Scripting.LifecycleManagement.NoAutoStaticsCleanup]
|
||||
#endif
|
||||
internal static readonly BoolProperty refractionTab = new BoolProperty(Uniforms.refractionTab);
|
||||
|
||||
|
||||
@@ -13,6 +13,6 @@ AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 178415
|
||||
packageName: MK Toon - Stylized Shader
|
||||
packageVersion: 3.5.0C
|
||||
packageVersion: 3.5.0D
|
||||
assetPath: Assets/MK/MKToon/Editor/Properties.cs
|
||||
uploadId: 1012352
|
||||
uploadId: 1023756
|
||||
@@ -13,6 +13,6 @@ AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 178415
|
||||
packageName: MK Toon - Stylized Shader
|
||||
packageVersion: 3.5.0C
|
||||
packageVersion: 3.5.0D
|
||||
assetPath: Assets/MK/MKToon/Editor/UI.cs
|
||||
uploadId: 1012352
|
||||
uploadId: 1023756
|
||||
@@ -9,6 +9,6 @@ AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 178415
|
||||
packageName: MK Toon - Stylized Shader
|
||||
packageVersion: 3.5.0C
|
||||
packageVersion: 3.5.0D
|
||||
assetPath: Assets/MK/MKToon/Editor/VariantsManager/MK.Toon.VariantsManager.asmdef
|
||||
uploadId: 1012352
|
||||
uploadId: 1023756
|
||||
@@ -13,6 +13,6 @@ AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 178415
|
||||
packageName: MK Toon - Stylized Shader
|
||||
packageVersion: 3.5.0C
|
||||
packageVersion: 3.5.0D
|
||||
assetPath: Assets/MK/MKToon/Editor/VariantsManager/VariantSet.cs
|
||||
uploadId: 1012352
|
||||
uploadId: 1023756
|
||||
@@ -14,7 +14,11 @@ using UnityEditor.PackageManager.UI;
|
||||
|
||||
namespace MK.Toon.Editor
|
||||
{
|
||||
#if UNITY_6000_5_OR_NEWER
|
||||
public sealed partial class VariantsManager : UnityEditor.EditorWindow
|
||||
#else
|
||||
public sealed class VariantsManager : UnityEditor.EditorWindow
|
||||
#endif
|
||||
{
|
||||
private static GUIStyle _flowTextStyle { get { return new GUIStyle(EditorStyles.label) { wordWrap = true }; } }
|
||||
|
||||
@@ -78,7 +82,7 @@ namespace MK.Toon.Editor
|
||||
private static readonly string _title = "MK Toon Variants Manager";
|
||||
|
||||
#if UNITY_6000_5_OR_NEWER
|
||||
[Unity.Scripting.LifecycleManagement.AutoStaticsCleanup]
|
||||
[Unity.Scripting.LifecycleManagement.NoAutoStaticsCleanup]
|
||||
#endif
|
||||
private static readonly VariantSet[] _variantSets = new VariantSet[]
|
||||
{
|
||||
|
||||
@@ -13,6 +13,6 @@ AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 178415
|
||||
packageName: MK Toon - Stylized Shader
|
||||
packageVersion: 3.5.0C
|
||||
packageVersion: 3.5.0D
|
||||
assetPath: Assets/MK/MKToon/Editor/VariantsManager/VariantsManager.cs
|
||||
uploadId: 1012352
|
||||
uploadId: 1023756
|
||||
Reference in new issue
Block a user