Merge remote-tracking branch 'origin/fix/unnecessary-texture-duplicat…

…ion' into dev
KhronosGroup · Apr 13, 2024 · 3547c64 · 3547c64
2 parents 0eb8256 + d1c67e0
commit 3547c64
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/Runtime/Scripts/SceneImporter/ImporterTextures.cs b/Runtime/Scripts/SceneImporter/ImporterTextures.cs
@@ -425,6 +425,9 @@ protected virtual async Task ConstructTexture(GLTFTexture texture, int textureIn
 			{
 				int sourceId = GetTextureSourceId(texture);
 				GLTFImage image = _gltfRoot.Images[sourceId];
+
+				bool isFirstInstance = _assetCache.ImageCache[sourceId] == null;
+
 				await ConstructImage(image, sourceId, markGpuOnly, isLinear, isNormal);
 
 				var source = _assetCache.ImageCache[sourceId];
@@ -452,7 +455,7 @@ protected virtual async Task ConstructTexture(GLTFTexture texture, int textureIn
 							break;
 						default:
 							Debug.Log(LogType.Warning, "Unsupported Sampler.MinFilter: " + sampler.MinFilter+ $" (File: {_gltfFileName})");
-							desiredFilterMode = FilterMode.Trilinear;
+							desiredFilterMode = FilterMode.Bilinear;
 							break;
 					}
 
@@ -477,11 +480,18 @@ TextureWrapMode UnityWrapMode(GLTF.Schema.WrapMode gltfWrapMode)
 				}
 				else
 				{
-					desiredFilterMode = FilterMode.Trilinear;
+					desiredFilterMode = FilterMode.Bilinear;
 					desiredWrapModeS = TextureWrapMode.Repeat;
 					desiredWrapModeT = TextureWrapMode.Repeat;
 				}
 
+				if (isFirstInstance)
+				{
+					source.filterMode = desiredFilterMode;
+					source.wrapModeU = desiredWrapModeS;
+					source.wrapModeV = desiredWrapModeT;		
+				}
+
 				var matchSamplerState = source.filterMode == desiredFilterMode && source.wrapModeU == desiredWrapModeS && source.wrapModeV == desiredWrapModeT;
 				if (matchSamplerState || markGpuOnly)
 				{