High resolution part 4

Author: OctoFlareDev

Minecraft Note Block Studio.yyp

@@ -1882,13 +1882,20 @@ function control_draw() {
 	draw_set_halign(fa_right)
 	if (compatible = 1) {
 		if (theme != 3) {
-		draw_sprite(spr_minecraft, 0, rw - 30, 25)
-		draw_sprite(spr_minecraft, 0, rw - 59, 25)
+			draw_sprite(spr_minecraft, 0, rw - 30, 25)
+			draw_sprite(spr_minecraft, 0, rw - 59, 25)
 		} else {
-		draw_sprite(spr_minecraft_f, fdark * 3, rw - 30, 25)
-		draw_sprite(spr_minecraft_f, fdark * 3, rw - 59, 25)
-		draw_sprite_ext(spr_minecraft_f, 6, rw - 30, 25, 1, 1, 0, accent[6 - 2 * !fdark], 1)
-		draw_sprite_ext(spr_minecraft_f, 6, rw - 59, 25, 1, 1, 0, accent[6 - 2 * !fdark], 1)
+			if (!hires) {
+				draw_sprite(spr_minecraft_f, fdark * 3, rw - 30, 25)
+				draw_sprite(spr_minecraft_f, fdark * 3, rw - 59, 25)
+				draw_sprite_ext(spr_minecraft_f, 6, rw - 30, 25, 1, 1, 0, accent[6 - 2 * !fdark], 1)
+				draw_sprite_ext(spr_minecraft_f, 6, rw - 59, 25, 1, 1, 0, accent[6 - 2 * !fdark], 1)
+			} else {
+				draw_sprite_ext(spr_minecraft_f_hires, fdark * 3, rw - 30, 25, 0.25, 0.25, 0, -1, 1)
+				draw_sprite_ext(spr_minecraft_f_hires, fdark * 3, rw - 59, 25, 0.25, 0.25, 0, -1, 1)
+				draw_sprite_ext(spr_minecraft_f_hires, 6, rw - 30, 25, 0.25, 0.25, 0, accent[6 - 2 * !fdark], 1)
+				draw_sprite_ext(spr_minecraft_f_hires, 6, rw - 59, 25, 0.25, 0.25, 0, accent[6 - 2 * !fdark], 1)
+			}
 		}
 		draw_set_color(c_green)
 		if (theme == 2 || (theme == 3 && fdark)) draw_set_color(c_lime)
@@ -1900,13 +1907,20 @@ function control_draw() {
 		else popup_set(rw - compx, 24, compx, 25, "此歌曲兼容 schematic 和数据包。\n（点击查看更多）")
 	} else if (compatible = 2) {
 		if (theme != 3) {
-		draw_sprite(spr_minecraft, 0, rw - 30, 25)
-		draw_sprite(spr_minecraft, 1, rw - 59, 25)
+			draw_sprite(spr_minecraft, 0, rw - 30, 25)
+			draw_sprite(spr_minecraft, 1, rw - 59, 25)
 		} else {
-		draw_sprite(spr_minecraft_f, fdark * 3, rw - 30, 25)
-		draw_sprite(spr_minecraft_f, 1 + fdark * 3, rw - 59, 25)
-		draw_sprite_ext(spr_minecraft_f, 6, rw - 30, 25, 1, 1, 0, accent[6 - 2 * !fdark], 1)
-		draw_sprite_ext(spr_minecraft_f, 1 + 6, rw - 59, 25, 1, 1, 0, accent[6 - 2 * !fdark], 1)
+			if (!hires) {
+				draw_sprite(spr_minecraft_f, fdark * 3, rw - 30, 25)
+				draw_sprite(spr_minecraft_f, 1 + fdark * 3, rw - 59, 25)
+				draw_sprite_ext(spr_minecraft_f, 6, rw - 30, 25, 1, 1, 0, accent[6 - 2 * !fdark], 1)
+				draw_sprite_ext(spr_minecraft_f, 1 + 6, rw - 59, 25, 1, 1, 0, accent[6 - 2 * !fdark], 1)
+			} else {
+				draw_sprite_ext(spr_minecraft_f_hires, fdark * 3, rw - 30, 25, 0.25, 0.25, 0, -1, 1)
+				draw_sprite_ext(spr_minecraft_f_hires, 1 + fdark * 3, rw - 59, 25, 0.25, 0.25, 0, -1, 1)
+				draw_sprite_ext(spr_minecraft_f_hires, 6, rw - 30, 25, 0.25, 0.25, 0, accent[6 - 2 * !fdark], 1)
+				draw_sprite_ext(spr_minecraft_f_hires, 1 + 6, rw - 59, 25, 0.25, 0.25, 0, accent[6 - 2 * !fdark], 1)
+			}
 		}
 		draw_set_color(c_orange)
 		if (language != 1) draw_text_dynamic(rw - 65, 28, "Data pack only")
@@ -1917,13 +1931,20 @@ function control_draw() {
 		else popup_set(rw - compx, 24, compx, 25, "此歌曲仅兼容数据包。\n（点击查看更多）")
 	} else {
 		if (theme != 3) {
-		draw_sprite(spr_minecraft, 2, rw - 30, 25)
-		draw_sprite(spr_minecraft, 1, rw - 59, 25)
+			draw_sprite(spr_minecraft, 2, rw - 30, 25)
+			draw_sprite(spr_minecraft, 1, rw - 59, 25)
 		} else {
-		draw_sprite(spr_minecraft_f, 2 + fdark * 3, rw - 30, 25)
-		draw_sprite(spr_minecraft_f, 1 + fdark * 3, rw - 59, 25)
-		draw_sprite_ext(spr_minecraft_f, 2 + 6, rw - 30, 25, 1, 1, 0, accent[6 - 2 * !fdark], 1)
-		draw_sprite_ext(spr_minecraft_f, 1 + 6, rw - 59, 25, 1, 1, 0, accent[6 - 2 * !fdark], 1)
+			if (!hires) {
+				draw_sprite(spr_minecraft_f, 2 + fdark * 3, rw - 30, 25)
+				draw_sprite(spr_minecraft_f, 1 + fdark * 3, rw - 59, 25)
+				draw_sprite_ext(spr_minecraft_f, 2 + 6, rw - 30, 25, 1, 1, 0, accent[6 - 2 * !fdark], 1)
+				draw_sprite_ext(spr_minecraft_f, 1 + 6, rw - 59, 25, 1, 1, 0, accent[6 - 2 * !fdark], 1)
+			} else {
+				draw_sprite_ext(spr_minecraft_f_hires, 2 + fdark * 3, rw - 30, 25, 0.25, 0.25, 0, -1, 1)
+				draw_sprite_ext(spr_minecraft_f_hires, 1 + fdark * 3, rw - 59, 25, 0.25, 0.25, 0, -1, 1)
+				draw_sprite_ext(spr_minecraft_f_hires, 2 + 6, rw - 30, 25, 0.25, 0.25, 0, accent[6 - 2 * !fdark], 1)
+				draw_sprite_ext(spr_minecraft_f_hires, 1 + 6, rw - 59, 25, 0.25, 0.25, 0, accent[6 - 2 * !fdark], 1)
+			}
 		}
 		draw_set_color(c_red)
 		if (language != 1) draw_text_dynamic(rw - 65, 28, "Resource pack only")

scripts/control_draw/control_draw.gml

@@ -61,14 +61,15 @@ function draw_debug_overlay(){
 }
 
 function draw_debug_overlay_stack(x, y, str){
-	draw_theme_font(0, 0, 1)
+	draw_theme_font(0, 0)
 	draw_set_alpha(0.5)
 	draw_set_color(0)
-	draw_rectangle(x - 4, y - 12, x + string_width(str) + 4, y + 4, 0)
+	draw_rectangle(x - 4, y - 12, x + string_width_dynamic(str) + 4, y + 4, 0)
 	y -= 10
 	draw_set_alpha(1)
 	draw_set_color(c_white)
-	draw_text(x, y, str)
+	if (!hires || theme != 3) draw_text(x, y, str)
+	else draw_text_transformed(x, y, str, 0.25, 0.25, 0)
 	y -= 7
 	return y
 }

scripts/draw_debug_overlay/draw_debug_overlay.gml

@@ -33,6 +33,7 @@ function draw_window() {
 		draw_roundrect(x1, y1, x2 - 1, y2 - 1, 1)
 	} else {
 		draw_rectangle(x1, y1, x2 - 1, y2 - 1, 0)
+		if (hires && theme = 3) gpu_set_texfilter(false)
 		draw_sprite(spr_interface2, 0 + 8 * theme + 8 * (theme = 3) * fdark, x1, y1)
 		draw_sprite_ext(spr_interface2, 1 + 8 * theme + 8 * (theme = 3) * fdark, x1, y1 + 2, 1, (y2 - y1 - 4) / 2, 0, -1, draw_get_alpha())
 		draw_sprite(spr_interface2, 2 + 8 * theme + 8 * (theme = 3) * fdark, x1, y2 - 2)
@@ -41,6 +42,7 @@ function draw_window() {
 		draw_sprite_ext(spr_interface2, 5 + 8 * theme + 8 * (theme = 3) * fdark, x2 - 2, y1 + 2, 1, (y2 - y1 - 4) / 2, 0, -1, draw_get_alpha())
 		draw_sprite(spr_interface2, 6 + 8 * theme + 8 * (theme = 3) * fdark, x2 - 2, y1)
 		draw_sprite_ext(spr_interface2, 7 + 8 * theme + 8 * (theme = 3) * fdark, x1 + 2, y1, (x2 - x1 - 4) / 2, 1, 0, -1, draw_get_alpha())
+		if (hires && theme = 3) gpu_set_texfilter(true)
 	}
 	draw_theme_color()
 

scripts/draw_window/draw_window.gml

@@ -94,10 +94,15 @@ function draw_window_greeting() {
 	if (!hires || theme != 3) draw_sprite(spr_frame2, a + 3 * theme + 3 * (fdark && theme = 3), b, c)
 	else draw_sprite_ext(spr_frame2_hires, a + 3 * fdark, b, c, 0.25, 0.25, 0, -1, draw_get_alpha())
 	if (theme != 3) {
-	draw_sprite(spr_bigicons, 0, b + (a > 1), c + (a > 1))
+		draw_sprite(spr_bigicons, 0, b + (a > 1), c + (a > 1))
 	} else {
-	if (!fdark) draw_sprite(spr_bigicons_f, 0, b + (a > 1), c + (a > 1))
-	else draw_sprite(spr_bigicons_d, 0, b + (a > 1), c + (a > 1))
+		if (!hires) {
+			if (!fdark) draw_sprite(spr_bigicons_f, 0, b + (a > 1), c + (a > 1))
+			else draw_sprite(spr_bigicons_d, 0, b + (a > 1), c + (a > 1))
+		} else {
+			if (!fdark) draw_sprite_ext(spr_bigicons_f_hires, 0, b + (a > 1), c + (a > 1), 0.25, 0.25, 0, -1, draw_get_alpha())
+			else draw_sprite_ext(spr_bigicons_d_hires, 0, b + (a > 1), c + (a > 1), 0.25, 0.25, 0, -1, draw_get_alpha())
+		}
 	}
 	if (language != 1) draw_text_dynamic(b + 48 + (a > 1), c + 9 + (a > 1), "Create a new song")
 	else draw_text_dynamic(b + 48 + (a > 1), c + 9 + (a > 1), "创建歌曲")
@@ -114,10 +119,15 @@ function draw_window_greeting() {
 	if (!hires || theme != 3) draw_sprite(spr_frame2, a + 3 * theme + 3 * (fdark && theme = 3), b, c)
 	else draw_sprite_ext(spr_frame2_hires, a + 3 * fdark, b, c, 0.25, 0.25, 0, -1, draw_get_alpha())
 	if (theme != 3) {
-	draw_sprite(spr_bigicons, 1, b + (a > 1), c + (a > 1))
+		draw_sprite(spr_bigicons, 1, b + (a > 1), c + (a > 1))
 	} else {
-	if (!fdark) draw_sprite(spr_bigicons_f, 1, b + (a > 1), c + (a > 1))
-	else draw_sprite(spr_bigicons_d, 1, b + (a > 1), c + (a > 1))
+		if (!hires) {
+			if (!fdark) draw_sprite(spr_bigicons_f, 1, b + (a > 1), c + (a > 1))
+			else draw_sprite(spr_bigicons_d, 1, b + (a > 1), c + (a > 1))
+		} else {
+			if (!fdark) draw_sprite_ext(spr_bigicons_f_hires, 1, b + (a > 1), c + (a > 1), 0.25, 0.25, 0, -1, draw_get_alpha())
+			else draw_sprite_ext(spr_bigicons_d_hires, 1, b + (a > 1), c + (a > 1), 0.25, 0.25, 0, -1, draw_get_alpha())
+		}
 	}
 	if (language != 1) draw_text_dynamic(b + 48 + (a > 1), c + 9 + (a > 1), "Load a song")
 	else draw_text_dynamic(b + 48 + (a > 1), c + 9 + (a > 1), "打开歌曲")
@@ -181,10 +191,15 @@ function draw_window_greeting() {
 	if (!hires || theme != 3) draw_sprite(spr_frame2, a + 3 * theme + 3 * (fdark && theme = 3), b, c)
 	else draw_sprite_ext(spr_frame2_hires, a + 3 * fdark, b, c, 0.25, 0.25, 0, -1, draw_get_alpha())
 	if (theme != 3) {
-	draw_sprite(spr_bigicons, 2, b + (a > 1), c + (a > 1))
+		draw_sprite(spr_bigicons, 2, b + (a > 1), c + (a > 1))
 	} else {
-	if (!fdark) draw_sprite(spr_bigicons_f, 2, b + (a > 1), c + (a > 1))
-	else draw_sprite(spr_bigicons_d, 2, b + (a > 1), c + (a > 1))
+		if (!hires) {
+			if (!fdark) draw_sprite(spr_bigicons_f, 2, b + (a > 1), c + (a > 1))
+			else draw_sprite(spr_bigicons_d, 2, b + (a > 1), c + (a > 1))
+		} else {
+			if (!fdark) draw_sprite_ext(spr_bigicons_f_hires, 2, b + (a > 1), c + (a > 1), 0.25, 0.25, 0, -1, draw_get_alpha())
+			else draw_sprite_ext(spr_bigicons_d_hires, 2, b + (a > 1), c + (a > 1), 0.25, 0.25, 0, -1, draw_get_alpha())
+		}
 	}
 	if (language != 1) draw_text_dynamic(b + 48 + (a > 1), c + 9 + (a > 1), "Generate song out of MIDI file")
 	else draw_text_dynamic(b + 48 + (a > 1), c + 9 + (a > 1), "从 MIDI 文件生成")
@@ -203,10 +218,15 @@ function draw_window_greeting() {
 	if (!hires || theme != 3) draw_sprite(spr_frame2, a + 3 * theme + 3 * (fdark && theme = 3), b, c)
 	else draw_sprite_ext(spr_frame2_hires, a + 3 * fdark, b, c, 0.25, 0.25, 0, -1, draw_get_alpha())
 	if (theme != 3) {
-	draw_sprite(spr_bigicons, 6, b + (a > 1), c + (a > 1))
+		draw_sprite(spr_bigicons, 6, b + (a > 1), c + (a > 1))
 	} else {
-	if (!fdark) draw_sprite(spr_bigicons_f, 6, b + (a > 1), c + (a > 1))
-	else draw_sprite(spr_bigicons_d, 6, b + (a > 1), c + (a > 1))
+		if (!hires) {
+			if (!fdark) draw_sprite_(spr_bigicons_f, 6, b + (a > 1), c + (a > 1))
+			else draw_sprite(spr_bigicons_d, 6, b + (a > 1), c + (a > 1))
+		} else {
+			if (!fdark) draw_sprite_ext(spr_bigicons_f_hires, 6, b + (a > 1), c + (a > 1), 0.25, 0.25, 0, -1, draw_get_alpha())
+			else draw_sprite_ext(spr_bigicons_d_hires, 6, b + (a > 1), c + (a > 1), 0.25, 0.25, 0, -1, draw_get_alpha())
+		}
 	}
 	if (language != 1) draw_text_dynamic(b + 48 + (a > 1), c + 9 + (a > 1), "Watch tutorial videos")
 	else draw_text_dynamic(b + 48 + (a > 1), c + 9 + (a > 1), "教程视频")