Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move MToon10 material io definitions from VRMShaders to VRM10 #2366

Merged
merged 6 commits into from
Jul 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using UnityEditor;
using UnityEngine;

namespace VRMShaders.VRM10.MToon10.Editor
namespace VRM10.MToon10.Editor
{
internal static class EditorMenu
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using UnityEditor;
using UnityEngine;

namespace VRMShaders.VRM10.MToon10.Editor
namespace VRM10.MToon10.Editor
{
public readonly struct LabelScope : IDisposable
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace VRMShaders.VRM10.MToon10.Editor
namespace VRM10.MToon10.Editor
{
public enum MToon10EditorEditMode
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,10 @@
using System;
using System.Collections;
using System.Collections.Generic;
using System.Linq;
using UnityEditor;
using UnityEngine;
using UnityEngine.Rendering;
using VRMShaders.VRM10.MToon10.Runtime;

namespace VRMShaders.VRM10.MToon10.Editor
namespace VRM10.MToon10.Editor
{
public sealed class MToonInspector : ShaderGUI
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"name": "VRMShaders.VRM10.MToon10.Editor",
"name": "VRM10.MToon10.Editor",
"rootNamespace": "",
"references": [
"GUID:0aaf403bd13871a44b7127aef2695ff8"
],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -209,5 +209,5 @@ Shader "VRM10/MToon10"
}
}
Fallback "Unlit/Texture"
CustomEditor "VRMShaders.VRM10.MToon10.Editor.MToonInspector"
CustomEditor "VRM10.MToon10.Editor.MToonInspector"
}
Original file line number Diff line number Diff line change
Expand Up @@ -253,5 +253,5 @@ Shader "VRM10/Universal Render Pipeline/MToon10"
}

FallBack "Hidden/Universal Render Pipeline/FallbackError"
CustomEditor "VRMShaders.VRM10.MToon10.Editor.MToonInspector"
CustomEditor "VRM10.MToon10.Editor.MToonInspector"
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using UnityEngine;

