From fd198ac10d9f0c1ccc3e2badeec82713e8cb9727 Mon Sep 17 00:00:00 2001 From: ousttrue Date: Wed, 24 Mar 2021 21:00:23 +0900 Subject: [PATCH] VRMShaders.{NormalConverter,OcclusionMetallicRoughnessConverter} --- Assets/UniGLTF/Tests/UniGLTF/TextureTests.cs | 1 + .../IO/TextureIO => VRMShaders/Runtime}/NormalConverter.cs | 4 ++-- .../TextureIO => VRMShaders/Runtime}/NormalConverter.cs.meta | 0 .../Runtime}/OcclusionMetallicRoughnessConverter.cs | 4 ++-- .../Runtime}/OcclusionMetallicRoughnessConverter.cs.meta | 0 5 files changed, 5 insertions(+), 4 deletions(-) rename Assets/{UniGLTF/Runtime/UniGLTF/IO/TextureIO => VRMShaders/Runtime}/NormalConverter.cs (97%) rename Assets/{UniGLTF/Runtime/UniGLTF/IO/TextureIO => VRMShaders/Runtime}/NormalConverter.cs.meta (100%) rename Assets/{UniGLTF/Runtime/UniGLTF/IO/TextureIO => VRMShaders/Runtime}/OcclusionMetallicRoughnessConverter.cs (99%) rename Assets/{UniGLTF/Runtime/UniGLTF/IO/TextureIO => VRMShaders/Runtime}/OcclusionMetallicRoughnessConverter.cs.meta (100%) diff --git a/Assets/UniGLTF/Tests/UniGLTF/TextureTests.cs b/Assets/UniGLTF/Tests/UniGLTF/TextureTests.cs index 62a80736e..c99e97696 100644 --- a/Assets/UniGLTF/Tests/UniGLTF/TextureTests.cs +++ b/Assets/UniGLTF/Tests/UniGLTF/TextureTests.cs @@ -1,5 +1,6 @@ using NUnit.Framework; using UnityEngine; +using VRMShaders; namespace UniGLTF { diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/NormalConverter.cs b/Assets/VRMShaders/Runtime/NormalConverter.cs similarity index 97% rename from Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/NormalConverter.cs rename to Assets/VRMShaders/Runtime/NormalConverter.cs index 54420cc12..4a08f3d42 100644 --- a/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/NormalConverter.cs +++ b/Assets/VRMShaders/Runtime/NormalConverter.cs @@ -1,7 +1,7 @@ using UnityEngine; -using VRMShaders; -namespace UniGLTF + +namespace VRMShaders { public static class NormalConverter { diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/NormalConverter.cs.meta b/Assets/VRMShaders/Runtime/NormalConverter.cs.meta similarity index 100% rename from Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/NormalConverter.cs.meta rename to Assets/VRMShaders/Runtime/NormalConverter.cs.meta diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/OcclusionMetallicRoughnessConverter.cs b/Assets/VRMShaders/Runtime/OcclusionMetallicRoughnessConverter.cs similarity index 99% rename from Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/OcclusionMetallicRoughnessConverter.cs rename to Assets/VRMShaders/Runtime/OcclusionMetallicRoughnessConverter.cs index dbc095ab3..787eba8f2 100644 --- a/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/OcclusionMetallicRoughnessConverter.cs +++ b/Assets/VRMShaders/Runtime/OcclusionMetallicRoughnessConverter.cs @@ -1,9 +1,9 @@ using System; using System.Linq; using UnityEngine; -using VRMShaders; -namespace UniGLTF + +namespace VRMShaders { /// /// diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/OcclusionMetallicRoughnessConverter.cs.meta b/Assets/VRMShaders/Runtime/OcclusionMetallicRoughnessConverter.cs.meta similarity index 100% rename from Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/OcclusionMetallicRoughnessConverter.cs.meta rename to Assets/VRMShaders/Runtime/OcclusionMetallicRoughnessConverter.cs.meta