Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Public ITextureDeserializer #1063

Merged
merged 2 commits into from
Jun 22, 2021
Merged

Public ITextureDeserializer #1063

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3ac8d19
public textureDeserializer
Santarh Jun 22, 2021
95dd4fd
Remove unused
Santarh Jun 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 8 additions & 15 deletions Assets/VRMShaders/GLTF/IO/Runtime/TextureFactory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ namespace VRMShaders
{
public class TextureFactory : IResponsibilityForDestroyObjects
{
private readonly ITextureDeserializer _textureDeserializer;
private readonly IReadOnlyDictionary<SubAssetKey, Texture> _externalMap;
private readonly Dictionary<SubAssetKey, Texture> _temporaryTextures = new Dictionary<SubAssetKey, Texture>();
private readonly Dictionary<SubAssetKey, Texture> _textureCache = new Dictionary<SubAssetKey, Texture>();

public ITextureDeserializer TextureDeserializer { get; }

/// <summary>
/// Importer が動的に生成した Texture
/// </summary>
Expand All @@ -25,17 +25,12 @@ public class TextureFactory : IResponsibilityForDestroyObjects

public TextureFactory(ITextureDeserializer textureDeserializer, IReadOnlyDictionary<SubAssetKey, Texture> externalTextures)
{
_textureDeserializer = textureDeserializer;
TextureDeserializer = textureDeserializer;
_externalMap = externalTextures;
}

public void Dispose()
{
foreach (var kv in _temporaryTextures)
{
UnityObjectDestoyer.DestroyRuntimeOrEditor(kv.Value);
}
_temporaryTextures.Clear();
_textureCache.Clear();
}

Expand Down Expand Up @@ -79,7 +74,7 @@ public async Task<Texture> GetTextureAsync(TextureDescriptor texDesc)
// > contrary to Unity’s usual convention of using Y as “up”
// https://docs.unity3d.com/2018.4/Documentation/Manual/StandardShaderMaterialParameterNormalMap.html
var data0 = await texDesc.Index0();
var rawTexture = await _textureDeserializer.LoadTextureAsync(data0, texDesc.Sampler.EnableMipMap, ColorSpace.Linear);
var rawTexture = await TextureDeserializer.LoadTextureAsync(data0, texDesc.Sampler.EnableMipMap, ColorSpace.Linear);
rawTexture.name = subAssetKey.Name;
rawTexture.SetSampler(texDesc.Sampler);
_textureCache.Add(subAssetKey, rawTexture);
Expand All @@ -94,12 +89,12 @@ public async Task<Texture> GetTextureAsync(TextureDescriptor texDesc)
if (texDesc.Index0 != null)
{
var data0 = await texDesc.Index0();
metallicRoughnessTexture = await _textureDeserializer.LoadTextureAsync(data0, texDesc.Sampler.EnableMipMap, ColorSpace.Linear);
metallicRoughnessTexture = await TextureDeserializer.LoadTextureAsync(data0, texDesc.Sampler.EnableMipMap, ColorSpace.Linear);
}
if (texDesc.Index1 != null)
{
var data1 = await texDesc.Index1();
occlusionTexture = await _textureDeserializer.LoadTextureAsync(data1, texDesc.Sampler.EnableMipMap, ColorSpace.Linear);
occlusionTexture = await TextureDeserializer.LoadTextureAsync(data1, texDesc.Sampler.EnableMipMap, ColorSpace.Linear);
}

var combinedTexture = OcclusionMetallicRoughnessConverter.Import(metallicRoughnessTexture,
Expand All @@ -115,7 +110,7 @@ public async Task<Texture> GetTextureAsync(TextureDescriptor texDesc)
case TextureImportTypes.sRGB:
{
var data0 = await texDesc.Index0();
var rawTexture = await _textureDeserializer.LoadTextureAsync(data0, texDesc.Sampler.EnableMipMap, ColorSpace.sRGB);
var rawTexture = await TextureDeserializer.LoadTextureAsync(data0, texDesc.Sampler.EnableMipMap, ColorSpace.sRGB);
rawTexture.name = subAssetKey.Name;
rawTexture.SetSampler(texDesc.Sampler);
_textureCache.Add(subAssetKey, rawTexture);
Expand All @@ -124,7 +119,7 @@ public async Task<Texture> GetTextureAsync(TextureDescriptor texDesc)
case TextureImportTypes.Linear:
{
var data0 = await texDesc.Index0();
var rawTexture = await _textureDeserializer.LoadTextureAsync(data0, texDesc.Sampler.EnableMipMap, ColorSpace.Linear);
var rawTexture = await TextureDeserializer.LoadTextureAsync(data0, texDesc.Sampler.EnableMipMap, ColorSpace.Linear);
rawTexture.name = subAssetKey.Name;
rawTexture.SetSampler(texDesc.Sampler);
_textureCache.Add(subAssetKey, rawTexture);
Expand All @@ -133,8 +128,6 @@ public async Task<Texture> GetTextureAsync(TextureDescriptor texDesc)
default:
throw new ArgumentOutOfRangeException();
}

throw new NotImplementedException();
}
}
}