Leahnaya/UniVRM
1
0
Fork 0
mirror of https://github.com/vrm-c/UniVRM.git synced 2026-04-24 15:08:02 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

mv VRMShaders namespace to UniGLTF

Browse Source
This commit is contained in:
Masataka SUMI 2024-07-20 23:47:45 +09:00
parent d0dcdf09fc
commit e9da5e2b7b
148 changed files with 107 additions and 225 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Assets/UniGLTF/Editor/UniGLTF/ExportDialog/ExportDialogState.cs
View File

@ -2,7 +2,6 @@ using System;
using System.Collections.Generic;
using UnityEditor;
using UnityEngine;
using VRMShaders;
namespace UniGLTF
{

2
Assets/UniGLTF/Editor/UniGLTF/ExportDialog/GltfExportWindow.cs
View File

@ -1,9 +1,7 @@
using System.Collections.Generic;
using System.IO;
using System.Linq;
using UnityEditor;
using UnityEngine;
using VRMShaders;
namespace UniGLTF
{

2
Assets/UniGLTF/Editor/UniGLTF/IO/Texture/EditorTextureUtility.cs
View File

@ -3,7 +3,7 @@ using System.Reflection;
using UnityEditor;
using UnityEngine;
namespace VRMShaders
namespace UniGLTF
{
internal static class EditorTextureUtility
{

2
Assets/UniGLTF/Editor/UniGLTF/IO/Texture/Exporter/EditorTextureSerializer.cs
View File

@ -3,7 +3,7 @@ using System.IO;
using UnityEditor;
using UnityEngine;
namespace VRMShaders
namespace UniGLTF
{
public sealed class EditorTextureSerializer : ITextureSerializer
{

3
Assets/UniGLTF/Editor/UniGLTF/IO/Texture/Importer/TextureImporterConfigurator.cs
View File

@ -3,8 +3,7 @@ using System.Collections.Generic;
using UnityEditor;
using UnityEngine;
namespace VRMShaders
namespace UniGLTF
{
public static class TextureImporterConfigurator
{

3
Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/GlbScriptedImporterEditor.cs
View File

@ -2,8 +2,7 @@ using UnityEditor;
using UnityEngine;
using System.IO;
using System.Linq;
using System.Collections.Generic;
using VRMShaders;
#if UNITY_2020_2_OR_NEWER
using UnityEditor.AssetImporters;
#else

2
Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/GltfScriptedImporterBase.cs
View File

@ -1,6 +1,6 @@
using UnityEngine;
using System.Linq;
using VRMShaders;
#if UNITY_2020_2_OR_NEWER
using UnityEditor.AssetImporters;
#else

5
Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/RemapEditorAnimation.cs
View File

@ -1,13 +1,12 @@
using System.Collections.Generic;
using System.Linq;
using UnityEditor;
using UnityEngine;
#if UNITY_2020_1_OR_NEWER
using UnityEditor.AssetImporters;
#else
using UnityEditor.Experimental.AssetImporters;
#endif
using UnityEngine;
using VRMShaders;
namespace UniGLTF
{

4
Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/RemapEditorBase.cs
View File

@ -3,13 +3,13 @@ using System.Collections.Generic;
using System.IO;
using System.Linq;
using UnityEditor;
using UnityEngine;
#if UNITY_2020_1_OR_NEWER
using UnityEditor.AssetImporters;
#else
using UnityEditor.Experimental.AssetImporters;
#endif
using UnityEngine;
using VRMShaders;
namespace UniGLTF
{

2
Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/RemapEditorMaterial.cs
View File

@ -4,7 +4,7 @@ using System.IO;
using System.Linq;
using UnityEditor;
using UnityEngine;
using VRMShaders;
#if UNITY_2020_2_OR_NEWER
using UnityEditor.AssetImporters;
#else

4
Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/RemapScriptedImporterEditorBase.cs
View File

@ -1,13 +1,13 @@
using System.Collections.Generic;
using System.Linq;
using UnityEditor;
using UnityEngine;
#if UNITY_2020_1_OR_NEWER
using UnityEditor.AssetImporters;
#else
using UnityEditor.Experimental.AssetImporters;
#endif
using UnityEngine;
using VRMShaders;
namespace UniGLTF
{

2
Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/TextureExtractor.cs
View File

@ -3,9 +3,7 @@ using System.Collections.Generic;
using System.IO;
using UnityEngine;
using UnityEditor;
using UniGLTF;
using System.Linq;
using VRMShaders;
namespace UniGLTF
{

1
Assets/UniGLTF/Runtime/Extensions/ColorConversionExtensions.cs
View File

@ -1,6 +1,5 @@
using System;
using UnityEngine;
using ColorSpace = VRMShaders.ColorSpace;
namespace UniGLTF
{

1
Assets/UniGLTF/Runtime/MeshUtility/BoneMeshEraser.cs
View File

@ -2,7 +2,6 @@
using System.Collections.Generic;
using System.Threading.Tasks;
using UnityEngine;
using VRMShaders;
namespace UniGLTF.MeshUtility
{

2
Assets/UniGLTF/Runtime/MeshUtility/MeshExtensions.cs
View File

@ -1,7 +1,5 @@
using UnityEngine;
using System.Linq;
using VRMShaders;
using System;
using System.Collections.Generic;

2
Assets/UniGLTF/Runtime/MeshUtility/MeshFreezer.cs
View File

@ -2,8 +2,6 @@ using System;
using System.Collections.Generic;
using System.Linq;
using UnityEngine;
using UnityEngine.UIElements;
using VRMShaders;
namespace UniGLTF.MeshUtility
{

2
Assets/UniGLTF/Runtime/UniGLTF/IO/AnimationIO/Import/AnimationClipFactory.cs
View File

@ -4,7 +4,7 @@ using System.Linq;
using System.Threading.Tasks;
using UnityEngine;
namespace VRMShaders
namespace UniGLTF
{
public class AnimationClipFactory : IResponsibilityForDestroyObjects
{

5
Assets/UniGLTF/Runtime/UniGLTF/IO/AnimationIO/Import/AnimationImporterUtil.cs
View File

@ -3,7 +3,6 @@ using System.Linq;
using System.Collections.Generic;
using System.Threading.Tasks;
using UnityEngine;
using VRMShaders;
namespace UniGLTF
{
@ -346,11 +345,11 @@ namespace UniGLTF
});
}
public static IEnumerable<VRMShaders.SubAssetKey> EnumerateSubAssetKeys(glTF gltf)
public static IEnumerable<SubAssetKey> EnumerateSubAssetKeys(glTF gltf)
{
foreach (var gltfAnimation in gltf.animations)
{
yield return new VRMShaders.SubAssetKey(typeof(AnimationClip), gltfAnimation.name);
yield return new SubAssetKey(typeof(AnimationClip), gltfAnimation.name);
}
}
}

2
Assets/UniGLTF/Runtime/UniGLTF/IO/AwaitCaller/IAwaitCaller.cs
View File

@ -1,7 +1,7 @@
using System;
using System.Threading.Tasks;
namespace VRMShaders
namespace UniGLTF
{
/// <summary>
/// ImporterContext の 非同期実行 LoadAsync を補助する。

2
Assets/UniGLTF/Runtime/UniGLTF/IO/AwaitCaller/ImmediateCaller.cs
View File

@ -1,7 +1,7 @@
using System;
using System.Threading.Tasks;
namespace VRMShaders
namespace UniGLTF
{
/// <summary>
/// 同期実行

2
Assets/UniGLTF/Runtime/UniGLTF/IO/AwaitCaller/NextFrameTaskScheduler.cs
View File

@ -2,7 +2,7 @@
using UnityEngine;
using Object = UnityEngine.Object;
namespace VRMShaders
namespace UniGLTF
{
internal sealed class NextFrameTaskScheduler
{

2
Assets/UniGLTF/Runtime/UniGLTF/IO/AwaitCaller/RuntimeOnlyAwaitCaller.cs
View File

@ -1,7 +1,7 @@
using System;
using System.Threading.Tasks;
namespace VRMShaders
namespace UniGLTF
{
/// <summary>
/// Runtime (Build 後と、Editor Playing) での非同期ロードを実現する AwaitCaller.

2
Assets/UniGLTF/Runtime/UniGLTF/IO/AwaitCaller/RuntimeOnlyNoThreadAwaitCaller.cs
View File

@ -1,7 +1,7 @@
using System;
using System.Threading.Tasks;
namespace VRMShaders
namespace UniGLTF
{
/// <summary>
/// Runtime (Build 後と、Editor Playing) での非同期ロードを実現する AwaitCaller.

2
Assets/UniGLTF/Runtime/UniGLTF/IO/AwaitCaller/TinyManagedTaskScheduler.cs
View File

@ -1,7 +1,7 @@
using System;
using System.Collections.Concurrent;
namespace VRMShaders
namespace UniGLTF
{
internal sealed class TinyManagedTaskScheduler
{

2
Assets/UniGLTF/Runtime/UniGLTF/IO/ColorSpace.cs
View File

@ -1,4 +1,4 @@
namespace VRMShaders
namespace UniGLTF
{
public enum ColorSpace
{

1
Assets/UniGLTF/Runtime/UniGLTF/IO/GltfUtility.cs
View File

@ -2,7 +2,6 @@ using System;
using System.IO;
using System.Threading.Tasks;
using UnityEngine;
using VRMShaders;
namespace UniGLTF
{

2
Assets/UniGLTF/Runtime/UniGLTF/IO/IResponsibilityForDestroyObjects.cs
View File

@ -1,6 +1,6 @@
using System;
namespace VRMShaders
namespace UniGLTF
{
public delegate void TakeResponsibilityForDestroyObjectFunc(SubAssetKey key, UnityEngine.Object obj);

1
Assets/UniGLTF/Runtime/UniGLTF/IO/ImporterContext.cs
View File

@ -4,7 +4,6 @@ using System.Collections.Generic;
using UnityEngine;
using System.Threading.Tasks;
using UnityEngine.Profiling;
using VRMShaders;
namespace UniGLTF
{

1
Assets/UniGLTF/Runtime/UniGLTF/IO/ImporterContextExtensions.cs
View File

@ -1,6 +1,5 @@
using System;
using UnityEngine;
using VRMShaders;
namespace UniGLTF
{

1
Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/BuiltInRP/Export/BuiltInGltfMaterialExporter.cs
View File

@ -1,5 +1,4 @@
using UnityEngine;
using VRMShaders;
namespace UniGLTF
{

2
Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/BuiltInRP/Export/Materials/BuiltInFallbackMaterialExporter.cs
View File

@ -1,7 +1,5 @@
using System;
using UnityEngine;
using VRMShaders;
using ColorSpace = VRMShaders.ColorSpace;
namespace UniGLTF
{

2
Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/BuiltInRP/Export/Materials/BuiltInGenericUnlitMaterialExporter.cs
View File

@ -1,7 +1,5 @@
using System;
using UnityEngine;
using VRMShaders;
using ColorSpace = VRMShaders.ColorSpace;
namespace UniGLTF
{

2
Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/BuiltInRP/Export/Materials/BuiltInStandardMaterialExporter.cs
View File

@ -1,8 +1,6 @@
using System;
using System.Linq;
using UnityEngine;
using VRMShaders;
using ColorSpace = VRMShaders.ColorSpace;
namespace UniGLTF
{

2
Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/BuiltInRP/Export/Materials/BuiltInUniUnlitMaterialExporter.cs
View File

@ -1,8 +1,6 @@
using System;
using UniGLTF.UniUnlit;
using UnityEngine;
using VRMShaders;
using ColorSpace = VRMShaders.ColorSpace;
namespace UniGLTF
{

2
Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/BuiltInRP/Import/BuiltInGltfMaterialDescriptorGenerator.cs
View File

@ -1,8 +1,6 @@
using System;
using System.Collections.Generic;
using UnityEngine;
using VRMShaders;
namespace UniGLTF
{

1
Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/BuiltInRP/Import/Materials/BuiltInGltfDefaultMaterialImporter.cs
View File

@ -1,7 +1,6 @@
using System;
using System.Collections.Generic;
using UnityEngine;
using VRMShaders;
namespace UniGLTF
{

3
Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/BuiltInRP/Import/Materials/BuiltInGltfPbrMaterialImporter.cs
View File

@ -1,9 +1,6 @@
using System;
using System.Collections.Generic;
using System.Linq;
using UnityEngine;
using VRMShaders;
using ColorSpace = VRMShaders.ColorSpace;
namespace UniGLTF
{

2
Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/BuiltInRP/Import/Materials/BuiltInGltfUnlitMaterialImporter.cs
View File

@ -2,8 +2,6 @@
using System.Collections.Generic;
using UniGLTF.UniUnlit;
using UnityEngine;
using VRMShaders;
using ColorSpace = VRMShaders.ColorSpace;
namespace UniGLTF
{

1
Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/Export/IMaterialExporter.cs
View File

@ -1,5 +1,4 @@
using UnityEngine;
using VRMShaders;
namespace UniGLTF
{

3
Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/Import/GltfMaterialImportUtils.cs
View File

@ -1,5 +1,4 @@
using UnityEngine;
using ColorSpace = VRMShaders.ColorSpace;
namespace UniGLTF
{
@ -50,7 +49,7 @@ namespace UniGLTF
if (data.MigrationFlags.IsEmissiveFactorGamma)
{
return emissiveFactor.ToColor3(VRMShaders.ColorSpace.sRGB, VRMShaders.ColorSpace.Linear);
return emissiveFactor.ToColor3(ColorSpace.sRGB, ColorSpace.Linear);
}
else
{

4
Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/Import/IMaterialDescriptorGenerator.cs
View File

@ -1,6 +1,4 @@
using VRMShaders;
namespace UniGLTF
namespace UniGLTF
{
/// <summary>
/// 指定の index の glTFMaterial から Import できる Material の生成情報を生成する。

2
Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/Import/MaterialDescriptor.cs
View File

@ -2,7 +2,7 @@
using System.Collections.Generic;
using UnityEngine;
namespace VRMShaders
namespace UniGLTF
{
public sealed class MaterialDescriptor
{

3
Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/Import/MaterialFactory.cs
View File

@ -3,8 +3,7 @@ using System.Collections.Generic;
using System.Threading.Tasks;
using UnityEngine;
namespace VRMShaders
namespace UniGLTF
{
public delegate Task<Texture> GetTextureAsyncFunc(TextureDescriptor texDesc, IAwaitCaller awaitCaller);

2
Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/Import/MaterialImporterParamExtensions.cs
View File

@ -1,6 +1,4 @@
using System.Collections.Generic;
using UnityEngine;
using VRMShaders;
namespace UniGLTF
{

1
Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/URP/Import/Materials/UrpGltfDefaultMaterialImporter.cs
View File

@ -1,7 +1,6 @@
using System;
using System.Collections.Generic;
using UnityEngine;
using VRMShaders;
namespace UniGLTF
{

2
Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/URP/Import/Materials/UrpGltfPbrMaterialImporter.cs
View File

@ -1,8 +1,6 @@
using System;
using System.Collections.Generic;
using UnityEngine;
using VRMShaders;
using ColorSpace = VRMShaders.ColorSpace;
namespace UniGLTF
{

2
Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/URP/Import/UrpGltfMaterialDescriptorGenerator.cs
View File

@ -2,8 +2,6 @@ using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using UnityEngine;
using VRMShaders;
namespace UniGLTF
{

1
Assets/UniGLTF/Runtime/UniGLTF/IO/MeshIO/MeshUploader.cs
View File

@ -4,7 +4,6 @@ using System.Threading.Tasks;
using UnityEngine;
using UnityEngine.Profiling;
using UnityEngine.Rendering;
using VRMShaders;
namespace UniGLTF
{

2
Assets/UniGLTF/Runtime/UniGLTF/IO/PathObject.cs
View File

@ -5,7 +5,7 @@ using UnityEngine;
using UnityEditor;
#endif
namespace VRMShaders
namespace UniGLTF
{
/// <summary>
/// UniGLTF.UnityPath (Assets の ひとつ上がルート) をすべてのパスが扱えるように拡張するのが趣旨。

2
Assets/UniGLTF/Runtime/UniGLTF/IO/SubAssetKey.cs
View File

@ -1,7 +1,7 @@
using System;
using UnityEngine;
namespace VRMShaders
namespace UniGLTF
{
/// <summary>
/// UnityEditor.Experimental.AssetImporter.SourceAssetIdentifier に対応する

2
Assets/UniGLTF/Runtime/UniGLTF/IO/Symbols.cs
View File

@ -1,4 +1,4 @@
namespace VRMShaders
namespace UniGLTF
{
public static class Symbols
{

2
Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Converter/NormalConverter.cs
View File

@ -1,6 +1,6 @@
using UnityEngine;
namespace VRMShaders
namespace UniGLTF
{
public static class NormalConverter
{

2
Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Converter/OcclusionMetallicRoughnessConverter.cs
View File

@ -2,7 +2,7 @@ using System;
using System.Linq;
using UnityEngine;
namespace VRMShaders
namespace UniGLTF
{
/// <summary>
///

2
Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Converter/TextureConverter.cs
View File

@ -2,7 +2,7 @@ using System;
using System.Linq;
using UnityEngine;
namespace VRMShaders
namespace UniGLTF
{
public static class TextureConverter
{

2
Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Export/GltfTextureExporter.cs
View File

@ -1,7 +1,5 @@
using System;
using UnityEngine;
using VRMShaders;
using ColorSpace = VRMShaders.ColorSpace;
namespace UniGLTF
{

2
Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Export/ITextureExporter.cs
View File

@ -1,7 +1,7 @@
using System;
using UnityEngine;
namespace VRMShaders
namespace UniGLTF
{
/// <summary>
/// Texture を用途別に変換の要不要を判断して gltf.textures の index に対応させる機能。

2
Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Export/ITextureSerializer.cs
View File

@ -1,6 +1,6 @@
using UnityEngine;
namespace VRMShaders
namespace UniGLTF
{
/// <summary>
/// Texture2D を入力として byte[] を得る機能

2
Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Export/RuntimeTextureSerializer.cs
View File

@ -1,7 +1,7 @@
using System;
using UnityEngine;
namespace VRMShaders
namespace UniGLTF
{
public sealed class RuntimeTextureSerializer : ITextureSerializer
{

2
Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Export/TextureExportParam.cs
View File

@ -1,7 +1,7 @@
using System;
using UnityEngine;
namespace VRMShaders
namespace UniGLTF
{
internal sealed class TextureExportParam
{

2
Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Export/TextureExportTypes.cs
View File

@ -1,4 +1,4 @@
namespace VRMShaders
namespace UniGLTF
{
internal enum TextureExportTypes
{

2
Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Export/TextureExporter.cs
View File

@ -2,7 +2,7 @@
using System.Collections.Generic;
using UnityEngine;
namespace VRMShaders
namespace UniGLTF
{
/// <summary>
/// glTF にエクスポートする変換方式を蓄えて index を確定させる。

2
Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/DeserializingTextureInfo.cs
View File

@ -1,6 +1,6 @@
using UnityEngine;
namespace VRMShaders
namespace UniGLTF
{
/// <summary>
/// ITextureDeserializer 実装者にテクスチャロード処理を委譲するために必要な情報.

1
Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/GltfPbrTextureImporter.cs
View File

@ -1,5 +1,4 @@
using System.Collections.Generic;
using VRMShaders;
namespace UniGLTF
{

6
Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/GltfTextureDescriptorGenerator.cs
View File

@ -1,8 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using VRMShaders;
using System.Collections.Generic;
namespace UniGLTF
{

5
Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/GltfTextureImporter.cs
View File

@ -1,9 +1,6 @@
using System;
using System.Threading.Tasks;
using System.Threading.Tasks;
using Unity.Collections;
using UnityEngine;
using VRMShaders;
namespace UniGLTF
{

4
Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/ITextureDescriptorGenerator.cs
View File

@ -1,6 +1,4 @@
using VRMShaders;
namespace UniGLTF
namespace UniGLTF
{
/// <summary>
/// glTF から Import できる、すべての Texture の生成情報を生成する。

2
Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/ITextureDeserializer.cs
View File

@ -2,7 +2,7 @@
using System.Threading.Tasks;
using UnityEngine;
namespace VRMShaders
namespace UniGLTF
{
/// <summary>
/// 単純に Texture2D アセットを生成する機能

2
Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/KtxTextureDeserializer.cs
View File

@ -6,7 +6,7 @@ using UnityEngine;
using KtxUnity;
#endif
namespace VRMShaders
namespace UniGLTF
{
public sealed class KtxTextureDeserializer : ITextureDeserializer
{

2
Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/SamplerParam.cs
View File

@ -1,7 +1,7 @@
using UnityEngine;
namespace VRMShaders
namespace UniGLTF
{
public readonly struct SamplerParam
{

2
Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/TextureDescriptor.cs
View File

@ -2,7 +2,7 @@
using System.Threading.Tasks;
using UnityEngine;
namespace VRMShaders
namespace UniGLTF
{
/// <summary>
/// get bytes for

2
Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/TextureDescriptorSet.cs
View File

@ -1,6 +1,6 @@
using System.Collections.Generic;
namespace VRMShaders
namespace UniGLTF
{
/// <summary>
/// TextureImportParam の集合を Unique な集合にする。

2
Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/TextureFactory.cs
View File

@ -4,7 +4,7 @@ using UnityEngine;
using System.Linq;
using System.Threading.Tasks;
namespace VRMShaders
namespace UniGLTF
{
public class TextureFactory : IResponsibilityForDestroyObjects
{

2
Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/TextureImportName.cs
View File

@ -1,7 +1,7 @@
using System;
using System.IO;
namespace VRMShaders
namespace UniGLTF
{
public static class TextureImportName
{

2
Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/TextureImportTypes.cs
View File

@ -1,7 +1,7 @@
using System;
using UnityEngine;
namespace VRMShaders
namespace UniGLTF
{
public enum TextureImportTypes
{

2
Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/UnitySupportedImageTypeDeserializer.cs
View File

@ -2,7 +2,7 @@
using System.Threading.Tasks;
using UnityEngine;
namespace VRMShaders
namespace UniGLTF
{
/// <summary>
/// Unity の ImageConversion.LoadImage を用いて PNG/JPG の読み込みを実現する

2
Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/UnityTextureDeserializer.cs
View File

@ -1,7 +1,7 @@
using System.Threading.Tasks;
using UnityEngine;
namespace VRMShaders
namespace UniGLTF
{
/// <summary>
/// Runtime での Texture2D 生成を実現するデフォルトの実装

2
Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/TextureExtensions.cs
View File

@ -1,6 +1,6 @@
using UnityEngine;
namespace VRMShaders
namespace UniGLTF
{
internal static class TextureExtensions
{

1
Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/TextureSamplerUtil.cs
View File

@ -1,6 +1,5 @@
using System;
using UnityEngine;
using VRMShaders;
namespace UniGLTF
{

2
Assets/UniGLTF/Runtime/UniGLTF/IO/UnityObjectDestroyer.cs
View File

@ -1,6 +1,6 @@
using UnityEngine;
namespace VRMShaders
namespace UniGLTF
{
public static class UnityObjectDestroyer
{

2
Assets/UniGLTF/Runtime/UniGLTF/IO/gltfExporter.cs
View File

@ -4,8 +4,6 @@ using System.Linq;
using System.Text.RegularExpressions;
using UniGLTF.MeshUtility;
using UnityEngine;
using VRMShaders;
namespace UniGLTF
{

1
Assets/UniGLTF/Runtime/UniGLTF/RuntimeGltfInstance.cs
View File

@ -1,7 +1,6 @@
using System.Collections.Generic;
using UniGLTF.Utils;
using UnityEngine;
using VRMShaders;
namespace UniGLTF
{

2
Assets/UniGLTF/Tests/UniGLTF.Tests.asmdef
View File

@ -4,8 +4,6 @@
"references": [
"GUID:8d76e605759c3f64a957d63ef96ada7c",
"GUID:5f875fdc81c40184c8333b9d63c6ddd5",
"GUID:da3e51d19d51a544fa14d43fee843098",
"GUID:7da8a75dcade2144aab699032d7d7987",
"GUID:27619889b8ba8c24980f49ee34dbb44a",
"GUID:0acc523941302664db1f4e527237feb3",
"GUID:1cd941934d098654fa21a13f28346412"

5
Assets/UniGLTF/Tests/UniGLTF/CopyTextureTests.cs
View File

@ -1,9 +1,8 @@
using System.Linq;
using NUnit.Framework;
using NUnit.Framework;
using UnityEditor;
using UnityEngine;
namespace VRMShaders
namespace UniGLTF
{
public sealed class CopyTextureTests
{

6
Assets/UniGLTF/Tests/UniGLTF/EditorTextureSerializerTests.cs
View File

@ -1,10 +1,6 @@
using System;
using System.IO;
using System.Linq;
using NUnit.Framework;
using NUnit.Framework;
using UnityEditor;
using UnityEngine;
using VRMShaders;
namespace UniGLTF
{

1
Assets/UniGLTF/Tests/UniGLTF/GltfLoadTests.cs
View File

@ -4,7 +4,6 @@ using System.IO;
using System.Linq;
using NUnit.Framework;
using UnityEngine;
using VRMShaders;
namespace UniGLTF
{

4
Assets/UniGLTF/Tests/UniGLTF/MaterialTests.cs
View File

@ -1,9 +1,7 @@
using System;
using NUnit.Framework;
using NUnit.Framework;
using UnityEngine;
using UniJSON;
using System.Linq;
using VRMShaders;
namespace UniGLTF
{

2
Assets/UniGLTF/Tests/UniGLTF/MetallicRoughnessConverterTests.cs
View File

@ -2,7 +2,7 @@ using System.Linq;
using NUnit.Framework;
using UnityEngine;
namespace VRMShaders
namespace UniGLTF
{
public class MetallicRoughnessConverterTests
{

6
Assets/UniGLTF/Tests/UniGLTF/PathObjectTests.cs
View File

@ -1,9 +1,7 @@
using System.Linq;
using NUnit.Framework;
using UnityEditor;
using NUnit.Framework;
using UnityEngine;
namespace VRMShaders
namespace UniGLTF
{
public sealed class PathObjectTests
{

2
Assets/UniGLTF/Tests/UniGLTF/TextureBytesTests.cs
View File

@ -2,7 +2,7 @@
using UnityEditor;
using UnityEngine;
namespace VRMShaders
namespace UniGLTF
{
public class TextureBytesTests
{

1
Assets/UniGLTF/Tests/UniGLTF/TextureTests.cs
View File

@ -3,7 +3,6 @@ using System.IO;
using System.Linq;
using NUnit.Framework;
using UnityEngine;
using VRMShaders;
namespace UniGLTF
{

1
Assets/UniGLTF/Tests/UniGLTF/UniGLTFTests.cs
View File

@ -4,7 +4,6 @@ using System.Collections.Generic;
using System.Linq;
using UniJSON;
using UnityEngine;
using VRMShaders;
namespace UniGLTF
{

2
Assets/UniGLTF_Samples/GltfViewer/GltfViewer.cs
View File

@ -31,7 +31,7 @@ namespace UniGLTF.GltfViewer
LoadPathAsync(path);
}
async void LoadPathAsync(VRMShaders.PathObject path)
async void LoadPathAsync(PathObject path)
{
if (_instance)
{

4
Assets/UniGLTF_Samples/GltfViewer/OpenFileDialog/OpenFileDialog.cs
View File

@ -2,10 +2,10 @@ namespace UniGLTF.GltfViewer
{
public static class OpenFileDialog
{
public static VRMShaders.PathObject Show(string title, params string[] extensions)
public static PathObject Show(string title, params string[] extensions)
{
#if UNITY_STANDALONE_WIN
return VRMShaders.PathObject.FromFullPath(FileDialogForWindows.FileDialog(title, extensions));
return PathObject.FromFullPath(FileDialogForWindows.FileDialog(title, extensions));
#else
UnityEngine.Debug.LogWarning("Non-Windows runtime file dialogs are not yet implemented.");
return default;

1
Assets/VRM/Editor/Format/VRMEditorExporter.cs
View File

@ -6,7 +6,6 @@ using UniGLTF;
using UniGLTF.MeshUtility;
using UniGLTF.Utils;
using UnityEngine;
using VRMShaders;
namespace VRM
{

2
Assets/VRM/Editor/Format/VRMEditorImporterContext.cs
View File

@ -1,10 +1,8 @@
using System;
using System.Collections.Generic;
using System.Linq;
using UniGLTF;
using UnityEditor;
using UnityEngine;
using VRMShaders;
namespace VRM
{

4
Assets/VRM/Editor/Format/vrmAssetPostprocessor.cs
View File

@ -5,8 +5,6 @@ using System.Linq;
using UniGLTF;
using UnityEditor;
using UnityEngine;
using VRMShaders;
namespace VRM
{
@ -86,7 +84,7 @@ namespace VRM
var editor = new VRMEditorImporterContext(context, prefabPath);
foreach (var textureInfo in context.TextureDescriptorGenerator.Get().GetEnumerable())
{
VRMShaders.TextureImporterConfigurator.Configure(textureInfo, context.TextureFactory.ExternalTextures);
TextureImporterConfigurator.Configure(textureInfo, context.TextureFactory.ExternalTextures);
}
var loaded = context.Load();
editor.SaveAsAsset(loaded);

2
Assets/VRM/Editor/VRM.Editor.asmdef
View File

@ -4,8 +4,6 @@
"references": [
"GUID:05dd262a0c0a2f841b8252c8c3815582",
"GUID:b7aa47b240b57de44a4b2021c143c9bf",
"GUID:da3e51d19d51a544fa14d43fee843098",
"GUID:7da8a75dcade2144aab699032d7d7987",
"GUID:8d76e605759c3f64a957d63ef96ada7c",
"GUID:5f875fdc81c40184c8333b9d63c6ddd5",
"GUID:301b251fd9834274c9228e0532f444f7",

1
Assets/VRM/Runtime/BlendShape/PreviewSceneManager.cs
View File

@ -2,7 +2,6 @@
using System.Linq;
using UnityEngine;
using System;
using VRMShaders;
using UniGLTF;
namespace VRM

3
Assets/VRM/Runtime/IO/MaterialIO/BuiltInRP/Export/BuiltInVrmExtensionMaterialPropertyExporter.cs
View File

@ -2,8 +2,7 @@
using UniGLTF;
using UniGLTF.ShaderPropExporter;
using UnityEngine;
using VRMShaders;
using ColorSpace = VRMShaders.ColorSpace;
using ColorSpace = UniGLTF.ColorSpace;
namespace VRM
{

1
Assets/VRM/Runtime/IO/MaterialIO/BuiltInRP/Export/BuiltInVrmMaterialExporter.cs
View File

@ -1,7 +1,6 @@
using System;
using UniGLTF;
using UnityEngine;
using VRMShaders;
namespace VRM
{

Some files were not shown because too many files have changed in this diff Show More