diff --git a/Assets/MA_ToolBox/MA_Utilities/TextureUtils/MA_TextureUtils.cs b/Assets/MA_ToolBox/MA_Utilities/TextureUtils/MA_TextureUtils.cs index 10c7a99..ff2e6d6 100644 --- a/Assets/MA_ToolBox/MA_Utilities/TextureUtils/MA_TextureUtils.cs +++ b/Assets/MA_ToolBox/MA_Utilities/TextureUtils/MA_TextureUtils.cs @@ -161,17 +161,20 @@ namespace MA_Texture { Color[] newColors = new Color[newWidth * newHeight]; - float ratioX = ((float)curWidth) / newWidth; - float ratioY = ((float)curHeight) / newHeight; + float ratioX = 1.0f / ((float)newWidth / (curWidth - 1)); + float ratioY = 1.0f / ((float)newHeight / (curHeight - 1)); - for (int y = 0; y < newHeight; y++) + for (int y = 0; y < newHeight; y++) { - var thisY = Mathf.RoundToInt((ratioY * y) * curWidth); - var yw = y * newWidth; + int yFloor = Mathf.FloorToInt(y * ratioY); + var y1 = (yFloor + 1) * curWidth; + var yw = y * newWidth; - for (int x = 0; x < newWidth; x++) + for (int x = 0; x < newWidth; x++) { - newColors[yw + x] = curColors[Mathf.RoundToInt(thisY + ratioX * x)]; + int xFloor = Mathf.FloorToInt(x * ratioX); + + newColors[yw + x] = curColors[Mathf.RoundToInt(y1 + xFloor)]; } } diff --git a/Packages/manifest.json b/Packages/manifest.json index ed049c5..ebf49a9 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -2,8 +2,7 @@ "dependencies": { "com.unity.2d.sprite": "1.0.0", "com.unity.ext.nunit": "1.0.0", - "com.unity.package-manager-ui": "2.2.0", - "com.unity.test-framework": "1.0.13", + "com.unity.test-framework": "1.1.9", "com.unity.ugui": "1.0.0", "com.unity.modules.ai": "1.0.0", "com.unity.modules.androidjni": "1.0.0", diff --git a/ProjectSettings/EditorSettings.asset b/ProjectSettings/EditorSettings.asset index 96c6ed5..4af553a 100644 --- a/ProjectSettings/EditorSettings.asset +++ b/ProjectSettings/EditorSettings.asset @@ -3,7 +3,7 @@ --- !u!159 &1 EditorSettings: m_ObjectHideFlags: 0 - serializedVersion: 7 + serializedVersion: 9 m_ExternalVersionControlSupport: Hidden Meta Files m_SerializationMode: 2 m_LineEndingsForNewScripts: 2 @@ -16,10 +16,20 @@ EditorSettings: m_EtcTextureFastCompressor: 1 m_EtcTextureNormalCompressor: 2 m_EtcTextureBestCompressor: 4 - m_ProjectGenerationIncludedExtensions: txt;xml;fnt;cd;asmdef;rsp + m_ProjectGenerationIncludedExtensions: txt;xml;fnt;cd;asmdef;rsp;asmref m_ProjectGenerationRootNamespace: m_CollabEditorSettings: inProgressEnabled: 1 m_EnableTextureStreamingInEditMode: 1 m_EnableTextureStreamingInPlayMode: 1 m_AsyncShaderCompilation: 1 + m_EnterPlayModeOptionsEnabled: 0 + m_EnterPlayModeOptions: 3 + m_ShowLightmapResolutionOverlay: 1 + m_UseLegacyProbeSampleCount: 1 + m_AssetPipelineMode: 1 + m_CacheServerMode: 0 + m_CacheServerEndpoint: + m_CacheServerNamespacePrefix: default + m_CacheServerEnableDownload: 1 + m_CacheServerEnableUpload: 1 diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index f499f71..798259b 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2019.2.13f1 -m_EditorVersionWithRevision: 2019.2.13f1 (e20f6c7e5017) +m_EditorVersion: 2019.3.0f6 +m_EditorVersionWithRevision: 2019.3.0f6 (27ab2135bccf)