From ef5c0da4e20d3a015511cfaed61c019869280dae Mon Sep 17 00:00:00 2001 From: ousttrue Date: Thu, 10 Apr 2025 18:05:36 +0900 Subject: [PATCH] ImportedTexturesAccessibility.Auto and Application.isPlaying --- .../Runtime/UniGLTF/IO/ImporterContextSettings.cs | 2 +- .../Import/ImportedTextureAccessibility.cs | 14 +++++++------- .../Import/UnitySupportedImageTypeDeserializer.cs | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/ImporterContextSettings.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/ImporterContextSettings.cs index 437bb4551..f5b2f4d9e 100644 --- a/Assets/UniGLTF/Runtime/UniGLTF/IO/ImporterContextSettings.cs +++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/ImporterContextSettings.cs @@ -21,7 +21,7 @@ namespace UniGLTF public ImporterContextSettings( bool loadAnimation = true, Axes invertAxis = Axes.Z, - ImportedTexturesAccessibility importedTexturesAccessibility = ImportedTexturesAccessibility.Default) + ImportedTexturesAccessibility importedTexturesAccessibility = ImportedTexturesAccessibility.Auto) { LoadAnimation = loadAnimation; InvertAxis = invertAxis; diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/ImportedTextureAccessibility.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/ImportedTextureAccessibility.cs index 267aaa64e..1c0d398ee 100644 --- a/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/ImportedTextureAccessibility.cs +++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/ImportedTextureAccessibility.cs @@ -10,18 +10,18 @@ namespace UniGLTF { /// /// Platform dependent. - /// IsEditor ? Readable : NonReadable + /// see: ToMarkNonReadable() /// - Default, + Auto, /// /// Bitmaps are accessible. - /// Specify explicitly when exporting an imported model again + /// Specify explicitly when exporting an imported model again. /// Readable, /// - /// It can save memory usage. Recommended + /// It can save memory usage. Recommended. /// NonReadable, } @@ -35,14 +35,14 @@ namespace UniGLTF { switch (self) { - case ImportedTexturesAccessibility.Default: - if (Application.isEditor) + case ImportedTexturesAccessibility.Auto: + if (Application.isPlaying) { return false; } else { - // v0.128.4 からの挙動変更 + // change behaviour from v0.128.4 return true; } diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/UnitySupportedImageTypeDeserializer.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/UnitySupportedImageTypeDeserializer.cs index 2f66d35d2..ee9c052ea 100644 --- a/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/UnitySupportedImageTypeDeserializer.cs +++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/Import/UnitySupportedImageTypeDeserializer.cs @@ -20,7 +20,7 @@ namespace UniGLTF /// /// v0.128.4 ImportedTexturesAccessibility を参照 /// - public ImportedTexturesAccessibility ImportedTexturesAccessibility { get; } = ImportedTexturesAccessibility.Default; + public ImportedTexturesAccessibility ImportedTexturesAccessibility { get; } = ImportedTexturesAccessibility.Auto; public UnitySupportedImageTypeDeserializer(ImportedTexturesAccessibility importedTexturesAccessibility) {