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

Jump to bottom

Removed loading of textures twice in GLBs #715

Closed
wants to merge 1 commit into from
Closed

Removed loading of textures twice in GLBs #715

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
56 changes: 8 additions & 48 deletions Runtime/Scripts/SceneImporter/ImporterTextures.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ async Task<Texture2D> CheckMimeTypeAndLoadImage(GLTFImage image, Texture2D textu
texture.wrapMode = TextureWrapMode.Repeat;
texture.wrapModeV = TextureWrapMode.Repeat;
texture.wrapModeU = TextureWrapMode.Repeat;
texture.filterMode = FilterMode.Bilinear;
texture.filterMode = FilterMode.Trilinear;
}

await Task.CompletedTask;
Expand Down Expand Up @@ -478,56 +478,16 @@ TextureWrapMode UnityWrapMode(GLTF.Schema.WrapMode gltfWrapMode)
desiredWrapModeT = TextureWrapMode.Repeat;
}

var matchSamplerState = source.filterMode == desiredFilterMode && source.wrapModeU == desiredWrapModeS && source.wrapModeV == desiredWrapModeT;
if (matchSamplerState || markGpuOnly)
var updateSamplerState = source.filterMode != desiredFilterMode || source.wrapModeU != desiredWrapModeS || source.wrapModeV != desiredWrapModeT;
if (updateSamplerState)
{
if (_assetCache.TextureCache[textureIndex].Texture != null) Debug.Log(LogType.Assert, "Texture should not be reset to prevent memory leaks"+ $" (File: {_gltfFileName})");
_assetCache.TextureCache[textureIndex].Texture = source;

if (!matchSamplerState)
{
Debug.Log(LogType.Warning, $"Ignoring sampler; filter mode: source {source.filterMode}, desired {desiredFilterMode}; wrap mode: source {source.wrapModeU}x{source.wrapModeV}, desired {desiredWrapModeS}x{desiredWrapModeT}"+ $" (File: {_gltfFileName})");
}
source.filterMode = desiredFilterMode;
source.wrapModeU = desiredWrapModeS;
source.wrapModeV = desiredWrapModeT;
}
else
#if UNITY_EDITOR
if (!UnityEditor.AssetDatabase.Contains(source))
#endif
{
Texture2D unityTexture;
if (!source.isReadable)
{
unityTexture = new Texture2D(source.width, source.height, source.format, source.mipmapCount, isLinear);
Graphics.CopyTexture(source, unityTexture);
}
else
unityTexture = Object.Instantiate(source);

unityTexture.name = string.IsNullOrEmpty(image.Name) ?
string.IsNullOrEmpty(texture.Name) ?
Path.GetFileNameWithoutExtension(image.Uri) :
texture.Name :
image.Name;

if (string.IsNullOrEmpty(unityTexture.name))
unityTexture.name = $"Texture_{textureIndex.ToString()}{EMPTY_TEXTURE_NAME_SUFFIX}";

unityTexture.filterMode = desiredFilterMode;
unityTexture.wrapModeU = desiredWrapModeS;
unityTexture.wrapModeV = desiredWrapModeT;

if (_assetCache.TextureCache[textureIndex].Texture != null) Debug.Log(LogType.Assert, $"Texture should not be reset to prevent memory leaks (File: {_gltfFileName})");
_assetCache.TextureCache[textureIndex].Texture = unityTexture;
}
#if UNITY_EDITOR
else
{
// don't warn for just filter mode, user choice
if (source.wrapModeU != desiredWrapModeS || source.wrapModeV != desiredWrapModeT)
Debug.Log(LogType.Warning, ($"Sampler state doesn't match but source texture is non-readable. Results might not be correct if textures are used multiple times with different sampler states. {source.filterMode} == {desiredFilterMode} && {source.wrapModeU} == {desiredWrapModeS} && {source.wrapModeV} == {desiredWrapModeT} (File: {_gltfFileName})"));
_assetCache.TextureCache[textureIndex].Texture = source;
}
#endif
if (_assetCache.TextureCache[textureIndex].Texture != null) Debug.Log(LogType.Assert, $"Texture should not be reset to prevent memory leaks (File: {_gltfFileName})");
_assetCache.TextureCache[textureIndex].Texture = source;
}

_assetCache.TextureCache[textureIndex].IsLinear = isLinear;
Expand Down