namespace VRMShaders.VRM10.MToon10.Runtime
namespace VRM10.MToon10
{
public static class MaterialExtensions
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using UnityEngine;

namespace VRMShaders.VRM10.MToon10.Runtime.MToon0X
namespace VRM10.MToon10.MToon0X
{
public class MToon0XDefinition
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace VRMShaders.VRM10.MToon10.Runtime.MToon0X
namespace VRM10.MToon10.MToon0X
{
public enum MToon0XDebugMode
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
using System;
using UnityEngine;
using UnityEngine.Rendering;

namespace VRMShaders.VRM10.MToon10.Runtime.MToon0X
namespace VRM10.MToon10.MToon0X
{
public static partial class MToon0XUtils
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
using System;
using UnityEngine;

namespace VRMShaders.VRM10.MToon10.Runtime.MToon0X
namespace VRM10.MToon10.MToon0X
{
public static partial class MToon0XUtils
{
Expand All @@ -11,7 +10,7 @@ public static MToon0XDefinition GetMToonParametersFromMaterial(Material material
{
Meta = new MToon0XMetaDefinition
{
Implementation = Implementation,
Implementation = MToon0XUtils.Implementation,
VersionNumber = material.GetInt(PropVersion),
},
Rendering = new MToon0XRenderingDefinition
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace VRMShaders.VRM10.MToon10.Runtime.MToon0X
namespace VRM10.MToon10.MToon0X
{
public static partial class MToon0XUtils
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using UnityEngine;

namespace VRMShaders.VRM10.MToon10.Runtime
namespace VRM10.MToon10
{
public sealed class MToon10Context
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using UnityEngine;

namespace VRMShaders.VRM10.MToon10.Runtime
namespace VRM10.MToon10
{
/// <summary>
/// Migrate from VRM 0.x MToon to VRM 1.0 vrmc_materials_mtoon
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
using System;
using UnityEngine;
using VRMShaders.VRM10.MToon10.Runtime;
using VRMShaders.VRM10.MToon10.Runtime.MToon0X;
using VRM10.MToon10.MToon0X;
using MToon0XUtils = VRM10.MToon10.MToon0X.MToon0XUtils;
using Object = UnityEngine.Object;

namespace VRMShaders.VRM10.MToon10.Editor
namespace VRM10.MToon10
{
public sealed class MToonMaterialMigrator
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using UnityEngine.Rendering;
using UnityEngine.Rendering.Universal;

namespace VRMShaders.VRM10.MToon10.Runtime
namespace VRM10.MToon10
{
public sealed class MToonOutlineRenderFeature : ScriptableRendererFeature
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
#if MTOON_URP
using System;
using UnityEngine.Rendering;
using UnityEngine.Rendering.Universal;

namespace VRMShaders.VRM10.MToon10.Runtime
namespace VRM10.MToon10
{
public sealed class MToonOutlineRenderPass : ScriptableRenderPass
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
using System;
using UnityEngine;
using UnityEngine.Rendering;
using VRMShaders.VRM10.MToon10.Runtime;

namespace VRMShaders.VRM10.MToon10.Runtime
namespace VRM10.MToon10
{
public sealed class MToonValidator
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace VRMShaders.VRM10.MToon10.Runtime
namespace VRM10.MToon10
{
public enum MToon10AlphaMode
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace VRMShaders.VRM10.MToon10.Runtime
namespace VRM10.MToon10
{
public enum MToon10DoubleSidedMode
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace VRMShaders.VRM10.MToon10.Runtime
namespace VRM10.MToon10
{
public static class MToon10EmissiveMapKeyword
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace VRMShaders.VRM10.MToon10.Runtime
namespace VRM10.MToon10
{
public static class MToon10NormalMapKeyword
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace VRMShaders.VRM10.MToon10.Runtime
namespace VRM10.MToon10
{
public enum MToon10OutlineMode
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace VRMShaders.VRM10.MToon10.Runtime
namespace VRM10.MToon10
{
public static class MToon10OutlineModeKeyword
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace VRMShaders.VRM10.MToon10.Runtime
namespace VRM10.MToon10
{
public static class MToon10ParameterMapKeyword
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace VRMShaders.VRM10.MToon10.Runtime
namespace VRM10.MToon10
{
public static class MToon10RimMapKeyword
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace VRMShaders.VRM10.MToon10.Runtime
namespace VRM10.MToon10
{
public enum MToon10TransparentWithZWriteMode
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace VRMShaders.VRM10.MToon10.Runtime
namespace VRM10.MToon10
{
public static class MToon10Meta
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace VRMShaders.VRM10.MToon10.Runtime
namespace VRM10.MToon10
{
public enum MToon10Prop
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using System.Collections.Generic;

namespace VRMShaders.VRM10.MToon10.Runtime
namespace VRM10.MToon10
{
public static class MToon10Properties
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace VRMShaders.VRM10.MToon10.Runtime
namespace VRM10.MToon10
{
public static class UnityAlphaModeKeyword
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace VRMShaders.VRM10.MToon10.Runtime
namespace VRM10.MToon10
{
public enum UnityAlphaToMaskMode
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace VRMShaders.VRM10.MToon10.Runtime
namespace VRM10.MToon10
{
public enum UnityCullMode
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace VRMShaders.VRM10.MToon10.Runtime
namespace VRM10.MToon10
{
public static class UnityRenderTag
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace VRMShaders.VRM10.MToon10.Runtime
namespace VRM10.MToon10
{
public enum UnityZWriteMode
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "VRMShaders.VRM10.MToon10.Runtime",
"name": "VRM10.MToon10",
"rootNamespace": "",
"references": [
"GUID:15fc0a57446b3144c949da3e2b9737a9",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
using NUnit.Framework;
using VRMShaders.VRM10.MToon10.Runtime;

namespace VRMShaders.VRM10.MToon10.Tests
namespace VRM10.MToon10.Tests
{
public sealed class MigrationTests
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"name": "VRMShaders.VRM10.MToon10.Tests",
"name": "VRM10.MToon10.Tests",
"rootNamespace": "",
"references": [
"GUID:0aaf403bd13871a44b7127aef2695ff8",
"GUID:27619889b8ba8c24980f49ee34dbb44a",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using System.Collections.Generic;
using UniGLTF.Extensions.VRMC_vrm;
using UnityEngine;
using VRMShaders.VRM10.MToon10.Runtime;
using VRM10.MToon10;

namespace UniVRM10
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using System.Collections.Generic;
using UnityEngine;
using UniGLTF.Extensions.VRMC_vrm;
using VRMShaders.VRM10.MToon10.Runtime;
using VRM10.MToon10;


namespace UniVRM10
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
using UniGLTF;
using UniGLTF.Extensions.VRMC_materials_mtoon;
using UnityEngine;
using VRM10.MToon10;
using VRMShaders;
using VRMShaders.VRM10.MToon10.Runtime;
using ColorSpace = VRMShaders.ColorSpace;

namespace UniVRM10
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
using UniGLTF;
using UniGLTF.Extensions.VRMC_materials_mtoon;
using UnityEngine;
using VRM10.MToon10;
using VRMShaders;
using VRMShaders.VRM10.MToon10.Runtime;
using ColorSpace = VRMShaders.ColorSpace;
using OutlineWidthMode = UniGLTF.Extensions.VRMC_materials_mtoon.OutlineWidthMode;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
using System.Linq;
using UniGLTF;
using UnityEngine;
using VRM10.MToon10;
using VRMShaders;
using VRMShaders.VRM10.MToon10.Runtime;

namespace UniVRM10
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
using UniGLTF;
using UniGLTF.Extensions.VRMC_materials_mtoon;
using UnityEngine;
using VRM10.MToon10;
using VRMShaders;
using VRMShaders.VRM10.MToon10.Runtime;

namespace UniVRM10
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
using UniGLTF.Extensions.VRMC_materials_mtoon;
using UniJSON;
using UnityEngine;
using VRMShaders.VRM10.MToon10.Runtime;
using VRMShaders.VRM10.MToon10.Runtime.MToon0X;
using VRM10.MToon10;
using VRM10.MToon10.MToon0X;
using ColorSpace = VRMShaders.ColorSpace;

namespace UniVRM10
Expand Down
3 changes: 2 additions & 1 deletion Assets/VRM10/Runtime/Migration/Materials/Vrm0XMToonValue.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@
using UniGLTF;
using UniJSON;
using UnityEngine;
using VRM10.MToon10.MToon0X;
using VRMShaders;
using VRMShaders.VRM10.MToon10.Runtime.MToon0X;
using ColorSpace = VRMShaders.ColorSpace;
using MToon0XUtils = VRM10.MToon10.MToon0X.MToon0XUtils;

namespace UniVRM10
{
Expand Down