Leahnaya/UniVRM
1
0
Fork 0
mirror of https://github.com/vrm-c/UniVRM.git synced 2026-06-03 06:24:46 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

mv namespace from VRMShaders.VRM10.MToon10 to VRM10.MToon10

Browse Source
This commit is contained in:
Masataka SUMI 2024-07-18 23:24:50 +09:00
parent 7449207ae8
commit 8a7d0a82f3
44 changed files with 49 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/VRM10/MToon10/Editor/EditorMenu.cs
View File

@ -2,7 +2,7 @@
using UnityEditor;
using UnityEngine;
namespace VRMShaders.VRM10.MToon10.Editor
namespace VRM10.MToon10.Editor
{
internal static class EditorMenu
{

2
Assets/VRM10/MToon10/Editor/LabelScope.cs
View File

@ -2,7 +2,7 @@
using UnityEditor;
using UnityEngine;
namespace VRMShaders.VRM10.MToon10.Editor
namespace VRM10.MToon10.Editor
{
public readonly struct LabelScope : IDisposable
{

2
Assets/VRM10/MToon10/Editor/MToon10EditorEditMode.cs
View File

@ -1,4 +1,4 @@
namespace VRMShaders.VRM10.MToon10.Editor
namespace VRM10.MToon10.Editor
{
public enum MToon10EditorEditMode
{

5
Assets/VRM10/MToon10/Editor/MToonInspector.cs
View File

@ -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
{

2
Assets/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon.shader
View File

@ -209,5 +209,5 @@ Shader "VRM10/MToon10"
}
}
Fallback "Unlit/Texture"
CustomEditor "VRMShaders.VRM10.MToon10.Editor.MToonInspector"
CustomEditor "VRM10.MToon10.Editor.MToonInspector"
}

2
Assets/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_urp.shader
View File

@ -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"
}

2
Assets/VRM10/MToon10/Runtime/Extensions/MaterialExtensions.cs
View File

@ -1,6 +1,6 @@
using UnityEngine;
namespace VRMShaders.VRM10.MToon10.Runtime
namespace VRM10.MToon10
{
public static class MaterialExtensions
{

2
Assets/VRM10/MToon10/Runtime/MToon0X/MToon0XDefinition.cs
View File

@ -1,6 +1,6 @@
using UnityEngine;
namespace VRMShaders.VRM10.MToon10.Runtime.MToon0X
namespace VRM10.MToon10.MToon0X
{
public class MToon0XDefinition
{

2
Assets/VRM10/MToon10/Runtime/MToon0X/MToon0XEnums.cs
View File

@ -1,4 +1,4 @@
namespace VRMShaders.VRM10.MToon10.Runtime.MToon0X
namespace VRM10.MToon10.MToon0X
{
public enum MToon0XDebugMode
{

3
Assets/VRM10/MToon10/Runtime/MToon0X/MToon0XUtils.cs
View File

@ -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
{

5
Assets/VRM10/MToon10/Runtime/MToon0X/MToon0XUtilsGetter.cs
View File

@ -1,7 +1,6 @@
using System;
using UnityEngine;
namespace VRMShaders.VRM10.MToon10.Runtime.MToon0X
namespace VRM10.MToon10.MToon0X
{
public static partial class MToon0XUtils
{
@ -11,7 +10,7 @@ namespace VRMShaders.VRM10.MToon10.Runtime.MToon0X
{
Meta = new MToon0XMetaDefinition
{
Implementation = Implementation,
Implementation = MToon0XUtils.Implementation,
VersionNumber = material.GetInt(PropVersion),
},
Rendering = new MToon0XRenderingDefinition

2
Assets/VRM10/MToon10/Runtime/MToon0X/MToon0XUtilsVersion.cs
View File

@ -1,4 +1,4 @@
namespace VRMShaders.VRM10.MToon10.Runtime.MToon0X
namespace VRM10.MToon10.MToon0X
{
public static partial class MToon0XUtils
{

2
Assets/VRM10/MToon10/Runtime/MToon10Context.cs
View File

@ -1,6 +1,6 @@
using UnityEngine;
namespace VRMShaders.VRM10.MToon10.Runtime
namespace VRM10.MToon10
{
public sealed class MToon10Context
{

2
Assets/VRM10/MToon10/Runtime/MToon10Migrator.cs
View File

@ -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

6
Assets/VRM10/MToon10/Runtime/MToonMaterialMigrator.cs
View File

@ -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
{

2
Assets/VRM10/MToon10/Runtime/MToonOutlineRenderFeature.cs
View File

@ -2,7 +2,7 @@
using UnityEngine.Rendering;
using UnityEngine.Rendering.Universal;
namespace VRMShaders.VRM10.MToon10.Runtime
namespace VRM10.MToon10
{
public sealed class MToonOutlineRenderFeature : ScriptableRendererFeature
{

3
Assets/VRM10/MToon10/Runtime/MToonOutlineRenderPass.cs
View File

@ -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
{

3
Assets/VRM10/MToon10/Runtime/MToonValidator.cs
View File

@ -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
{

2
Assets/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10AlphaMode.cs
View File

@ -1,4 +1,4 @@
namespace VRMShaders.VRM10.MToon10.Runtime
namespace VRM10.MToon10
{
public enum MToon10AlphaMode
{

2
Assets/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10DoubleSidedMode.cs
View File

@ -1,4 +1,4 @@
namespace VRMShaders.VRM10.MToon10.Runtime
namespace VRM10.MToon10
{
public enum MToon10DoubleSidedMode
{

2
Assets/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10EmissiveMapKeyword.cs
View File

@ -1,4 +1,4 @@
namespace VRMShaders.VRM10.MToon10.Runtime
namespace VRM10.MToon10
{
public static class MToon10EmissiveMapKeyword
{

2
Assets/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10NormalMapKeyword.cs
View File

@ -1,4 +1,4 @@
namespace VRMShaders.VRM10.MToon10.Runtime
namespace VRM10.MToon10
{
public static class MToon10NormalMapKeyword
{

2
Assets/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10OutlineMode.cs
View File

@ -1,4 +1,4 @@
namespace VRMShaders.VRM10.MToon10.Runtime
namespace VRM10.MToon10
{
public enum MToon10OutlineMode
{

2
Assets/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10OutlineModeKeyword.cs
View File

@ -1,4 +1,4 @@
namespace VRMShaders.VRM10.MToon10.Runtime
namespace VRM10.MToon10
{
public static class MToon10OutlineModeKeyword
{

2
Assets/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10ParameterMapKeyword.cs
View File

@ -1,4 +1,4 @@
namespace VRMShaders.VRM10.MToon10.Runtime
namespace VRM10.MToon10
{
public static class MToon10ParameterMapKeyword
{

2
Assets/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10RimMapKeyword.cs
View File

@ -1,4 +1,4 @@
namespace VRMShaders.VRM10.MToon10.Runtime
namespace VRM10.MToon10
{
public static class MToon10RimMapKeyword
{

2
Assets/VRM10/MToon10/Runtime/UnityShaderLab/MToonDefinedValues/MToon10TransparentWithZWriteMode.cs
View File

@ -1,4 +1,4 @@
namespace VRMShaders.VRM10.MToon10.Runtime
namespace VRM10.MToon10
{
public enum MToon10TransparentWithZWriteMode
{

2
Assets/VRM10/MToon10/Runtime/UnityShaderLab/Properties/MToon10Meta.cs
View File

@ -1,4 +1,4 @@
namespace VRMShaders.VRM10.MToon10.Runtime
namespace VRM10.MToon10
{
public static class MToon10Meta
{

2
Assets/VRM10/MToon10/Runtime/UnityShaderLab/Properties/MToon10Prop.cs
View File

@ -1,4 +1,4 @@
namespace VRMShaders.VRM10.MToon10.Runtime
namespace VRM10.MToon10
{
public enum MToon10Prop
{

2
Assets/VRM10/MToon10/Runtime/UnityShaderLab/Properties/MToon10Properties.cs
View File

@ -1,6 +1,6 @@
using System.Collections.Generic;
namespace VRMShaders.VRM10.MToon10.Runtime
namespace VRM10.MToon10
{
public static class MToon10Properties
{

2
Assets/VRM10/MToon10/Runtime/UnityShaderLab/ShaderLabDefinedValues/UnityAlphaModeKeyword.cs
View File

@ -1,4 +1,4 @@
namespace VRMShaders.VRM10.MToon10.Runtime
namespace VRM10.MToon10
{
public static class UnityAlphaModeKeyword
{

2
Assets/VRM10/MToon10/Runtime/UnityShaderLab/ShaderLabDefinedValues/UnityAlphaToMaskMode.cs
View File

@ -1,4 +1,4 @@
namespace VRMShaders.VRM10.MToon10.Runtime
namespace VRM10.MToon10
{
public enum UnityAlphaToMaskMode
{

2
Assets/VRM10/MToon10/Runtime/UnityShaderLab/ShaderLabDefinedValues/UnityCullMode.cs
View File

@ -1,4 +1,4 @@
namespace VRMShaders.VRM10.MToon10.Runtime
namespace VRM10.MToon10
{
public enum UnityCullMode
{

2
Assets/VRM10/MToon10/Runtime/UnityShaderLab/ShaderLabDefinedValues/UnityRenderTag.cs
View File

@ -1,4 +1,4 @@
namespace VRMShaders.VRM10.MToon10.Runtime
namespace VRM10.MToon10
{
public static class UnityRenderTag
{

2
Assets/VRM10/MToon10/Runtime/UnityShaderLab/ShaderLabDefinedValues/UnityZWriteMode.cs
View File

@ -1,4 +1,4 @@
namespace VRMShaders.VRM10.MToon10.Runtime
namespace VRM10.MToon10
{
public enum UnityZWriteMode
{

3
Assets/VRM10/MToon10/Tests/MigrationTests.cs
View File

@ -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
{

2
Assets/VRM10/Runtime/Components/Expression/MaterialValueBindingMerger.cs
View File

@ -2,7 +2,7 @@ using System;
using System.Collections.Generic;
using UniGLTF.Extensions.VRMC_vrm;
using UnityEngine;
using VRMShaders.VRM10.MToon10.Runtime;
using VRM10.MToon10;
namespace UniVRM10
{

2
Assets/VRM10/Runtime/Components/Expression/PreviewMaterialItem.cs
View File

@ -2,7 +2,7 @@ using System;
using System.Collections.Generic;
using UnityEngine;
using UniGLTF.Extensions.VRMC_vrm;
using VRMShaders.VRM10.MToon10.Runtime;
using VRM10.MToon10;
namespace UniVRM10

2
Assets/VRM10/Runtime/IO/Material/BuiltInRP/Export/Materials/BuiltInVrm10MToonMaterialExporter.cs
View File

@ -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

2
Assets/VRM10/Runtime/IO/Material/BuiltInRP/Import/Materials/BuiltInVrm10MToonMaterialImporter.cs
View File

@ -4,8 +4,8 @@ using System.Linq;
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;

2
Assets/VRM10/Runtime/IO/Material/URP/Import/Materials/UrpVrm10MToonMaterialImporter.cs
View File

@ -2,8 +2,8 @@
using System.Linq;
using UniGLTF;
using UnityEngine;
using VRM10.MToon10;
using VRMShaders;
using VRMShaders.VRM10.MToon10.Runtime;
namespace UniVRM10
{

2
Assets/VRM10/Runtime/IO/Texture/Vrm10MToonTextureImporter.cs
View File

@ -3,8 +3,8 @@ using System.Collections.Generic;
using UniGLTF;
using UniGLTF.Extensions.VRMC_materials_mtoon;
using UnityEngine;
using VRM10.MToon10;
using VRMShaders;
using VRMShaders.VRM10.MToon10.Runtime;
namespace UniVRM10
{

4
Assets/VRM10/Runtime/Migration/Materials/MigrationMToonMaterial.cs
View File

@ -4,8 +4,8 @@ using UniGLTF;
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

3
Assets/VRM10/Runtime/Migration/Materials/Vrm0XMToonValue.cs
View File

@ -3,9 +3,10 @@ using System.Linq;
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
{