From 6339cf223701d5a8c95a1f3f0146cad77500ed67 Mon Sep 17 00:00:00 2001 From: Masataka SUMI Date: Tue, 23 Jul 2024 20:14:42 +0900 Subject: [PATCH 1/2] Delete VRMShaders (com.vrm-c.vrmshaders) Package --- Assets/{VRMShaders.meta => VRM/Settings.meta} | 2 +- .../Settings}/VRMShaders.shadervariants | 0 .../Settings}/VRMShaders.shadervariants.meta | 0 .../GLTF.meta => VRM10/Settings.meta} | 2 +- .../Settings}/VRM10Shaders.shadervariants | 0 .../VRM10Shaders.shadervariants.meta | 0 Assets/VRMShaders/CHANGELOG.md | 3 -- Assets/VRMShaders/CHANGELOG.md.meta | 7 ---- Assets/VRMShaders/Documentation.meta | 8 ----- Assets/VRMShaders/Documentation/VRMShaders.md | 6 ---- .../Documentation/VRMShaders.md.meta | 7 ---- Assets/VRMShaders/LICENSE.md | 10 ------ Assets/VRMShaders/LICENSE.md.meta | 7 ---- Assets/VRMShaders/README.md | 35 ------------------- Assets/VRMShaders/README.md.meta | 7 ---- Assets/VRMShaders/VRM.meta | 8 ----- Assets/VRMShaders/VRM10.meta | 8 ----- Assets/VRMShaders/package.json | 17 --------- Assets/VRMShaders/package.json.meta | 7 ---- 19 files changed, 2 insertions(+), 132 deletions(-) rename Assets/{VRMShaders.meta => VRM/Settings.meta} (77%) rename Assets/{VRMShaders/VRM => VRM/Settings}/VRMShaders.shadervariants (100%) rename Assets/{VRMShaders/VRM => VRM/Settings}/VRMShaders.shadervariants.meta (100%) rename Assets/{VRMShaders/GLTF.meta => VRM10/Settings.meta} (77%) rename Assets/{VRMShaders/VRM10 => VRM10/Settings}/VRM10Shaders.shadervariants (100%) rename Assets/{VRMShaders/VRM10 => VRM10/Settings}/VRM10Shaders.shadervariants.meta (100%) delete mode 100644 Assets/VRMShaders/CHANGELOG.md delete mode 100644 Assets/VRMShaders/CHANGELOG.md.meta delete mode 100644 Assets/VRMShaders/Documentation.meta delete mode 100644 Assets/VRMShaders/Documentation/VRMShaders.md delete mode 100644 Assets/VRMShaders/Documentation/VRMShaders.md.meta delete mode 100644 Assets/VRMShaders/LICENSE.md delete mode 100644 Assets/VRMShaders/LICENSE.md.meta delete mode 100644 Assets/VRMShaders/README.md delete mode 100644 Assets/VRMShaders/README.md.meta delete mode 100644 Assets/VRMShaders/VRM.meta delete mode 100644 Assets/VRMShaders/VRM10.meta delete mode 100644 Assets/VRMShaders/package.json delete mode 100644 Assets/VRMShaders/package.json.meta diff --git a/Assets/VRMShaders.meta b/Assets/VRM/Settings.meta similarity index 77% rename from Assets/VRMShaders.meta rename to Assets/VRM/Settings.meta index 83645dcc3..3259186ec 100644 --- a/Assets/VRMShaders.meta +++ b/Assets/VRM/Settings.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 503ae90aee4d0224db69e4e74762223b +guid: 6cf41692967c5544b8ceeb148cad87b3 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/VRMShaders/VRM/VRMShaders.shadervariants b/Assets/VRM/Settings/VRMShaders.shadervariants similarity index 100% rename from Assets/VRMShaders/VRM/VRMShaders.shadervariants rename to Assets/VRM/Settings/VRMShaders.shadervariants diff --git a/Assets/VRMShaders/VRM/VRMShaders.shadervariants.meta b/Assets/VRM/Settings/VRMShaders.shadervariants.meta similarity index 100% rename from Assets/VRMShaders/VRM/VRMShaders.shadervariants.meta rename to Assets/VRM/Settings/VRMShaders.shadervariants.meta diff --git a/Assets/VRMShaders/GLTF.meta b/Assets/VRM10/Settings.meta similarity index 77% rename from Assets/VRMShaders/GLTF.meta rename to Assets/VRM10/Settings.meta index da2660e13..1a4cea139 100644 --- a/Assets/VRMShaders/GLTF.meta +++ b/Assets/VRM10/Settings.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 3b19641943478e4459a38dcd6eeb86f3 +guid: 163e23db776ac5949b74480605c68c90 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/VRMShaders/VRM10/VRM10Shaders.shadervariants b/Assets/VRM10/Settings/VRM10Shaders.shadervariants similarity index 100% rename from Assets/VRMShaders/VRM10/VRM10Shaders.shadervariants rename to Assets/VRM10/Settings/VRM10Shaders.shadervariants diff --git a/Assets/VRMShaders/VRM10/VRM10Shaders.shadervariants.meta b/Assets/VRM10/Settings/VRM10Shaders.shadervariants.meta similarity index 100% rename from Assets/VRMShaders/VRM10/VRM10Shaders.shadervariants.meta rename to Assets/VRM10/Settings/VRM10Shaders.shadervariants.meta diff --git a/Assets/VRMShaders/CHANGELOG.md b/Assets/VRMShaders/CHANGELOG.md deleted file mode 100644 index ae2160651..000000000 --- a/Assets/VRMShaders/CHANGELOG.md +++ /dev/null @@ -1,3 +0,0 @@ -# Changelog - -Please refer to the latest release note in [Releases](https://github.com/vrm-c/UniVRM/releases) for all notable changes. diff --git a/Assets/VRMShaders/CHANGELOG.md.meta b/Assets/VRMShaders/CHANGELOG.md.meta deleted file mode 100644 index 69941543c..000000000 --- a/Assets/VRMShaders/CHANGELOG.md.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 8020a337ceab108438d088a3482a4b90 -TextScriptImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/VRMShaders/Documentation.meta b/Assets/VRMShaders/Documentation.meta deleted file mode 100644 index f58875e29..000000000 --- a/Assets/VRMShaders/Documentation.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 3dd33230757d1984894152dbacf595a6 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/VRMShaders/Documentation/VRMShaders.md b/Assets/VRMShaders/Documentation/VRMShaders.md deleted file mode 100644 index 8579ce033..000000000 --- a/Assets/VRMShaders/Documentation/VRMShaders.md +++ /dev/null @@ -1,6 +0,0 @@ -# VRMShaders - -VRM model's supported shaders in Unity: - -* MToon -* UniUnlit \ No newline at end of file diff --git a/Assets/VRMShaders/Documentation/VRMShaders.md.meta b/Assets/VRMShaders/Documentation/VRMShaders.md.meta deleted file mode 100644 index f3a3cc215..000000000 --- a/Assets/VRMShaders/Documentation/VRMShaders.md.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 21fb6bf38127a35498543f81ba8cc2e2 -TextScriptImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/VRMShaders/LICENSE.md b/Assets/VRMShaders/LICENSE.md deleted file mode 100644 index b12550174..000000000 --- a/Assets/VRMShaders/LICENSE.md +++ /dev/null @@ -1,10 +0,0 @@ -MIT License - -Copyright (c) 2020 VRM Consortium -Copyright (c) 2018 Masataka SUMI for MToon - -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice (including the next paragraph) shall be included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. \ No newline at end of file diff --git a/Assets/VRMShaders/LICENSE.md.meta b/Assets/VRMShaders/LICENSE.md.meta deleted file mode 100644 index 7e741cf6f..000000000 --- a/Assets/VRMShaders/LICENSE.md.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 00999fd020bde754ab4ae5f8a5205844 -TextScriptImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/VRMShaders/README.md b/Assets/VRMShaders/README.md deleted file mode 100644 index 77dc13e0a..000000000 --- a/Assets/VRMShaders/README.md +++ /dev/null @@ -1,35 +0,0 @@ -# VRMShaders - -VRM model's supported shaders in Unity. - -Shader と関連するユーティリティを切り離したパッケージ。 - -## 含まれるシェーダー - -### UniUnlit - -* Gltfの Unlit に適合するようにした。Unlit シェーダー - -### MToon - -* https://github.com/Santarh/MToon - -## UniGLTF.ShaderPropExporter.PreShaderPropExporter - -Unityでは、ランタイムにMaterialのPropertyを列挙することができない。 -Set/Get はできる。 -事前に一覧を作成するユーティリティ。 - -## UPM usage (Unity 2019.3.4f1~) - -`Window` -> `Package Manager` -> `Add package from git URL` and paste `https://github.com/vrm-c/UniVRM.git?path=/Assets/VRMShaders`. - -or add the package name and git URL in `Packages/manifest.json`: - -```json -{ - "dependencies": { - "com.vrmc.vrmshaders": "https://github.com/vrm-c/UniVRM.git?path=/Assets/VRMShaders", - } -} -``` diff --git a/Assets/VRMShaders/README.md.meta b/Assets/VRMShaders/README.md.meta deleted file mode 100644 index 394b60a74..000000000 --- a/Assets/VRMShaders/README.md.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 4918a8517e721c5429d0f8033ae065c7 -TextScriptImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/VRMShaders/VRM.meta b/Assets/VRMShaders/VRM.meta deleted file mode 100644 index 2022a2d8b..000000000 --- a/Assets/VRMShaders/VRM.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 67bc2cd71cccda64bba542dc0d8c2c9f -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/VRMShaders/VRM10.meta b/Assets/VRMShaders/VRM10.meta deleted file mode 100644 index 5b091fcb2..000000000 --- a/Assets/VRMShaders/VRM10.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 6fd2c7dcb3464e340814d2a7289e9790 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/VRMShaders/package.json b/Assets/VRMShaders/package.json deleted file mode 100644 index 898e3fc3a..000000000 --- a/Assets/VRMShaders/package.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "name": "com.vrmc.vrmshaders", - "version": "0.124.2", - "displayName": "VRM Shaders", - "description": "VRM Shaders", - "unity": "2021.3", - "keywords": [ - "vrm", - "shader" - ], - "author": { - "name": "VRM Consortium" - }, - "dependencies": { - "com.unity.modules.imageconversion": "1.0.0" - } -} diff --git a/Assets/VRMShaders/package.json.meta b/Assets/VRMShaders/package.json.meta deleted file mode 100644 index e778f559e..000000000 --- a/Assets/VRMShaders/package.json.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 0905ad83e0b774444bcc48ac9a191d51 -TextScriptImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: From da1d48ac229d09c775e676cda527ed9ccf7eaa49 Mon Sep 17 00:00:00 2001 From: Masataka SUMI Date: Tue, 23 Jul 2024 20:21:41 +0900 Subject: [PATCH 2/2] update package.json management --- Assets/UniGLTF/package.json | 1 - Assets/VRM/Editor/Format/VRMVersionMenu.cs | 22 ---------------------- Assets/VRM/package.json | 1 - Assets/VRM10/package.json | 1 - 4 files changed, 25 deletions(-) diff --git a/Assets/UniGLTF/package.json b/Assets/UniGLTF/package.json index 5756de268..e4822d40d 100644 --- a/Assets/UniGLTF/package.json +++ b/Assets/UniGLTF/package.json @@ -11,7 +11,6 @@ "name": "VRM Consortium" }, "dependencies": { - "com.vrmc.vrmshaders": "0.124.2", "com.unity.modules.animation": "1.0.0" }, "samples": [ diff --git a/Assets/VRM/Editor/Format/VRMVersionMenu.cs b/Assets/VRM/Editor/Format/VRMVersionMenu.cs index 95aea3333..92f9f2b9d 100644 --- a/Assets/VRM/Editor/Format/VRMVersionMenu.cs +++ b/Assets/VRM/Editor/Format/VRMVersionMenu.cs @@ -68,25 +68,6 @@ namespace UniGLTF UpmPackage[] Packages = new UpmPackage[] { - new UpmPackage("Assets/VRMShaders/package.json", -@"{{ - ""name"": ""com.vrmc.vrmshaders"", - ""version"": ""{1}"", - ""displayName"": ""VRM Shaders"", - ""description"": ""VRM Shaders"", - ""unity"": ""2021.3"", - ""keywords"": [ - ""vrm"", - ""shader"" - ], - ""author"": {{ - ""name"": ""VRM Consortium"" - }}, - ""dependencies"": {{ - ""com.unity.modules.imageconversion"": ""1.0.0"" - }} -}} -"), new UpmPackage("Assets/VRM/package.json", @"{{ ""name"": ""com.vrmc.univrm"", @@ -104,7 +85,6 @@ namespace UniGLTF ""name"": ""VRM Consortium"" }}, ""dependencies"": {{ - ""com.vrmc.vrmshaders"": ""{1}"", ""com.vrmc.gltf"": ""{0}"", ""com.unity.ugui"": ""1.0.0"" }}, @@ -150,7 +130,6 @@ namespace UniGLTF ""name"": ""VRM Consortium"" }}, ""dependencies"": {{ - ""com.vrmc.vrmshaders"": ""{1}"", ""com.vrmc.gltf"": ""{0}"" }}, ""samples"": [ @@ -184,7 +163,6 @@ namespace UniGLTF ""name"": ""VRM Consortium"" }}, ""dependencies"": {{ - ""com.vrmc.vrmshaders"": ""{1}"", ""com.unity.modules.animation"": ""1.0.0"" }}, ""samples"": [ diff --git a/Assets/VRM/package.json b/Assets/VRM/package.json index 5e360c1be..4a527ae19 100644 --- a/Assets/VRM/package.json +++ b/Assets/VRM/package.json @@ -14,7 +14,6 @@ "name": "VRM Consortium" }, "dependencies": { - "com.vrmc.vrmshaders": "0.124.2", "com.vrmc.gltf": "0.124.2", "com.unity.ugui": "1.0.0" }, diff --git a/Assets/VRM10/package.json b/Assets/VRM10/package.json index 7e91df3a7..3e977bd0d 100644 --- a/Assets/VRM10/package.json +++ b/Assets/VRM10/package.json @@ -14,7 +14,6 @@ "name": "VRM Consortium" }, "dependencies": { - "com.vrmc.vrmshaders": "0.124.2", "com.vrmc.gltf": "0.124.2" }, "samples": [