From 2438516bdac67012ff050fbf9e4ed5f5566628ae Mon Sep 17 00:00:00 2001 From: ousttrue Date: Wed, 24 Mar 2021 15:56:33 +0900 Subject: [PATCH] namespace VRMShaders --- .../UniGLTF/Editor/UniGLTF/ScriptedImporter/EditorMaterial.cs | 1 + .../Editor/UniGLTF/ScriptedImporter/ScriptedImporterImpl.cs | 1 + .../UniGLTF/Editor/UniGLTF/ScriptedImporter/TextureExtractor.cs | 1 + Assets/UniGLTF/Editor/UniGLTF/TextureImporterConfigurator.cs | 1 + .../Runtime/UniGLTF/IO/MaterialIO/GltfTextureEnumerator.cs | 1 + Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/PBRMaterialItem.cs | 1 + .../UniGLTF/Runtime/UniGLTF/IO/TextureIO/GltfTextureExporter.cs | 1 + Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/TextureFactory.cs | 1 + Assets/VRM/Runtime/IO/VRMTextureEnumerator.cs | 1 + Assets/VRMShaders/Runtime/GetTextureParam.cs | 2 +- 10 files changed, 10 insertions(+), 1 deletion(-) diff --git a/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/EditorMaterial.cs b/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/EditorMaterial.cs index e33e4512b..737b695a3 100644 --- a/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/EditorMaterial.cs +++ b/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/EditorMaterial.cs @@ -4,6 +4,7 @@ using System.IO; using System.Linq; using UnityEditor; using UnityEngine; +using VRMShaders; #if UNITY_2020_2_OR_NEWER using UnityEditor.AssetImporters; #else diff --git a/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/ScriptedImporterImpl.cs b/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/ScriptedImporterImpl.cs index 23f2ecdf2..ff13e7718 100644 --- a/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/ScriptedImporterImpl.cs +++ b/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/ScriptedImporterImpl.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Linq; using UnityEditor; using UnityEngine; +using VRMShaders; #if UNITY_2020_2_OR_NEWER using UnityEditor.AssetImporters; #else diff --git a/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/TextureExtractor.cs b/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/TextureExtractor.cs index 0d1a06f47..957a5e469 100644 --- a/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/TextureExtractor.cs +++ b/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/TextureExtractor.cs @@ -4,6 +4,7 @@ using System.IO; using UnityEngine; using UnityEditor; using System.Linq; +using VRMShaders; namespace UniGLTF { diff --git a/Assets/UniGLTF/Editor/UniGLTF/TextureImporterConfigurator.cs b/Assets/UniGLTF/Editor/UniGLTF/TextureImporterConfigurator.cs index 358ae0833..941ea62a7 100644 --- a/Assets/UniGLTF/Editor/UniGLTF/TextureImporterConfigurator.cs +++ b/Assets/UniGLTF/Editor/UniGLTF/TextureImporterConfigurator.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using UnityEditor; using UnityEngine; +using VRMShaders; namespace UniGLTF { diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/GltfTextureEnumerator.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/GltfTextureEnumerator.cs index a5d450fe2..5e61abfa3 100644 --- a/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/GltfTextureEnumerator.cs +++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/GltfTextureEnumerator.cs @@ -1,4 +1,5 @@ using System.Collections.Generic; +using VRMShaders; namespace UniGLTF { diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/PBRMaterialItem.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/PBRMaterialItem.cs index 0ba8aef78..5c13c110c 100644 --- a/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/PBRMaterialItem.cs +++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/PBRMaterialItem.cs @@ -1,6 +1,7 @@  using System.Threading.Tasks; using UnityEngine; +using VRMShaders; namespace UniGLTF { diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/GltfTextureExporter.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/GltfTextureExporter.cs index 66c7664ab..7f5eb3e9d 100644 --- a/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/GltfTextureExporter.cs +++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/GltfTextureExporter.cs @@ -1,4 +1,5 @@ using UnityEngine; +using VRMShaders; namespace UniGLTF { diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/TextureFactory.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/TextureFactory.cs index b541d893b..58798c730 100644 --- a/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/TextureFactory.cs +++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/TextureFactory.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using UnityEngine; using System.Linq; using System.Threading.Tasks; +using VRMShaders; #if UNITY_EDITOR using UnityEditor; #endif diff --git a/Assets/VRM/Runtime/IO/VRMTextureEnumerator.cs b/Assets/VRM/Runtime/IO/VRMTextureEnumerator.cs index 6ff2cc8a7..411e04bd8 100644 --- a/Assets/VRM/Runtime/IO/VRMTextureEnumerator.cs +++ b/Assets/VRM/Runtime/IO/VRMTextureEnumerator.cs @@ -1,5 +1,6 @@ using System.Collections.Generic; using UniGLTF; +using VRMShaders; namespace VRM { diff --git a/Assets/VRMShaders/Runtime/GetTextureParam.cs b/Assets/VRMShaders/Runtime/GetTextureParam.cs index 95b36d83f..624aa01c6 100644 --- a/Assets/VRMShaders/Runtime/GetTextureParam.cs +++ b/Assets/VRMShaders/Runtime/GetTextureParam.cs @@ -3,7 +3,7 @@ using System.Threading.Tasks; using UnityEngine; -namespace UniGLTF +namespace VRMShaders { public delegate Task> GetTextureBytesAsync();