From 8ab44470cd38ce6d47a105acc8132dd93e267190 Mon Sep 17 00:00:00 2001 From: ousttrue Date: Fri, 19 Jun 2020 12:56:57 +0900 Subject: [PATCH 1/2] mv Assets/VRM/MToon,UniUnlit,ShaderProperty to Assets/VRMShaders --- .gitmodules | 2 +- Assets/VRMShaders.meta | 8 ++++++++ Assets/{VRM => VRMShaders}/MToon | 0 Assets/{VRM => VRMShaders}/MToon.meta | 0 Assets/{VRM => VRMShaders}/ShaderProperty.meta | 0 Assets/{VRM => VRMShaders}/ShaderProperty/Editor.meta | 0 .../ShaderProperty/Editor/ShaderPropMenu.cs | 0 .../ShaderProperty/Editor/ShaderPropMenu.cs.meta | 0 .../ShaderProperty/Editor/ShaderProperty.Editor.asmdef | 0 .../Editor/ShaderProperty.Editor.asmdef.meta | 0 Assets/{VRM => VRMShaders}/ShaderProperty/Runtime.meta | 0 .../{VRM => VRMShaders}/ShaderProperty/Runtime/GLTF.meta | 0 .../ShaderProperty/Runtime/GLTF/PreExportShaders_GLTF.cs | 0 .../Runtime/GLTF/PreExportShaders_GLTF.cs.meta | 0 .../ShaderProperty/Runtime/GLTF/Standard.cs | 0 .../ShaderProperty/Runtime/GLTF/Standard.cs.meta | 0 .../ShaderProperty/Runtime/GLTF/UniGLTF_UniUnlit.cs | 0 .../ShaderProperty/Runtime/GLTF/UniGLTF_UniUnlit.cs.meta | 0 .../ShaderProperty/Runtime/GLTF/Unlit_Color.cs | 0 .../ShaderProperty/Runtime/GLTF/Unlit_Color.cs.meta | 0 .../ShaderProperty/Runtime/GLTF/Unlit_Texture.cs | 0 .../ShaderProperty/Runtime/GLTF/Unlit_Texture.cs.meta | 0 .../ShaderProperty/Runtime/GLTF/Unlit_Transparent.cs | 0 .../ShaderProperty/Runtime/GLTF/Unlit_Transparent.cs.meta | 0 .../Runtime/GLTF/Unlit_Transparent_Cutout.cs | 0 .../Runtime/GLTF/Unlit_Transparent_Cutout.cs.meta | 0 .../ShaderProperty/Runtime/PreShaderPropExporter.cs | 0 .../ShaderProperty/Runtime/PreShaderPropExporter.cs.meta | 0 .../ShaderProperty/Runtime/ShaderProperty.Runtime.asmdef | 0 .../Runtime/ShaderProperty.Runtime.asmdef.meta | 0 .../ShaderProperty/Runtime/ShaderProps.cs | 0 .../ShaderProperty/Runtime/ShaderProps.cs.meta | 0 .../{VRM => VRMShaders}/ShaderProperty/Runtime/VRM.meta | 0 .../ShaderProperty/Runtime/VRM/PreExportShaders_VRM.cs | 0 .../Runtime/VRM/PreExportShaders_VRM.cs.meta | 0 .../ShaderProperty/Runtime/VRM/VRM_MToon.cs | 0 .../ShaderProperty/Runtime/VRM/VRM_MToon.cs.meta | 0 .../ShaderProperty/Runtime/VRM/VRM_UnlitCutout.cs | 0 .../ShaderProperty/Runtime/VRM/VRM_UnlitCutout.cs.meta | 0 .../ShaderProperty/Runtime/VRM/VRM_UnlitTexture.cs | 0 .../ShaderProperty/Runtime/VRM/VRM_UnlitTexture.cs.meta | 0 .../ShaderProperty/Runtime/VRM/VRM_UnlitTransparent.cs | 0 .../Runtime/VRM/VRM_UnlitTransparent.cs.meta | 0 .../Runtime/VRM/VRM_UnlitTransparentZWrite.cs | 0 .../Runtime/VRM/VRM_UnlitTransparentZWrite.cs.meta | 0 Assets/{VRM => VRMShaders}/UniUnlit.meta | 0 Assets/{VRM => VRMShaders}/UniUnlit/Editor.meta | 0 .../UniUnlit/Editor/UniUnlit.Editor.asmdef | 0 .../UniUnlit/Editor/UniUnlit.Editor.asmdef.meta | 0 .../{VRM => VRMShaders}/UniUnlit/Editor/UniUnlitEditor.cs | 0 .../UniUnlit/Editor/UniUnlitEditor.cs.meta | 0 Assets/{VRM => VRMShaders}/UniUnlit/Resources.meta | 0 .../UniUnlit/Resources/UniUnlit.shader | 0 .../UniUnlit/Resources/UniUnlit.shader.meta | 0 Assets/{VRM => VRMShaders}/UniUnlit/Scripts.meta | 0 Assets/{VRM => VRMShaders}/UniUnlit/Scripts/Utils.cs | 0 Assets/{VRM => VRMShaders}/UniUnlit/Scripts/Utils.cs.meta | 0 Assets/{VRM => VRMShaders}/UniUnlit/UniUnlit.asmdef | 0 Assets/{VRM => VRMShaders}/UniUnlit/UniUnlit.asmdef.meta | 0 ProjectSettings/ProjectVersion.txt | 3 ++- 60 files changed, 11 insertions(+), 2 deletions(-) create mode 100644 Assets/VRMShaders.meta rename Assets/{VRM => VRMShaders}/MToon (100%) rename Assets/{VRM => VRMShaders}/MToon.meta (100%) rename Assets/{VRM => VRMShaders}/ShaderProperty.meta (100%) rename Assets/{VRM => VRMShaders}/ShaderProperty/Editor.meta (100%) rename Assets/{VRM => VRMShaders}/ShaderProperty/Editor/ShaderPropMenu.cs (100%) rename Assets/{VRM => VRMShaders}/ShaderProperty/Editor/ShaderPropMenu.cs.meta (100%) rename Assets/{VRM => VRMShaders}/ShaderProperty/Editor/ShaderProperty.Editor.asmdef (100%) rename Assets/{VRM => VRMShaders}/ShaderProperty/Editor/ShaderProperty.Editor.asmdef.meta (100%) rename Assets/{VRM => VRMShaders}/ShaderProperty/Runtime.meta (100%) rename Assets/{VRM => VRMShaders}/ShaderProperty/Runtime/GLTF.meta (100%) rename Assets/{VRM => VRMShaders}/ShaderProperty/Runtime/GLTF/PreExportShaders_GLTF.cs (100%) rename Assets/{VRM => VRMShaders}/ShaderProperty/Runtime/GLTF/PreExportShaders_GLTF.cs.meta (100%) rename Assets/{VRM => VRMShaders}/ShaderProperty/Runtime/GLTF/Standard.cs (100%) rename Assets/{VRM => VRMShaders}/ShaderProperty/Runtime/GLTF/Standard.cs.meta (100%) rename Assets/{VRM => VRMShaders}/ShaderProperty/Runtime/GLTF/UniGLTF_UniUnlit.cs (100%) rename Assets/{VRM => VRMShaders}/ShaderProperty/Runtime/GLTF/UniGLTF_UniUnlit.cs.meta (100%) rename Assets/{VRM => VRMShaders}/ShaderProperty/Runtime/GLTF/Unlit_Color.cs (100%) rename Assets/{VRM => VRMShaders}/ShaderProperty/Runtime/GLTF/Unlit_Color.cs.meta (100%) rename Assets/{VRM => VRMShaders}/ShaderProperty/Runtime/GLTF/Unlit_Texture.cs (100%) rename Assets/{VRM => VRMShaders}/ShaderProperty/Runtime/GLTF/Unlit_Texture.cs.meta (100%) rename Assets/{VRM => VRMShaders}/ShaderProperty/Runtime/GLTF/Unlit_Transparent.cs (100%) rename Assets/{VRM => VRMShaders}/ShaderProperty/Runtime/GLTF/Unlit_Transparent.cs.meta (100%) rename Assets/{VRM => VRMShaders}/ShaderProperty/Runtime/GLTF/Unlit_Transparent_Cutout.cs (100%) rename Assets/{VRM => VRMShaders}/ShaderProperty/Runtime/GLTF/Unlit_Transparent_Cutout.cs.meta (100%) rename Assets/{VRM => VRMShaders}/ShaderProperty/Runtime/PreShaderPropExporter.cs (100%) rename Assets/{VRM => VRMShaders}/ShaderProperty/Runtime/PreShaderPropExporter.cs.meta (100%) rename Assets/{VRM => VRMShaders}/ShaderProperty/Runtime/ShaderProperty.Runtime.asmdef (100%) rename Assets/{VRM => VRMShaders}/ShaderProperty/Runtime/ShaderProperty.Runtime.asmdef.meta (100%) rename Assets/{VRM => VRMShaders}/ShaderProperty/Runtime/ShaderProps.cs (100%) rename Assets/{VRM => VRMShaders}/ShaderProperty/Runtime/ShaderProps.cs.meta (100%) rename Assets/{VRM => VRMShaders}/ShaderProperty/Runtime/VRM.meta (100%) rename Assets/{VRM => VRMShaders}/ShaderProperty/Runtime/VRM/PreExportShaders_VRM.cs (100%) rename Assets/{VRM => VRMShaders}/ShaderProperty/Runtime/VRM/PreExportShaders_VRM.cs.meta (100%) rename Assets/{VRM => VRMShaders}/ShaderProperty/Runtime/VRM/VRM_MToon.cs (100%) rename Assets/{VRM => VRMShaders}/ShaderProperty/Runtime/VRM/VRM_MToon.cs.meta (100%) rename Assets/{VRM => VRMShaders}/ShaderProperty/Runtime/VRM/VRM_UnlitCutout.cs (100%) rename Assets/{VRM => VRMShaders}/ShaderProperty/Runtime/VRM/VRM_UnlitCutout.cs.meta (100%) rename Assets/{VRM => VRMShaders}/ShaderProperty/Runtime/VRM/VRM_UnlitTexture.cs (100%) rename Assets/{VRM => VRMShaders}/ShaderProperty/Runtime/VRM/VRM_UnlitTexture.cs.meta (100%) rename Assets/{VRM => VRMShaders}/ShaderProperty/Runtime/VRM/VRM_UnlitTransparent.cs (100%) rename Assets/{VRM => VRMShaders}/ShaderProperty/Runtime/VRM/VRM_UnlitTransparent.cs.meta (100%) rename Assets/{VRM => VRMShaders}/ShaderProperty/Runtime/VRM/VRM_UnlitTransparentZWrite.cs (100%) rename Assets/{VRM => VRMShaders}/ShaderProperty/Runtime/VRM/VRM_UnlitTransparentZWrite.cs.meta (100%) rename Assets/{VRM => VRMShaders}/UniUnlit.meta (100%) rename Assets/{VRM => VRMShaders}/UniUnlit/Editor.meta (100%) rename Assets/{VRM => VRMShaders}/UniUnlit/Editor/UniUnlit.Editor.asmdef (100%) rename Assets/{VRM => VRMShaders}/UniUnlit/Editor/UniUnlit.Editor.asmdef.meta (100%) rename Assets/{VRM => VRMShaders}/UniUnlit/Editor/UniUnlitEditor.cs (100%) rename Assets/{VRM => VRMShaders}/UniUnlit/Editor/UniUnlitEditor.cs.meta (100%) rename Assets/{VRM => VRMShaders}/UniUnlit/Resources.meta (100%) rename Assets/{VRM => VRMShaders}/UniUnlit/Resources/UniUnlit.shader (100%) rename Assets/{VRM => VRMShaders}/UniUnlit/Resources/UniUnlit.shader.meta (100%) rename Assets/{VRM => VRMShaders}/UniUnlit/Scripts.meta (100%) rename Assets/{VRM => VRMShaders}/UniUnlit/Scripts/Utils.cs (100%) rename Assets/{VRM => VRMShaders}/UniUnlit/Scripts/Utils.cs.meta (100%) rename Assets/{VRM => VRMShaders}/UniUnlit/UniUnlit.asmdef (100%) rename Assets/{VRM => VRMShaders}/UniUnlit/UniUnlit.asmdef.meta (100%) diff --git a/.gitmodules b/.gitmodules index ff1d57bcf7..8d2978b718 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "MToon"] - path = Assets/VRM/MToon + path = Assets/VRMShaders/MToon url = https://github.com/Santarh/MToon.git diff --git a/Assets/VRMShaders.meta b/Assets/VRMShaders.meta new file mode 100644 index 0000000000..83645dcc34 --- /dev/null +++ b/Assets/VRMShaders.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 503ae90aee4d0224db69e4e74762223b +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/VRM/MToon b/Assets/VRMShaders/MToon similarity index 100% rename from Assets/VRM/MToon rename to Assets/VRMShaders/MToon diff --git a/Assets/VRM/MToon.meta b/Assets/VRMShaders/MToon.meta similarity index 100% rename from Assets/VRM/MToon.meta rename to Assets/VRMShaders/MToon.meta diff --git a/Assets/VRM/ShaderProperty.meta b/Assets/VRMShaders/ShaderProperty.meta similarity index 100% rename from Assets/VRM/ShaderProperty.meta rename to Assets/VRMShaders/ShaderProperty.meta diff --git a/Assets/VRM/ShaderProperty/Editor.meta b/Assets/VRMShaders/ShaderProperty/Editor.meta similarity index 100% rename from Assets/VRM/ShaderProperty/Editor.meta rename to Assets/VRMShaders/ShaderProperty/Editor.meta diff --git a/Assets/VRM/ShaderProperty/Editor/ShaderPropMenu.cs b/Assets/VRMShaders/ShaderProperty/Editor/ShaderPropMenu.cs similarity index 100% rename from Assets/VRM/ShaderProperty/Editor/ShaderPropMenu.cs rename to Assets/VRMShaders/ShaderProperty/Editor/ShaderPropMenu.cs diff --git a/Assets/VRM/ShaderProperty/Editor/ShaderPropMenu.cs.meta b/Assets/VRMShaders/ShaderProperty/Editor/ShaderPropMenu.cs.meta similarity index 100% rename from Assets/VRM/ShaderProperty/Editor/ShaderPropMenu.cs.meta rename to Assets/VRMShaders/ShaderProperty/Editor/ShaderPropMenu.cs.meta diff --git a/Assets/VRM/ShaderProperty/Editor/ShaderProperty.Editor.asmdef b/Assets/VRMShaders/ShaderProperty/Editor/ShaderProperty.Editor.asmdef similarity index 100% rename from Assets/VRM/ShaderProperty/Editor/ShaderProperty.Editor.asmdef rename to Assets/VRMShaders/ShaderProperty/Editor/ShaderProperty.Editor.asmdef diff --git a/Assets/VRM/ShaderProperty/Editor/ShaderProperty.Editor.asmdef.meta b/Assets/VRMShaders/ShaderProperty/Editor/ShaderProperty.Editor.asmdef.meta similarity index 100% rename from Assets/VRM/ShaderProperty/Editor/ShaderProperty.Editor.asmdef.meta rename to Assets/VRMShaders/ShaderProperty/Editor/ShaderProperty.Editor.asmdef.meta diff --git a/Assets/VRM/ShaderProperty/Runtime.meta b/Assets/VRMShaders/ShaderProperty/Runtime.meta similarity index 100% rename from Assets/VRM/ShaderProperty/Runtime.meta rename to Assets/VRMShaders/ShaderProperty/Runtime.meta diff --git a/Assets/VRM/ShaderProperty/Runtime/GLTF.meta b/Assets/VRMShaders/ShaderProperty/Runtime/GLTF.meta similarity index 100% rename from Assets/VRM/ShaderProperty/Runtime/GLTF.meta rename to Assets/VRMShaders/ShaderProperty/Runtime/GLTF.meta diff --git a/Assets/VRM/ShaderProperty/Runtime/GLTF/PreExportShaders_GLTF.cs b/Assets/VRMShaders/ShaderProperty/Runtime/GLTF/PreExportShaders_GLTF.cs similarity index 100% rename from Assets/VRM/ShaderProperty/Runtime/GLTF/PreExportShaders_GLTF.cs rename to Assets/VRMShaders/ShaderProperty/Runtime/GLTF/PreExportShaders_GLTF.cs diff --git a/Assets/VRM/ShaderProperty/Runtime/GLTF/PreExportShaders_GLTF.cs.meta b/Assets/VRMShaders/ShaderProperty/Runtime/GLTF/PreExportShaders_GLTF.cs.meta similarity index 100% rename from Assets/VRM/ShaderProperty/Runtime/GLTF/PreExportShaders_GLTF.cs.meta rename to Assets/VRMShaders/ShaderProperty/Runtime/GLTF/PreExportShaders_GLTF.cs.meta diff --git a/Assets/VRM/ShaderProperty/Runtime/GLTF/Standard.cs b/Assets/VRMShaders/ShaderProperty/Runtime/GLTF/Standard.cs similarity index 100% rename from Assets/VRM/ShaderProperty/Runtime/GLTF/Standard.cs rename to Assets/VRMShaders/ShaderProperty/Runtime/GLTF/Standard.cs diff --git a/Assets/VRM/ShaderProperty/Runtime/GLTF/Standard.cs.meta b/Assets/VRMShaders/ShaderProperty/Runtime/GLTF/Standard.cs.meta similarity index 100% rename from Assets/VRM/ShaderProperty/Runtime/GLTF/Standard.cs.meta rename to Assets/VRMShaders/ShaderProperty/Runtime/GLTF/Standard.cs.meta diff --git a/Assets/VRM/ShaderProperty/Runtime/GLTF/UniGLTF_UniUnlit.cs b/Assets/VRMShaders/ShaderProperty/Runtime/GLTF/UniGLTF_UniUnlit.cs similarity index 100% rename from Assets/VRM/ShaderProperty/Runtime/GLTF/UniGLTF_UniUnlit.cs rename to Assets/VRMShaders/ShaderProperty/Runtime/GLTF/UniGLTF_UniUnlit.cs diff --git a/Assets/VRM/ShaderProperty/Runtime/GLTF/UniGLTF_UniUnlit.cs.meta b/Assets/VRMShaders/ShaderProperty/Runtime/GLTF/UniGLTF_UniUnlit.cs.meta similarity index 100% rename from Assets/VRM/ShaderProperty/Runtime/GLTF/UniGLTF_UniUnlit.cs.meta rename to Assets/VRMShaders/ShaderProperty/Runtime/GLTF/UniGLTF_UniUnlit.cs.meta diff --git a/Assets/VRM/ShaderProperty/Runtime/GLTF/Unlit_Color.cs b/Assets/VRMShaders/ShaderProperty/Runtime/GLTF/Unlit_Color.cs similarity index 100% rename from Assets/VRM/ShaderProperty/Runtime/GLTF/Unlit_Color.cs rename to Assets/VRMShaders/ShaderProperty/Runtime/GLTF/Unlit_Color.cs diff --git a/Assets/VRM/ShaderProperty/Runtime/GLTF/Unlit_Color.cs.meta b/Assets/VRMShaders/ShaderProperty/Runtime/GLTF/Unlit_Color.cs.meta similarity index 100% rename from Assets/VRM/ShaderProperty/Runtime/GLTF/Unlit_Color.cs.meta rename to Assets/VRMShaders/ShaderProperty/Runtime/GLTF/Unlit_Color.cs.meta diff --git a/Assets/VRM/ShaderProperty/Runtime/GLTF/Unlit_Texture.cs b/Assets/VRMShaders/ShaderProperty/Runtime/GLTF/Unlit_Texture.cs similarity index 100% rename from Assets/VRM/ShaderProperty/Runtime/GLTF/Unlit_Texture.cs rename to Assets/VRMShaders/ShaderProperty/Runtime/GLTF/Unlit_Texture.cs diff --git a/Assets/VRM/ShaderProperty/Runtime/GLTF/Unlit_Texture.cs.meta b/Assets/VRMShaders/ShaderProperty/Runtime/GLTF/Unlit_Texture.cs.meta similarity index 100% rename from Assets/VRM/ShaderProperty/Runtime/GLTF/Unlit_Texture.cs.meta rename to Assets/VRMShaders/ShaderProperty/Runtime/GLTF/Unlit_Texture.cs.meta diff --git a/Assets/VRM/ShaderProperty/Runtime/GLTF/Unlit_Transparent.cs b/Assets/VRMShaders/ShaderProperty/Runtime/GLTF/Unlit_Transparent.cs similarity index 100% rename from Assets/VRM/ShaderProperty/Runtime/GLTF/Unlit_Transparent.cs rename to Assets/VRMShaders/ShaderProperty/Runtime/GLTF/Unlit_Transparent.cs diff --git a/Assets/VRM/ShaderProperty/Runtime/GLTF/Unlit_Transparent.cs.meta b/Assets/VRMShaders/ShaderProperty/Runtime/GLTF/Unlit_Transparent.cs.meta similarity index 100% rename from Assets/VRM/ShaderProperty/Runtime/GLTF/Unlit_Transparent.cs.meta rename to Assets/VRMShaders/ShaderProperty/Runtime/GLTF/Unlit_Transparent.cs.meta diff --git a/Assets/VRM/ShaderProperty/Runtime/GLTF/Unlit_Transparent_Cutout.cs b/Assets/VRMShaders/ShaderProperty/Runtime/GLTF/Unlit_Transparent_Cutout.cs similarity index 100% rename from Assets/VRM/ShaderProperty/Runtime/GLTF/Unlit_Transparent_Cutout.cs rename to Assets/VRMShaders/ShaderProperty/Runtime/GLTF/Unlit_Transparent_Cutout.cs diff --git a/Assets/VRM/ShaderProperty/Runtime/GLTF/Unlit_Transparent_Cutout.cs.meta b/Assets/VRMShaders/ShaderProperty/Runtime/GLTF/Unlit_Transparent_Cutout.cs.meta similarity index 100% rename from Assets/VRM/ShaderProperty/Runtime/GLTF/Unlit_Transparent_Cutout.cs.meta rename to Assets/VRMShaders/ShaderProperty/Runtime/GLTF/Unlit_Transparent_Cutout.cs.meta diff --git a/Assets/VRM/ShaderProperty/Runtime/PreShaderPropExporter.cs b/Assets/VRMShaders/ShaderProperty/Runtime/PreShaderPropExporter.cs similarity index 100% rename from Assets/VRM/ShaderProperty/Runtime/PreShaderPropExporter.cs rename to Assets/VRMShaders/ShaderProperty/Runtime/PreShaderPropExporter.cs diff --git a/Assets/VRM/ShaderProperty/Runtime/PreShaderPropExporter.cs.meta b/Assets/VRMShaders/ShaderProperty/Runtime/PreShaderPropExporter.cs.meta similarity index 100% rename from Assets/VRM/ShaderProperty/Runtime/PreShaderPropExporter.cs.meta rename to Assets/VRMShaders/ShaderProperty/Runtime/PreShaderPropExporter.cs.meta diff --git a/Assets/VRM/ShaderProperty/Runtime/ShaderProperty.Runtime.asmdef b/Assets/VRMShaders/ShaderProperty/Runtime/ShaderProperty.Runtime.asmdef similarity index 100% rename from Assets/VRM/ShaderProperty/Runtime/ShaderProperty.Runtime.asmdef rename to Assets/VRMShaders/ShaderProperty/Runtime/ShaderProperty.Runtime.asmdef diff --git a/Assets/VRM/ShaderProperty/Runtime/ShaderProperty.Runtime.asmdef.meta b/Assets/VRMShaders/ShaderProperty/Runtime/ShaderProperty.Runtime.asmdef.meta similarity index 100% rename from Assets/VRM/ShaderProperty/Runtime/ShaderProperty.Runtime.asmdef.meta rename to Assets/VRMShaders/ShaderProperty/Runtime/ShaderProperty.Runtime.asmdef.meta diff --git a/Assets/VRM/ShaderProperty/Runtime/ShaderProps.cs b/Assets/VRMShaders/ShaderProperty/Runtime/ShaderProps.cs similarity index 100% rename from Assets/VRM/ShaderProperty/Runtime/ShaderProps.cs rename to Assets/VRMShaders/ShaderProperty/Runtime/ShaderProps.cs diff --git a/Assets/VRM/ShaderProperty/Runtime/ShaderProps.cs.meta b/Assets/VRMShaders/ShaderProperty/Runtime/ShaderProps.cs.meta similarity index 100% rename from Assets/VRM/ShaderProperty/Runtime/ShaderProps.cs.meta rename to Assets/VRMShaders/ShaderProperty/Runtime/ShaderProps.cs.meta diff --git a/Assets/VRM/ShaderProperty/Runtime/VRM.meta b/Assets/VRMShaders/ShaderProperty/Runtime/VRM.meta similarity index 100% rename from Assets/VRM/ShaderProperty/Runtime/VRM.meta rename to Assets/VRMShaders/ShaderProperty/Runtime/VRM.meta diff --git a/Assets/VRM/ShaderProperty/Runtime/VRM/PreExportShaders_VRM.cs b/Assets/VRMShaders/ShaderProperty/Runtime/VRM/PreExportShaders_VRM.cs similarity index 100% rename from Assets/VRM/ShaderProperty/Runtime/VRM/PreExportShaders_VRM.cs rename to Assets/VRMShaders/ShaderProperty/Runtime/VRM/PreExportShaders_VRM.cs diff --git a/Assets/VRM/ShaderProperty/Runtime/VRM/PreExportShaders_VRM.cs.meta b/Assets/VRMShaders/ShaderProperty/Runtime/VRM/PreExportShaders_VRM.cs.meta similarity index 100% rename from Assets/VRM/ShaderProperty/Runtime/VRM/PreExportShaders_VRM.cs.meta rename to Assets/VRMShaders/ShaderProperty/Runtime/VRM/PreExportShaders_VRM.cs.meta diff --git a/Assets/VRM/ShaderProperty/Runtime/VRM/VRM_MToon.cs b/Assets/VRMShaders/ShaderProperty/Runtime/VRM/VRM_MToon.cs similarity index 100% rename from Assets/VRM/ShaderProperty/Runtime/VRM/VRM_MToon.cs rename to Assets/VRMShaders/ShaderProperty/Runtime/VRM/VRM_MToon.cs diff --git a/Assets/VRM/ShaderProperty/Runtime/VRM/VRM_MToon.cs.meta b/Assets/VRMShaders/ShaderProperty/Runtime/VRM/VRM_MToon.cs.meta similarity index 100% rename from Assets/VRM/ShaderProperty/Runtime/VRM/VRM_MToon.cs.meta rename to Assets/VRMShaders/ShaderProperty/Runtime/VRM/VRM_MToon.cs.meta diff --git a/Assets/VRM/ShaderProperty/Runtime/VRM/VRM_UnlitCutout.cs b/Assets/VRMShaders/ShaderProperty/Runtime/VRM/VRM_UnlitCutout.cs similarity index 100% rename from Assets/VRM/ShaderProperty/Runtime/VRM/VRM_UnlitCutout.cs rename to Assets/VRMShaders/ShaderProperty/Runtime/VRM/VRM_UnlitCutout.cs diff --git a/Assets/VRM/ShaderProperty/Runtime/VRM/VRM_UnlitCutout.cs.meta b/Assets/VRMShaders/ShaderProperty/Runtime/VRM/VRM_UnlitCutout.cs.meta similarity index 100% rename from Assets/VRM/ShaderProperty/Runtime/VRM/VRM_UnlitCutout.cs.meta rename to Assets/VRMShaders/ShaderProperty/Runtime/VRM/VRM_UnlitCutout.cs.meta diff --git a/Assets/VRM/ShaderProperty/Runtime/VRM/VRM_UnlitTexture.cs b/Assets/VRMShaders/ShaderProperty/Runtime/VRM/VRM_UnlitTexture.cs similarity index 100% rename from Assets/VRM/ShaderProperty/Runtime/VRM/VRM_UnlitTexture.cs rename to Assets/VRMShaders/ShaderProperty/Runtime/VRM/VRM_UnlitTexture.cs diff --git a/Assets/VRM/ShaderProperty/Runtime/VRM/VRM_UnlitTexture.cs.meta b/Assets/VRMShaders/ShaderProperty/Runtime/VRM/VRM_UnlitTexture.cs.meta similarity index 100% rename from Assets/VRM/ShaderProperty/Runtime/VRM/VRM_UnlitTexture.cs.meta rename to Assets/VRMShaders/ShaderProperty/Runtime/VRM/VRM_UnlitTexture.cs.meta diff --git a/Assets/VRM/ShaderProperty/Runtime/VRM/VRM_UnlitTransparent.cs b/Assets/VRMShaders/ShaderProperty/Runtime/VRM/VRM_UnlitTransparent.cs similarity index 100% rename from Assets/VRM/ShaderProperty/Runtime/VRM/VRM_UnlitTransparent.cs rename to Assets/VRMShaders/ShaderProperty/Runtime/VRM/VRM_UnlitTransparent.cs diff --git a/Assets/VRM/ShaderProperty/Runtime/VRM/VRM_UnlitTransparent.cs.meta b/Assets/VRMShaders/ShaderProperty/Runtime/VRM/VRM_UnlitTransparent.cs.meta similarity index 100% rename from Assets/VRM/ShaderProperty/Runtime/VRM/VRM_UnlitTransparent.cs.meta rename to Assets/VRMShaders/ShaderProperty/Runtime/VRM/VRM_UnlitTransparent.cs.meta diff --git a/Assets/VRM/ShaderProperty/Runtime/VRM/VRM_UnlitTransparentZWrite.cs b/Assets/VRMShaders/ShaderProperty/Runtime/VRM/VRM_UnlitTransparentZWrite.cs similarity index 100% rename from Assets/VRM/ShaderProperty/Runtime/VRM/VRM_UnlitTransparentZWrite.cs rename to Assets/VRMShaders/ShaderProperty/Runtime/VRM/VRM_UnlitTransparentZWrite.cs diff --git a/Assets/VRM/ShaderProperty/Runtime/VRM/VRM_UnlitTransparentZWrite.cs.meta b/Assets/VRMShaders/ShaderProperty/Runtime/VRM/VRM_UnlitTransparentZWrite.cs.meta similarity index 100% rename from Assets/VRM/ShaderProperty/Runtime/VRM/VRM_UnlitTransparentZWrite.cs.meta rename to Assets/VRMShaders/ShaderProperty/Runtime/VRM/VRM_UnlitTransparentZWrite.cs.meta diff --git a/Assets/VRM/UniUnlit.meta b/Assets/VRMShaders/UniUnlit.meta similarity index 100% rename from Assets/VRM/UniUnlit.meta rename to Assets/VRMShaders/UniUnlit.meta diff --git a/Assets/VRM/UniUnlit/Editor.meta b/Assets/VRMShaders/UniUnlit/Editor.meta similarity index 100% rename from Assets/VRM/UniUnlit/Editor.meta rename to Assets/VRMShaders/UniUnlit/Editor.meta diff --git a/Assets/VRM/UniUnlit/Editor/UniUnlit.Editor.asmdef b/Assets/VRMShaders/UniUnlit/Editor/UniUnlit.Editor.asmdef similarity index 100% rename from Assets/VRM/UniUnlit/Editor/UniUnlit.Editor.asmdef rename to Assets/VRMShaders/UniUnlit/Editor/UniUnlit.Editor.asmdef diff --git a/Assets/VRM/UniUnlit/Editor/UniUnlit.Editor.asmdef.meta b/Assets/VRMShaders/UniUnlit/Editor/UniUnlit.Editor.asmdef.meta similarity index 100% rename from Assets/VRM/UniUnlit/Editor/UniUnlit.Editor.asmdef.meta rename to Assets/VRMShaders/UniUnlit/Editor/UniUnlit.Editor.asmdef.meta diff --git a/Assets/VRM/UniUnlit/Editor/UniUnlitEditor.cs b/Assets/VRMShaders/UniUnlit/Editor/UniUnlitEditor.cs similarity index 100% rename from Assets/VRM/UniUnlit/Editor/UniUnlitEditor.cs rename to Assets/VRMShaders/UniUnlit/Editor/UniUnlitEditor.cs diff --git a/Assets/VRM/UniUnlit/Editor/UniUnlitEditor.cs.meta b/Assets/VRMShaders/UniUnlit/Editor/UniUnlitEditor.cs.meta similarity index 100% rename from Assets/VRM/UniUnlit/Editor/UniUnlitEditor.cs.meta rename to Assets/VRMShaders/UniUnlit/Editor/UniUnlitEditor.cs.meta diff --git a/Assets/VRM/UniUnlit/Resources.meta b/Assets/VRMShaders/UniUnlit/Resources.meta similarity index 100% rename from Assets/VRM/UniUnlit/Resources.meta rename to Assets/VRMShaders/UniUnlit/Resources.meta diff --git a/Assets/VRM/UniUnlit/Resources/UniUnlit.shader b/Assets/VRMShaders/UniUnlit/Resources/UniUnlit.shader similarity index 100% rename from Assets/VRM/UniUnlit/Resources/UniUnlit.shader rename to Assets/VRMShaders/UniUnlit/Resources/UniUnlit.shader diff --git a/Assets/VRM/UniUnlit/Resources/UniUnlit.shader.meta b/Assets/VRMShaders/UniUnlit/Resources/UniUnlit.shader.meta similarity index 100% rename from Assets/VRM/UniUnlit/Resources/UniUnlit.shader.meta rename to Assets/VRMShaders/UniUnlit/Resources/UniUnlit.shader.meta diff --git a/Assets/VRM/UniUnlit/Scripts.meta b/Assets/VRMShaders/UniUnlit/Scripts.meta similarity index 100% rename from Assets/VRM/UniUnlit/Scripts.meta rename to Assets/VRMShaders/UniUnlit/Scripts.meta diff --git a/Assets/VRM/UniUnlit/Scripts/Utils.cs b/Assets/VRMShaders/UniUnlit/Scripts/Utils.cs similarity index 100% rename from Assets/VRM/UniUnlit/Scripts/Utils.cs rename to Assets/VRMShaders/UniUnlit/Scripts/Utils.cs diff --git a/Assets/VRM/UniUnlit/Scripts/Utils.cs.meta b/Assets/VRMShaders/UniUnlit/Scripts/Utils.cs.meta similarity index 100% rename from Assets/VRM/UniUnlit/Scripts/Utils.cs.meta rename to Assets/VRMShaders/UniUnlit/Scripts/Utils.cs.meta diff --git a/Assets/VRM/UniUnlit/UniUnlit.asmdef b/Assets/VRMShaders/UniUnlit/UniUnlit.asmdef similarity index 100% rename from Assets/VRM/UniUnlit/UniUnlit.asmdef rename to Assets/VRMShaders/UniUnlit/UniUnlit.asmdef diff --git a/Assets/VRM/UniUnlit/UniUnlit.asmdef.meta b/Assets/VRMShaders/UniUnlit/UniUnlit.asmdef.meta similarity index 100% rename from Assets/VRM/UniUnlit/UniUnlit.asmdef.meta rename to Assets/VRMShaders/UniUnlit/UniUnlit.asmdef.meta diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 886d7e558b..d6e471307a 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1 +1,2 @@ -m_EditorVersion: 2018.4.23f1 +m_EditorVersion: 2019.4.0f1 +m_EditorVersionWithRevision: 2019.4.0f1 (0af376155913) From e303de9d7b5866136dcd82bd86b6430619a89b79 Mon Sep 17 00:00:00 2001 From: ousttrue Date: Fri, 19 Jun 2020 13:03:32 +0900 Subject: [PATCH 2/2] add VRMShaders/package.json --- Assets/VRM/package.json | 5 ++++- Assets/VRMShaders/package.json | 9 +++++++++ Assets/VRMShaders/package.json.meta | 7 +++++++ 3 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 Assets/VRMShaders/package.json create mode 100644 Assets/VRMShaders/package.json.meta diff --git a/Assets/VRM/package.json b/Assets/VRM/package.json index 3176ef6490..482518ffd7 100644 --- a/Assets/VRM/package.json +++ b/Assets/VRM/package.json @@ -5,5 +5,8 @@ "description" : "VRM importer", "unity" : "2017.1", "keywords" : [ "vrm", "importer", "avatar", "vr" ], - "author" : { "name": "VRM Consortium" } + "author" : { "name": "VRM Consortium" }, + "dependencies": { + "com.vrmc.vrmshaders": "0.56.0" + } } diff --git a/Assets/VRMShaders/package.json b/Assets/VRMShaders/package.json new file mode 100644 index 0000000000..d0ecba2de6 --- /dev/null +++ b/Assets/VRMShaders/package.json @@ -0,0 +1,9 @@ +{ + "name" : "com.vrmc.vrmshaders", + "version" : "0.56.0", + "displayName" : "VRM Shaders", + "description" : "VRM Shaders", + "unity" : "2017.1", + "keywords" : [ "vrm", "shader" ], + "author" : { "name": "VRM Consortium" } +} diff --git a/Assets/VRMShaders/package.json.meta b/Assets/VRMShaders/package.json.meta new file mode 100644 index 0000000000..e778f559e9 --- /dev/null +++ b/Assets/VRMShaders/package.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 0905ad83e0b774444bcc48ac9a191d51 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: