From f874a4d973146586340373f5858f0484af113252 Mon Sep 17 00:00:00 2001 From: Masataka SUMI Date: Thu, 9 Sep 2021 14:46:08 +0900 Subject: [PATCH 1/2] mv UniUnlit to Resources --- Assets/VRMShaders/GLTF/UniUnlit/Resources.meta | 8 ++++++++ Assets/VRMShaders/GLTF/UniUnlit/Resources/UniGLTF.meta | 8 ++++++++ .../{Runtime => Resources/UniGLTF}/UniUnlit.shader | 0 .../{Runtime => Resources/UniGLTF}/UniUnlit.shader.meta | 0 4 files changed, 16 insertions(+) create mode 100644 Assets/VRMShaders/GLTF/UniUnlit/Resources.meta create mode 100644 Assets/VRMShaders/GLTF/UniUnlit/Resources/UniGLTF.meta rename Assets/VRMShaders/GLTF/UniUnlit/{Runtime => Resources/UniGLTF}/UniUnlit.shader (100%) rename Assets/VRMShaders/GLTF/UniUnlit/{Runtime => Resources/UniGLTF}/UniUnlit.shader.meta (100%) diff --git a/Assets/VRMShaders/GLTF/UniUnlit/Resources.meta b/Assets/VRMShaders/GLTF/UniUnlit/Resources.meta new file mode 100644 index 000000000..cec1abd10 --- /dev/null +++ b/Assets/VRMShaders/GLTF/UniUnlit/Resources.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3254d78d0dc8f2845a12b4646c4334a8 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/VRMShaders/GLTF/UniUnlit/Resources/UniGLTF.meta b/Assets/VRMShaders/GLTF/UniUnlit/Resources/UniGLTF.meta new file mode 100644 index 000000000..76f73cc78 --- /dev/null +++ b/Assets/VRMShaders/GLTF/UniUnlit/Resources/UniGLTF.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: be338bf3da0a3eb4d98dc3fd229fe6b5 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/VRMShaders/GLTF/UniUnlit/Runtime/UniUnlit.shader b/Assets/VRMShaders/GLTF/UniUnlit/Resources/UniGLTF/UniUnlit.shader similarity index 100% rename from Assets/VRMShaders/GLTF/UniUnlit/Runtime/UniUnlit.shader rename to Assets/VRMShaders/GLTF/UniUnlit/Resources/UniGLTF/UniUnlit.shader diff --git a/Assets/VRMShaders/GLTF/UniUnlit/Runtime/UniUnlit.shader.meta b/Assets/VRMShaders/GLTF/UniUnlit/Resources/UniGLTF/UniUnlit.shader.meta similarity index 100% rename from Assets/VRMShaders/GLTF/UniUnlit/Runtime/UniUnlit.shader.meta rename to Assets/VRMShaders/GLTF/UniUnlit/Resources/UniGLTF/UniUnlit.shader.meta From 4bd88b907b15dc597b83eb10708a4781dbac503b Mon Sep 17 00:00:00 2001 From: Masataka SUMI Date: Thu, 9 Sep 2021 14:46:32 +0900 Subject: [PATCH 2/2] mv texture convert shaders to VRMShaders --- Assets/VRMShaders/GLTF/IO/Resources.meta | 8 ++++++++ .../GLTF/IO/Resources/UniGLTF.meta} | 0 .../GLTF/IO/Resources/UniGLTF}/NormalMapExporter.shader | 0 .../IO/Resources/UniGLTF}/NormalMapExporter.shader.meta | 0 .../GLTF/IO/Resources/UniGLTF}/StandardMapImporter.shader | 0 .../IO/Resources/UniGLTF}/StandardMapImporter.shader.meta | 0 6 files changed, 8 insertions(+) create mode 100644 Assets/VRMShaders/GLTF/IO/Resources.meta rename Assets/{UniGLTF/Runtime/UniGLTF/IO/TextureIO/Shaders.meta => VRMShaders/GLTF/IO/Resources/UniGLTF.meta} (100%) rename Assets/{UniGLTF/Runtime/UniGLTF/IO/TextureIO/Shaders => VRMShaders/GLTF/IO/Resources/UniGLTF}/NormalMapExporter.shader (100%) rename Assets/{UniGLTF/Runtime/UniGLTF/IO/TextureIO/Shaders => VRMShaders/GLTF/IO/Resources/UniGLTF}/NormalMapExporter.shader.meta (100%) rename Assets/{UniGLTF/Runtime/UniGLTF/IO/TextureIO/Shaders => VRMShaders/GLTF/IO/Resources/UniGLTF}/StandardMapImporter.shader (100%) rename Assets/{UniGLTF/Runtime/UniGLTF/IO/TextureIO/Shaders => VRMShaders/GLTF/IO/Resources/UniGLTF}/StandardMapImporter.shader.meta (100%) diff --git a/Assets/VRMShaders/GLTF/IO/Resources.meta b/Assets/VRMShaders/GLTF/IO/Resources.meta new file mode 100644 index 000000000..425883b1a --- /dev/null +++ b/Assets/VRMShaders/GLTF/IO/Resources.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 034bb18e768d95c478bb1af5b8d36a58 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Shaders.meta b/Assets/VRMShaders/GLTF/IO/Resources/UniGLTF.meta similarity index 100% rename from Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Shaders.meta rename to Assets/VRMShaders/GLTF/IO/Resources/UniGLTF.meta diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Shaders/NormalMapExporter.shader b/Assets/VRMShaders/GLTF/IO/Resources/UniGLTF/NormalMapExporter.shader similarity index 100% rename from Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Shaders/NormalMapExporter.shader rename to Assets/VRMShaders/GLTF/IO/Resources/UniGLTF/NormalMapExporter.shader diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Shaders/NormalMapExporter.shader.meta b/Assets/VRMShaders/GLTF/IO/Resources/UniGLTF/NormalMapExporter.shader.meta similarity index 100% rename from Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Shaders/NormalMapExporter.shader.meta rename to Assets/VRMShaders/GLTF/IO/Resources/UniGLTF/NormalMapExporter.shader.meta diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Shaders/StandardMapImporter.shader b/Assets/VRMShaders/GLTF/IO/Resources/UniGLTF/StandardMapImporter.shader similarity index 100% rename from Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Shaders/StandardMapImporter.shader rename to Assets/VRMShaders/GLTF/IO/Resources/UniGLTF/StandardMapImporter.shader diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Shaders/StandardMapImporter.shader.meta b/Assets/VRMShaders/GLTF/IO/Resources/UniGLTF/StandardMapImporter.shader.meta similarity index 100% rename from Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Shaders/StandardMapImporter.shader.meta rename to Assets/VRMShaders/GLTF/IO/Resources/UniGLTF/StandardMapImporter.shader.meta