Merge pull request #314 from umasteeringgroup/feature-DownSample_Impr…

…ovement Feature down sample improvement
umasteeringgroup · Jun 22, 2020 · 728f2af · 728f2af
2 parents 79e432d + b689c45
commit 728f2af
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 13 deletions.
diff --git a/UMAProject/Assets/UMA/Core/StandardAssets/UMA/Scripts/TextureProcessPROCoroutine.cs b/UMAProject/Assets/UMA/Core/StandardAssets/UMA/Scripts/TextureProcessPROCoroutine.cs
@@ -105,7 +105,10 @@ protected override IEnumerator workerMethod()
                                 continue;
                             }
 
-                            destinationTexture = new RenderTexture(Mathf.FloorToInt(atlas.cropResolution.x * umaData.atlasResolutionScale), Mathf.FloorToInt(atlas.cropResolution.y * umaData.atlasResolutionScale), 0, slotData.asset.material.channels[textureType].textureFormat, RenderTextureReadWrite.Linear);
+                            //this should be restricted to >= 1 but 0 was allowed before and projects may have the umaMaterial value serialized to 0.
+                            float downSample = (slotData.asset.material.channels[textureType].DownSample == 0) ? 1f : (1f / slotData.asset.material.channels[textureType].DownSample);
+
+                            destinationTexture = new RenderTexture(Mathf.FloorToInt(atlas.cropResolution.x * umaData.atlasResolutionScale * downSample), Mathf.FloorToInt(atlas.cropResolution.y * umaData.atlasResolutionScale * downSample), 0, slotData.asset.material.channels[textureType].textureFormat, RenderTextureReadWrite.Linear);
                             destinationTexture.filterMode = FilterMode.Point;
                             destinationTexture.useMipMap = umaGenerator.convertMipMaps && !umaGenerator.convertRenderTexture;
                             //Draw all the Rects here
@@ -128,17 +131,6 @@ protected override IEnumerator workerMethod()
                             //PostProcess
                             textureMerge.PostProcess(destinationTexture, slotData.asset.material.channels[textureType].channelType);
 
-                            int DownSample = slotData.asset.material.channels[textureType].DownSample;
-                            if (DownSample != 0)
-                            {
-                                int newW = width >> DownSample;
-                                int newH = height >> DownSample;
-
-                                RenderTexture rt = ResizeRenderTexture(destinationTexture, newW, newH, FilterMode.Bilinear);
-                                destinationTexture.Release();
-                                destinationTexture = rt;
-                            }
-
                             if (umaGenerator.convertRenderTexture || slotData.asset.material.channels[textureType].ConvertRenderTexture)
                             {
                                 #region Convert Render Textures

diff --git a/UMAProject/Assets/UMA/Core/StandardAssets/UMA/Scripts/UMAMaterial.cs b/UMAProject/Assets/UMA/Core/StandardAssets/UMA/Scripts/UMAMaterial.cs
@@ -76,7 +76,7 @@ public struct MaterialChannel
             public string materialPropertyName;
 			public string sourceTextureName;
             public CompressionSettings Compression;
-            [Range(0,4)]
+            [Range(1,128)]
             public int DownSample;
             public bool ConvertRenderTexture;
             public bool NonShaderTexture;