Skip to content

Commit a495eeb

Browse files
OctoFlareDevOctoFlareDev
committed
High resolution part 4
1 parent 7ab2603 commit a495eeb

79 files changed

Lines changed: 917 additions & 88 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Minecraft Note Block Studio.yyp‎

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎scripts/control_draw/control_draw.gml‎

Lines changed: 39 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1882,13 +1882,20 @@ function control_draw() {
18821882
draw_set_halign(fa_right)
18831883
if (compatible = 1) {
18841884
if (theme != 3) {
1885-
draw_sprite(spr_minecraft, 0, rw - 30, 25)
1886-
draw_sprite(spr_minecraft, 0, rw - 59, 25)
1885+
draw_sprite(spr_minecraft, 0, rw - 30, 25)
1886+
draw_sprite(spr_minecraft, 0, rw - 59, 25)
18871887
} else {
1888-
draw_sprite(spr_minecraft_f, fdark * 3, rw - 30, 25)
1889-
draw_sprite(spr_minecraft_f, fdark * 3, rw - 59, 25)
1890-
draw_sprite_ext(spr_minecraft_f, 6, rw - 30, 25, 1, 1, 0, accent[6 - 2 * !fdark], 1)
1891-
draw_sprite_ext(spr_minecraft_f, 6, rw - 59, 25, 1, 1, 0, accent[6 - 2 * !fdark], 1)
1888+
if (!hires) {
1889+
draw_sprite(spr_minecraft_f, fdark * 3, rw - 30, 25)
1890+
draw_sprite(spr_minecraft_f, fdark * 3, rw - 59, 25)
1891+
draw_sprite_ext(spr_minecraft_f, 6, rw - 30, 25, 1, 1, 0, accent[6 - 2 * !fdark], 1)
1892+
draw_sprite_ext(spr_minecraft_f, 6, rw - 59, 25, 1, 1, 0, accent[6 - 2 * !fdark], 1)
1893+
} else {
1894+
draw_sprite_ext(spr_minecraft_f_hires, fdark * 3, rw - 30, 25, 0.25, 0.25, 0, -1, 1)
1895+
draw_sprite_ext(spr_minecraft_f_hires, fdark * 3, rw - 59, 25, 0.25, 0.25, 0, -1, 1)
1896+
draw_sprite_ext(spr_minecraft_f_hires, 6, rw - 30, 25, 0.25, 0.25, 0, accent[6 - 2 * !fdark], 1)
1897+
draw_sprite_ext(spr_minecraft_f_hires, 6, rw - 59, 25, 0.25, 0.25, 0, accent[6 - 2 * !fdark], 1)
1898+
}
18921899
}
18931900
draw_set_color(c_green)
18941901
if (theme == 2 || (theme == 3 && fdark)) draw_set_color(c_lime)
@@ -1900,13 +1907,20 @@ function control_draw() {
19001907
else popup_set(rw - compx, 24, compx, 25, "此歌曲兼容 schematic 和数据包。\n（点击查看更多）")
19011908
} else if (compatible = 2) {
19021909
if (theme != 3) {
1903-
draw_sprite(spr_minecraft, 0, rw - 30, 25)
1904-
draw_sprite(spr_minecraft, 1, rw - 59, 25)
1910+
draw_sprite(spr_minecraft, 0, rw - 30, 25)
1911+
draw_sprite(spr_minecraft, 1, rw - 59, 25)
19051912
} else {
1906-
draw_sprite(spr_minecraft_f, fdark * 3, rw - 30, 25)
1907-
draw_sprite(spr_minecraft_f, 1 + fdark * 3, rw - 59, 25)
1908-
draw_sprite_ext(spr_minecraft_f, 6, rw - 30, 25, 1, 1, 0, accent[6 - 2 * !fdark], 1)
1909-
draw_sprite_ext(spr_minecraft_f, 1 + 6, rw - 59, 25, 1, 1, 0, accent[6 - 2 * !fdark], 1)
1913+
if (!hires) {
1914+
draw_sprite(spr_minecraft_f, fdark * 3, rw - 30, 25)
1915+
draw_sprite(spr_minecraft_f, 1 + fdark * 3, rw - 59, 25)
1916+
draw_sprite_ext(spr_minecraft_f, 6, rw - 30, 25, 1, 1, 0, accent[6 - 2 * !fdark], 1)
1917+
draw_sprite_ext(spr_minecraft_f, 1 + 6, rw - 59, 25, 1, 1, 0, accent[6 - 2 * !fdark], 1)
1918+
} else {
1919+
draw_sprite_ext(spr_minecraft_f_hires, fdark * 3, rw - 30, 25, 0.25, 0.25, 0, -1, 1)
1920+
draw_sprite_ext(spr_minecraft_f_hires, 1 + fdark * 3, rw - 59, 25, 0.25, 0.25, 0, -1, 1)
1921+
draw_sprite_ext(spr_minecraft_f_hires, 6, rw - 30, 25, 0.25, 0.25, 0, accent[6 - 2 * !fdark], 1)
1922+
draw_sprite_ext(spr_minecraft_f_hires, 1 + 6, rw - 59, 25, 0.25, 0.25, 0, accent[6 - 2 * !fdark], 1)
1923+
}
19101924
}
19111925
draw_set_color(c_orange)
19121926
if (language != 1) draw_text_dynamic(rw - 65, 28, "Data pack only")
@@ -1917,13 +1931,20 @@ function control_draw() {
19171931
else popup_set(rw - compx, 24, compx, 25, "此歌曲仅兼容数据包。\n（点击查看更多）")
19181932
} else {
19191933
if (theme != 3) {
1920-
draw_sprite(spr_minecraft, 2, rw - 30, 25)
1921-
draw_sprite(spr_minecraft, 1, rw - 59, 25)
1934+
draw_sprite(spr_minecraft, 2, rw - 30, 25)
1935+
draw_sprite(spr_minecraft, 1, rw - 59, 25)
19221936
} else {
1923-
draw_sprite(spr_minecraft_f, 2 + fdark * 3, rw - 30, 25)
1924-
draw_sprite(spr_minecraft_f, 1 + fdark * 3, rw - 59, 25)
1925-
draw_sprite_ext(spr_minecraft_f, 2 + 6, rw - 30, 25, 1, 1, 0, accent[6 - 2 * !fdark], 1)
1926-
draw_sprite_ext(spr_minecraft_f, 1 + 6, rw - 59, 25, 1, 1, 0, accent[6 - 2 * !fdark], 1)
1937+
if (!hires) {
1938+
draw_sprite(spr_minecraft_f, 2 + fdark * 3, rw - 30, 25)
1939+
draw_sprite(spr_minecraft_f, 1 + fdark * 3, rw - 59, 25)
1940+
draw_sprite_ext(spr_minecraft_f, 2 + 6, rw - 30, 25, 1, 1, 0, accent[6 - 2 * !fdark], 1)
1941+
draw_sprite_ext(spr_minecraft_f, 1 + 6, rw - 59, 25, 1, 1, 0, accent[6 - 2 * !fdark], 1)
1942+
} else {
1943+
draw_sprite_ext(spr_minecraft_f_hires, 2 + fdark * 3, rw - 30, 25, 0.25, 0.25, 0, -1, 1)
1944+
draw_sprite_ext(spr_minecraft_f_hires, 1 + fdark * 3, rw - 59, 25, 0.25, 0.25, 0, -1, 1)
1945+
draw_sprite_ext(spr_minecraft_f_hires, 2 + 6, rw - 30, 25, 0.25, 0.25, 0, accent[6 - 2 * !fdark], 1)
1946+
draw_sprite_ext(spr_minecraft_f_hires, 1 + 6, rw - 59, 25, 0.25, 0.25, 0, accent[6 - 2 * !fdark], 1)
1947+
}
19271948
}
19281949
draw_set_color(c_red)
19291950
if (language != 1) draw_text_dynamic(rw - 65, 28, "Resource pack only")

‎scripts/draw_debug_overlay/draw_debug_overlay.gml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,14 +61,15 @@ function draw_debug_overlay(){
6161
}
6262

6363
function draw_debug_overlay_stack(x, y, str){
64-
draw_theme_font(0, 0, 1)
64+
draw_theme_font(0, 0)
6565
draw_set_alpha(0.5)
6666
draw_set_color(0)
67-
draw_rectangle(x - 4, y - 12, x + string_width(str) + 4, y + 4, 0)
67+
draw_rectangle(x - 4, y - 12, x + string_width_dynamic(str) + 4, y + 4, 0)
6868
y -= 10
6969
draw_set_alpha(1)
7070
draw_set_color(c_white)
71-
draw_text(x, y, str)
71+
if (!hires || theme != 3) draw_text(x, y, str)
72+
else draw_text_transformed(x, y, str, 0.25, 0.25, 0)
7273
y -= 7
7374
return y
7475
}

‎scripts/draw_window/draw_window.gml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ function draw_window() {
3333
draw_roundrect(x1, y1, x2 - 1, y2 - 1, 1)
3434
} else {
3535
draw_rectangle(x1, y1, x2 - 1, y2 - 1, 0)
36+
if (hires && theme = 3) gpu_set_texfilter(false)
3637
draw_sprite(spr_interface2, 0 + 8 * theme + 8 * (theme = 3) * fdark, x1, y1)
3738
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())
3839
draw_sprite(spr_interface2, 2 + 8 * theme + 8 * (theme = 3) * fdark, x1, y2 - 2)
@@ -41,6 +42,7 @@ function draw_window() {
4142
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())
4243
draw_sprite(spr_interface2, 6 + 8 * theme + 8 * (theme = 3) * fdark, x2 - 2, y1)
4344
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())
45+
if (hires && theme = 3) gpu_set_texfilter(true)
4446
}
4547
draw_theme_color()
4648

‎scripts/draw_window_greeting/draw_window_greeting.gml‎

Lines changed: 32 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -94,10 +94,15 @@ function draw_window_greeting() {
9494
if (!hires || theme != 3) draw_sprite(spr_frame2, a + 3 * theme + 3 * (fdark && theme = 3), b, c)
9595
else draw_sprite_ext(spr_frame2_hires, a + 3 * fdark, b, c, 0.25, 0.25, 0, -1, draw_get_alpha())
9696
if (theme != 3) {
97-
draw_sprite(spr_bigicons, 0, b + (a > 1), c + (a > 1))
97+
draw_sprite(spr_bigicons, 0, b + (a > 1), c + (a > 1))
9898
} else {
99-
if (!fdark) draw_sprite(spr_bigicons_f, 0, b + (a > 1), c + (a > 1))
100-
else draw_sprite(spr_bigicons_d, 0, b + (a > 1), c + (a > 1))
99+
if (!hires) {
100+
if (!fdark) draw_sprite(spr_bigicons_f, 0, b + (a > 1), c + (a > 1))
101+
else draw_sprite(spr_bigicons_d, 0, b + (a > 1), c + (a > 1))
102+
} else {
103+
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())
104+
else draw_sprite_ext(spr_bigicons_d_hires, 0, b + (a > 1), c + (a > 1), 0.25, 0.25, 0, -1, draw_get_alpha())
105+
}
101106
}
102107
if (language != 1) draw_text_dynamic(b + 48 + (a > 1), c + 9 + (a > 1), "Create a new song")
103108
else draw_text_dynamic(b + 48 + (a > 1), c + 9 + (a > 1), "创建歌曲")
@@ -114,10 +119,15 @@ function draw_window_greeting() {
114119
if (!hires || theme != 3) draw_sprite(spr_frame2, a + 3 * theme + 3 * (fdark && theme = 3), b, c)
115120
else draw_sprite_ext(spr_frame2_hires, a + 3 * fdark, b, c, 0.25, 0.25, 0, -1, draw_get_alpha())
116121
if (theme != 3) {
117-
draw_sprite(spr_bigicons, 1, b + (a > 1), c + (a > 1))
122+
draw_sprite(spr_bigicons, 1, b + (a > 1), c + (a > 1))
118123
} else {
119-
if (!fdark) draw_sprite(spr_bigicons_f, 1, b + (a > 1), c + (a > 1))
120-
else draw_sprite(spr_bigicons_d, 1, b + (a > 1), c + (a > 1))
124+
if (!hires) {
125+
if (!fdark) draw_sprite(spr_bigicons_f, 1, b + (a > 1), c + (a > 1))
126+
else draw_sprite(spr_bigicons_d, 1, b + (a > 1), c + (a > 1))
127+
} else {
128+
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())
129+
else draw_sprite_ext(spr_bigicons_d_hires, 1, b + (a > 1), c + (a > 1), 0.25, 0.25, 0, -1, draw_get_alpha())
130+
}
121131
}
122132
if (language != 1) draw_text_dynamic(b + 48 + (a > 1), c + 9 + (a > 1), "Load a song")
123133
else draw_text_dynamic(b + 48 + (a > 1), c + 9 + (a > 1), "打开歌曲")
@@ -181,10 +191,15 @@ function draw_window_greeting() {
181191
if (!hires || theme != 3) draw_sprite(spr_frame2, a + 3 * theme + 3 * (fdark && theme = 3), b, c)
182192
else draw_sprite_ext(spr_frame2_hires, a + 3 * fdark, b, c, 0.25, 0.25, 0, -1, draw_get_alpha())
183193
if (theme != 3) {
184-
draw_sprite(spr_bigicons, 2, b + (a > 1), c + (a > 1))
194+
draw_sprite(spr_bigicons, 2, b + (a > 1), c + (a > 1))
185195
} else {
186-
if (!fdark) draw_sprite(spr_bigicons_f, 2, b + (a > 1), c + (a > 1))
187-
else draw_sprite(spr_bigicons_d, 2, b + (a > 1), c + (a > 1))
196+
if (!hires) {
197+
if (!fdark) draw_sprite(spr_bigicons_f, 2, b + (a > 1), c + (a > 1))
198+
else draw_sprite(spr_bigicons_d, 2, b + (a > 1), c + (a > 1))
199+
} else {
200+
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())
201+
else draw_sprite_ext(spr_bigicons_d_hires, 2, b + (a > 1), c + (a > 1), 0.25, 0.25, 0, -1, draw_get_alpha())
202+
}
188203
}
189204
if (language != 1) draw_text_dynamic(b + 48 + (a > 1), c + 9 + (a > 1), "Generate song out of MIDI file")
190205
else draw_text_dynamic(b + 48 + (a > 1), c + 9 + (a > 1), "从 MIDI 文件生成")
@@ -203,10 +218,15 @@ function draw_window_greeting() {
203218
if (!hires || theme != 3) draw_sprite(spr_frame2, a + 3 * theme + 3 * (fdark && theme = 3), b, c)
204219
else draw_sprite_ext(spr_frame2_hires, a + 3 * fdark, b, c, 0.25, 0.25, 0, -1, draw_get_alpha())
205220
if (theme != 3) {
206-
draw_sprite(spr_bigicons, 6, b + (a > 1), c + (a > 1))
221+
draw_sprite(spr_bigicons, 6, b + (a > 1), c + (a > 1))
207222
} else {
208-
if (!fdark) draw_sprite(spr_bigicons_f, 6, b + (a > 1), c + (a > 1))
209-
else draw_sprite(spr_bigicons_d, 6, b + (a > 1), c + (a > 1))
223+
if (!hires) {
224+
if (!fdark) draw_sprite_(spr_bigicons_f, 6, b + (a > 1), c + (a > 1))
225+
else draw_sprite(spr_bigicons_d, 6, b + (a > 1), c + (a > 1))
226+
} else {
227+
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())
228+
else draw_sprite_ext(spr_bigicons_d_hires, 6, b + (a > 1), c + (a > 1), 0.25, 0.25, 0, -1, draw_get_alpha())
229+
}
210230
}
211231
if (language != 1) draw_text_dynamic(b + 48 + (a > 1), c + 9 + (a > 1), "Watch tutorial videos")
212232
else draw_text_dynamic(b + 48 + (a > 1), c + 9 + (a > 1), "教程视频")

0 commit comments

Comments
 (0)