From 89eb5425cdcd31717942e6a42163c652a1784957 Mon Sep 17 00:00:00 2001 From: penguindark <57967770+penguindark@users.noreply.github.com> Date: Mon, 6 Dec 2021 08:53:46 +0100 Subject: [PATCH] examples: clean file path usage in the examples, move all the fonts in the common assets folder (#12736) --- examples/2048/2048.v | 2 +- .../{ttf_font => assets/fonts}/Graduate-Regular.ttf | Bin .../{ttf_font => assets/fonts}/Imprima-Regular.ttf | Bin examples/{ttf_font => assets/fonts}/OFL.txt | 0 examples/{gg => assets}/logo.png | Bin examples/clock/clock.v | 2 +- examples/fireworks/fireworks.v | 2 +- examples/flappylearning/game.v | 2 +- examples/gg/drag_n_drop.v | 2 +- examples/gg/rectangles.v | 3 ++- examples/gg/stars.v | 3 ++- examples/sokol/fonts.v | 5 ++++- examples/sokol/freetype_raven.v | 5 ++++- examples/ttf_font/example_ttf.v | 4 ++-- 14 files changed, 19 insertions(+), 11 deletions(-) rename examples/{ttf_font => assets/fonts}/Graduate-Regular.ttf (100%) rename examples/{ttf_font => assets/fonts}/Imprima-Regular.ttf (100%) rename examples/{ttf_font => assets/fonts}/OFL.txt (100%) rename examples/{gg => assets}/logo.png (100%) diff --git a/examples/2048/2048.v b/examples/2048/2048.v index 3cac25005..a94f48de2 100644 --- a/examples/2048/2048.v +++ b/examples/2048/2048.v @@ -910,7 +910,7 @@ fn (mut app App) showfps() { fn main() { mut app := &App{} app.new_game() - mut font_path := os.resource_abs_path(os.join_path('../assets/fonts/', 'RobotoMono-Regular.ttf')) + mut font_path := os.resource_abs_path(os.join_path('..', 'assets', 'fonts', 'RobotoMono-Regular.ttf')) $if android { font_path = 'fonts/RobotoMono-Regular.ttf' } diff --git a/examples/ttf_font/Graduate-Regular.ttf b/examples/assets/fonts/Graduate-Regular.ttf similarity index 100% rename from examples/ttf_font/Graduate-Regular.ttf rename to examples/assets/fonts/Graduate-Regular.ttf diff --git a/examples/ttf_font/Imprima-Regular.ttf b/examples/assets/fonts/Imprima-Regular.ttf similarity index 100% rename from examples/ttf_font/Imprima-Regular.ttf rename to examples/assets/fonts/Imprima-Regular.ttf diff --git a/examples/ttf_font/OFL.txt b/examples/assets/fonts/OFL.txt similarity index 100% rename from examples/ttf_font/OFL.txt rename to examples/assets/fonts/OFL.txt diff --git a/examples/gg/logo.png b/examples/assets/logo.png similarity index 100% rename from examples/gg/logo.png rename to examples/assets/logo.png diff --git a/examples/clock/clock.v b/examples/clock/clock.v index f9ac87b0e..d80416e7e 100644 --- a/examples/clock/clock.v +++ b/examples/clock/clock.v @@ -152,7 +152,7 @@ fn on_init(mut app App) { [console] fn main() { println("Press 'q' to quit.") - mut font_path := os.resource_abs_path(os.join_path('../assets/fonts/', 'RobotoMono-Regular.ttf')) + mut font_path := os.resource_abs_path(os.join_path('..', 'assets', 'fonts', 'RobotoMono-Regular.ttf')) $if android { font_path = 'fonts/RobotoMono-Regular.ttf' } diff --git a/examples/fireworks/fireworks.v b/examples/fireworks/fireworks.v index 9581cc54a..431e39133 100644 --- a/examples/fireworks/fireworks.v +++ b/examples/fireworks/fireworks.v @@ -96,7 +96,7 @@ fn (mut app App) resize() { // is needed for easier diagnostics on windows [console] fn main() { - mut font_path := os.resource_abs_path(os.join_path('../assets/fonts/', 'RobotoMono-Regular.ttf')) + mut font_path := os.resource_abs_path(os.join_path('..', 'assets', 'fonts', 'RobotoMono-Regular.ttf')) $if android { font_path = 'fonts/RobotoMono-Regular.ttf' } diff --git a/examples/flappylearning/game.v b/examples/flappylearning/game.v index 81f31d81f..628c25609 100644 --- a/examples/flappylearning/game.v +++ b/examples/flappylearning/game.v @@ -177,7 +177,7 @@ fn main() { mut app := &App{ gg: 0 } - mut font_path := os.resource_abs_path(os.join_path('../assets/fonts/', 'RobotoMono-Regular.ttf')) + mut font_path := os.resource_abs_path(os.join_path('..', 'assets', 'fonts', 'RobotoMono-Regular.ttf')) $if android { font_path = 'fonts/RobotoMono-Regular.ttf' } diff --git a/examples/gg/drag_n_drop.v b/examples/gg/drag_n_drop.v index 9407bf55c..2529ca075 100644 --- a/examples/gg/drag_n_drop.v +++ b/examples/gg/drag_n_drop.v @@ -18,7 +18,7 @@ mut: } fn main() { - mut font_path := os.resource_abs_path(os.join_path('../assets/fonts/', 'RobotoMono-Regular.ttf')) + mut font_path := os.resource_abs_path(os.join_path('..', 'assets', 'fonts', 'RobotoMono-Regular.ttf')) mut app := &App{ gg: 0 } diff --git a/examples/gg/rectangles.v b/examples/gg/rectangles.v index 73229fd53..5ed630d38 100644 --- a/examples/gg/rectangles.v +++ b/examples/gg/rectangles.v @@ -29,7 +29,8 @@ fn main() { user_data: app init_fn: init_images ) - app.image = app.gg.create_image(os.resource_abs_path('logo.png')) + mut logo_path := os.resource_abs_path(os.join_path('..', 'assets', 'logo.png')) + app.image = app.gg.create_image(logo_path) app.gg.run() } diff --git a/examples/gg/stars.v b/examples/gg/stars.v index 815cfeb34..c909f3018 100644 --- a/examples/gg/stars.v +++ b/examples/gg/stars.v @@ -81,7 +81,8 @@ fn main() { } fn init_images(mut app App) { - app.image = app.gg.create_image(os.resource_abs_path('logo.png')) + mut logo_path := os.resource_abs_path(os.join_path('..', 'assets', 'logo.png')) + app.image = app.gg.create_image(logo_path) } fn frame(mut app App) { diff --git a/examples/sokol/fonts.v b/examples/sokol/fonts.v index 1cf21704c..7bff6ef87 100644 --- a/examples/sokol/fonts.v +++ b/examples/sokol/fonts.v @@ -12,6 +12,7 @@ mut: font_normal int } +[console] fn main() { mut color_action := C.sg_color_attachment_action{ action: gfx.Action(C.SG_ACTION_CLEAR) @@ -46,7 +47,9 @@ fn init(mut state AppState) { C.sgl_setup(s) state.fons = sfons.create(512, 512, 1) // or use DroidSerif-Regular.ttf - if bytes := os.read_bytes(os.resource_abs_path('../assets/fonts/RobotoMono-Regular.ttf')) { + if bytes := os.read_bytes(os.resource_abs_path(os.join_path('..', 'assets', 'fonts', + 'RobotoMono-Regular.ttf'))) + { println('loaded font: $bytes.len') state.font_normal = C.fonsAddFontMem(state.fons, c'sans', bytes.data, bytes.len, false) diff --git a/examples/sokol/freetype_raven.v b/examples/sokol/freetype_raven.v index d65b01f41..15699a8b6 100644 --- a/examples/sokol/freetype_raven.v +++ b/examples/sokol/freetype_raven.v @@ -61,6 +61,7 @@ mut: inited bool } +[console] fn main() { mut color_action := C.sg_color_attachment_action{ action: gfx.Action(C.SG_ACTION_CLEAR) @@ -99,7 +100,9 @@ fn init(user_data voidptr) { C.sgl_setup(s) state.fons = sfons.create(512, 512, 1) // or use DroidSerif-Regular.ttf - if bytes := os.read_bytes(os.resource_abs_path('../assets/fonts/RobotoMono-Regular.ttf')) { + if bytes := os.read_bytes(os.resource_abs_path(os.join_path('..', 'assets', 'fonts', + 'RobotoMono-Regular.ttf'))) + { println('loaded font: $bytes.len') state.font_normal = C.fonsAddFontMem(state.fons, c'sans', bytes.data, bytes.len, false) diff --git a/examples/ttf_font/example_ttf.v b/examples/ttf_font/example_ttf.v index e59ef06c0..a80826a01 100644 --- a/examples/ttf_font/example_ttf.v +++ b/examples/ttf_font/example_ttf.v @@ -11,8 +11,8 @@ const ( win_height = 700 bg_color = gx.white font_paths = [ - os.resource_abs_path('Imprima-Regular.ttf'), - os.resource_abs_path('Graduate-Regular.ttf'), + os.resource_abs_path(os.join_path('..', 'assets', 'fonts', 'Imprima-Regular.ttf')), + os.resource_abs_path(os.join_path('..', 'assets', 'fonts', 'Graduate-Regular.ttf')), ] ) -- 2.30.2