diff --git a/examples/assets/fonts/LICENSE b/examples/assets/fonts/LICENSE new file mode 100644 index 0000000000..d645695673 --- /dev/null +++ b/examples/assets/fonts/LICENSE @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/examples/sdl/tvintris/fonts/RobotoMono-Regular.ttf b/examples/assets/fonts/RobotoMono-Regular.ttf similarity index 100% rename from examples/sdl/tvintris/fonts/RobotoMono-Regular.ttf rename to examples/assets/fonts/RobotoMono-Regular.ttf diff --git a/examples/gg2.v b/examples/gg2.v index 5cef9db2e6..8dda5b9616 100644 --- a/examples/gg2.v +++ b/examples/gg2.v @@ -2,6 +2,7 @@ module main import gg2 as gg import gx +import os const ( win_width = 600 @@ -24,7 +25,7 @@ fn main() { window_title: 'Empty window' frame_fn: frame user_data: app - font_path: 'examples/tetris/RobotoMono-Regular.ttf' + font_path: os.resource_abs_path('assets/fonts/RobotoMono-Regular.ttf') }) app.gg.run() } @@ -47,4 +48,3 @@ fn (app &App) draw() { app.gg.draw_rect(10, 10, 100, 30, gx.blue) app.gg.draw_empty_rect(10, 150, 80, 40, gx.green) } - diff --git a/examples/sdl/tvintris/tvintris.v b/examples/sdl/tvintris/tvintris.v index ec404d4dd9..b930936c89 100644 --- a/examples/sdl/tvintris/tvintris.v +++ b/examples/sdl/tvintris/tvintris.v @@ -21,7 +21,7 @@ import sdl.ttf as ttf const ( Title = 'tVintris' BASE = filepath.dir( os.realpath( os.executable() ) ) - FontName = BASE + '/fonts/RobotoMono-Regular.ttf' + FontName = BASE + '/../../assets/fonts/RobotoMono-Regular.ttf' MusicName = BASE + '/sounds/TwintrisThosenine.mod' SndBlockName = BASE + '/sounds/block.wav' SndLineName = BASE + '/sounds/single.wav' diff --git a/examples/sokol_examples/assets/DroidSerif-Regular.ttf b/examples/sokol_examples/assets/DroidSerif-Regular.ttf deleted file mode 100644 index 239ba38253..0000000000 Binary files a/examples/sokol_examples/assets/DroidSerif-Regular.ttf and /dev/null differ diff --git a/examples/sokol_examples/assets/ProggyTiny.ttf b/examples/sokol_examples/assets/ProggyTiny.ttf deleted file mode 100644 index 1c4312c3db..0000000000 Binary files a/examples/sokol_examples/assets/ProggyTiny.ttf and /dev/null differ diff --git a/examples/sokol_examples/fonts.v b/examples/sokol_examples/fonts.v index 169d257a00..4533230a48 100644 --- a/examples/sokol_examples/fonts.v +++ b/examples/sokol_examples/fonts.v @@ -54,7 +54,7 @@ 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/ProggyTiny.ttf')) { + if bytes := os.read_bytes(os.resource_abs_path('../assets/fonts/RobotoMono-Regular.ttf')) { println('loaded font: $bytes.len') state.font_normal = C.fonsAddFontMem(state.fons, 'sans', bytes.data, bytes.len, false) } diff --git a/examples/sokol_examples/fonts2.v b/examples/sokol_examples/fonts2.v deleted file mode 100644 index 7bb063c886..0000000000 --- a/examples/sokol_examples/fonts2.v +++ /dev/null @@ -1,180 +0,0 @@ -import sokol -import sokol.sapp -import sokol.gfx -import sokol.sgl -import sokol.sfons -import os -// import time -#define FONS_USE_FREETYPE 1 -struct AppState { -mut: - pass_action C.sg_pass_action - fons &C.FONScontext - font_normal int -} - -fn main() { - mut color_action := sg_color_attachment_action{ - action: C.SG_ACTION_CLEAR - } - color_action.val[0] = 0.3 - color_action.val[1] = 0.3 - color_action.val[2] = 0.32 - color_action.val[3] = 1.0 - mut pass_action := sg_pass_action{} - pass_action.colors[0] = color_action - state := &AppState{ - pass_action: pass_action - fons: &C.FONScontext(0) - } - title := 'V Metal/GL Text Rendering' - desc := sapp_desc{ - user_data: state - init_userdata_cb: init - frame_userdata_cb: frame - window_title: title.str - html5_canvas_name: title.str - } - sapp.run(&desc) -} - -fn init(user_data voidptr) { - mut state := &AppState(user_data) - // dont actually alocate this on the heap in real life - gfx.setup(&sg_desc{ - mtl_device: C.sapp_metal_get_device() - mtl_renderpass_descriptor_cb: sapp_metal_get_renderpass_descriptor - mtl_drawable_cb: sapp_metal_get_drawable - d3d11_device: sapp_d3d11_get_device() - d3d11_device_context: sapp_d3d11_get_device_context() - d3d11_render_target_view_cb: sapp_d3d11_get_render_target_view - d3d11_depth_stencil_view_cb: sapp_d3d11_get_depth_stencil_view - }) - s := &C.sgl_desc_t{} - C.sgl_setup(s) - state.fons = C.sfons_create(512, 512, 1) - mut font_path := os.resource_abs_path('assets/DroidSerif-Regular.ttf') - if !os.exists(font_path) { - font_path = os.resource_abs_path('../tetris/RobotoMono-Regular.ttf') - println(font_path) - } - if !os.exists(font_path) { - println('failed to load $font_path') - return - } - if bytes := os.read_bytes(font_path) { - println('loaded font: $bytes.len') - state.font_normal = C.fonsAddFontMem(state.fons, 'sans', bytes.data, bytes.len, false) - } -} - -fn frame(user_data voidptr) { - // t:=time.ticks() - mut state := &AppState(user_data) - state.render_font() - gfx.begin_default_pass(&state.pass_action, sapp_width(), sapp_height()) - sgl.draw() - gfx.end_pass() - gfx.commit() - // println(time.ticks()-t) -} - -fn (state mut AppState) render_font() { - mut sx := 0.0 - mut sy := 0.0 - mut dx := 0.0 - mut dy := 0.0 - lh := 0.0 - white := C.sfons_rgba(255, 255, 255, 255) - black := C.sfons_rgba(0, 0, 0, 255) - brown := C.sfons_rgba(192, 128, 0, 128) - blue := C.sfons_rgba(0, 192, 255, 255) - state.fons.clear_state() - sgl.defaults() - sgl.matrix_mode_projection() - sgl.ortho(0.0, f32(C.sapp_width()), f32(C.sapp_height()), 0.0, -1.0, 1.0) - sx = 0 - sy = 50 - dx = sx - dy = sy - state.fons.set_font(state.font_normal) - state.fons.set_size(100.0) - ascender := 0.0 - descender := 0.0 - state.fons.vert_metrics(&ascender, &descender, &lh) - dx = sx - dy += lh - C.fonsSetColor(state.fons, white) - dx = C.fonsDrawText(state.fons, dx, dy, c'The 新 quick ', C.NULL) - fonsSetFont(state.fons, state.font_normal) - fonsSetSize(state.fons, 48.0) - fonsSetColor(state.fons, brown) - dx = fonsDrawText(state.fons, dx, dy, c'brown ', C.NULL) - fonsSetFont(state.fons, state.font_normal) - fonsSetSize(state.fons, 24.0) - fonsSetColor(state.fons, white) - dx = fonsDrawText(state.fons, dx, dy, c'fox ', C.NULL) - dx = sx - dy += lh * 1.2 - fonsSetSize(state.fons, 20.0) - fonsSetFont(state.fons, state.font_normal) - fonsSetColor(state.fons, blue) - fonsDrawText(state.fons, dx, dy, c'Now is the time for all good men to come to the aid of the party.', C.NULL) - dx = 300 - dy = 350 - fonsSetAlign(state.fons, C.FONS_ALIGN_LEFT | C.FONS_ALIGN_BASELINE) - fonsSetSize(state.fons, 60.0) - fonsSetFont(state.fons, state.font_normal) - fonsSetColor(state.fons, white) - fonsSetSpacing(state.fons, 5.0) - fonsSetBlur(state.fons, 6.0) - fonsDrawText(state.fons, dx, dy, c'Blurry...', C.NULL) - dx = 300 - dy += 50.0 - fonsSetSize(state.fons, 28.0) - fonsSetFont(state.fons, state.font_normal) - fonsSetColor(state.fons, white) - fonsSetSpacing(state.fons, 0.0) - fonsSetBlur(state.fons, 3.0) - fonsDrawText(state.fons, dx, dy + 2, c'DROP SHADOW', C.NULL) - fonsSetColor(state.fons, black) - fonsSetBlur(state.fons, 0) - fonsDrawText(state.fons, dx, dy, c'DROP SHADOW', C.NULL) - fonsSetSize(state.fons, 18.0) - fonsSetFont(state.fons, state.font_normal) - fonsSetColor(state.fons, white) - dx = 50 - dy = 350 - line(dx - 10, dy, dx + 250, dy) - C.fonsSetAlign(state.fons, C.FONS_ALIGN_LEFT | C.FONS_ALIGN_TOP) - dx = C.fonsDrawText(state.fons, dx, dy, c'Top', C.NULL) - dx += 10 - C.fonsSetAlign(state.fons, C.FONS_ALIGN_LEFT | C.FONS_ALIGN_MIDDLE) - dx = C.fonsDrawText(state.fons, dx, dy, c'Middle', C.NULL) - dx += 10 - C.fonsSetAlign(state.fons, C.FONS_ALIGN_LEFT | C.FONS_ALIGN_BASELINE) - dx = C.fonsDrawText(state.fons, dx, dy, c'Baseline', C.NULL) - dx += 10 - C.fonsSetAlign(state.fons, C.FONS_ALIGN_LEFT | C.FONS_ALIGN_BOTTOM) - C.fonsDrawText(state.fons, dx, dy, c'Bottom', C.NULL) - dx = 150 - dy = 400 - line(dx, dy - 30, dx, dy + 80.0) - C.fonsSetAlign(state.fons, C.FONS_ALIGN_LEFT | C.FONS_ALIGN_BASELINE) - C.fonsDrawText(state.fons, dx, dy, c'Left', C.NULL) - dy += 30 - C.fonsSetAlign(state.fons, C.FONS_ALIGN_CENTER | C.FONS_ALIGN_BASELINE) - C.fonsDrawText(state.fons, dx, dy, c'Center', C.NULL) - dy += 30 - C.fonsSetAlign(state.fons, C.FONS_ALIGN_RIGHT | C.FONS_ALIGN_BASELINE) - C.fonsDrawText(state.fons, dx, dy, c'Right', C.NULL) - C.sfons_flush(state.fons) -} - -fn line(sx f32, sy f32, ex f32, ey f32) { - sgl.begin_lines() - sgl.c4b(255, 255, 0, 128) - sgl.v2f(sx, sy) - sgl.v2f(ex, ey) - sgl.end() -} diff --git a/examples/tetris/RobotoMono-Regular.ttf b/examples/tetris/RobotoMono-Regular.ttf deleted file mode 100644 index b158a334eb..0000000000 Binary files a/examples/tetris/RobotoMono-Regular.ttf and /dev/null differ diff --git a/examples/tetris/tetris.v b/examples/tetris/tetris.v index 3e05f7549e..5bc162e92b 100644 --- a/examples/tetris/tetris.v +++ b/examples/tetris/tetris.v @@ -147,6 +147,7 @@ fn main() { width: WinWidth height: WinHeight use_ortho: true + font_path: '../assets/fonts/RobotoMono-Regular.ttf' font_size: 18 scale: 2 window_user_ptr: 0