Fixed Resolution Scaling Issues

foopis23 · Mar 25, 2021 · f919435 · f919435
1 parent c5741b7
commit f919435
Show file tree

Hide file tree

Showing 2 changed files with 69 additions and 3 deletions.
diff --git a/Assets/Awesome ASCII-Effect/ASCII.cs b/Assets/Awesome ASCII-Effect/ASCII.cs
@@ -22,6 +22,11 @@ public enum ColorMode { ORIGINAL, DECIMATED, ONE_BIT, OVERLAY_ONLY }
 	private OverlayChar[][] overlay;
 	private Texture2D overlayTexture;
 	private RenderTexture overlayRT;
+
+	public int largeScreenHeight;
+	public int mediumScreenHeight;
+	public int smallScreenHeight;
+	public int extraSmallScreenHeight;
 
 	public bool pixelate = true;
 	[Range(0, 1)]
@@ -47,6 +52,27 @@ private void OnEnable()
 
 	private void Setup()
 	{
+		if (Screen.height >= 1080)
+		{
+			rows = (uint) largeScreenHeight;
+			columns = (uint) (largeScreenHeight * Screen.width / Screen.height);
+		}
+		else if (Screen.height >= 720)
+		{
+			rows = (uint) mediumScreenHeight;
+			columns = (uint) (mediumScreenHeight * Screen.width / Screen.height);
+		}
+		else if (Screen.height >= 600)
+		{
+			rows = (uint) smallScreenHeight;
+			columns = (uint) (smallScreenHeight * Screen.width / Screen.height);
+		}
+		else
+		{
+			rows = (uint) extraSmallScreenHeight;
+			columns = (uint) (extraSmallScreenHeight * Screen.width / Screen.height);
+		}
+
 		mat = new Material(Shader.Find("Hidden/ASCII"));
 		dirtyPos1 = new Vector2Int();
 		dirtyPos2 = new Vector2Int();

diff --git a/Assets/Scenes/MainGame.unity b/Assets/Scenes/MainGame.unity
@@ -648,11 +648,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 3317125340279824244, guid: bb37224e27ae9c04eb0eda2cb53aa849, type: 3}
       propertyPath: rows
-      value: 80
+      value: 60
       objectReference: {fileID: 0}
     - target: {fileID: 3317125340279824244, guid: bb37224e27ae9c04eb0eda2cb53aa849, type: 3}
       propertyPath: columns
-      value: 140
+      value: 80
       objectReference: {fileID: 0}
     - target: {fileID: 3317125340279824244, guid: bb37224e27ae9c04eb0eda2cb53aa849, type: 3}
       propertyPath: pixelate
@@ -666,9 +666,49 @@ PrefabInstance:
       propertyPath: tranparency
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 3317125340279824244, guid: bb37224e27ae9c04eb0eda2cb53aa849, type: 3}
+      propertyPath: largeScreenHeight
+      value: 72
+      objectReference: {fileID: 0}
+    - target: {fileID: 3317125340279824244, guid: bb37224e27ae9c04eb0eda2cb53aa849, type: 3}
+      propertyPath: largeScreenSize.x
+      value: 128
+      objectReference: {fileID: 0}
+    - target: {fileID: 3317125340279824244, guid: bb37224e27ae9c04eb0eda2cb53aa849, type: 3}
+      propertyPath: largeScreenSize.y
+      value: 72
+      objectReference: {fileID: 0}
+    - target: {fileID: 3317125340279824244, guid: bb37224e27ae9c04eb0eda2cb53aa849, type: 3}
+      propertyPath: smallScreenHeight
+      value: 60
+      objectReference: {fileID: 0}
+    - target: {fileID: 3317125340279824244, guid: bb37224e27ae9c04eb0eda2cb53aa849, type: 3}
+      propertyPath: smallScreenSize.x
+      value: 70
+      objectReference: {fileID: 0}
+    - target: {fileID: 3317125340279824244, guid: bb37224e27ae9c04eb0eda2cb53aa849, type: 3}
+      propertyPath: smallScreenSize.y
+      value: 60
+      objectReference: {fileID: 0}
+    - target: {fileID: 3317125340279824244, guid: bb37224e27ae9c04eb0eda2cb53aa849, type: 3}
+      propertyPath: mediumScreenHeight
+      value: 60
+      objectReference: {fileID: 0}
+    - target: {fileID: 3317125340279824244, guid: bb37224e27ae9c04eb0eda2cb53aa849, type: 3}
+      propertyPath: mediumScreenSize.x
+      value: 105
+      objectReference: {fileID: 0}
+    - target: {fileID: 3317125340279824244, guid: bb37224e27ae9c04eb0eda2cb53aa849, type: 3}
+      propertyPath: mediumScreenSize.y
+      value: 60
+      objectReference: {fileID: 0}
     - target: {fileID: 3317125340279824244, guid: bb37224e27ae9c04eb0eda2cb53aa849, type: 3}
       propertyPath: useLegacyRendering
-      value: 1
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3317125340279824244, guid: bb37224e27ae9c04eb0eda2cb53aa849, type: 3}
+      propertyPath: extraSmallScreenHeight
+      value: 48
       objectReference: {fileID: 0}
     - target: {fileID: 4543459960021953385, guid: bb37224e27ae9c04eb0eda2cb53aa849, type: 3}
       propertyPath: m_Layer