diff --git a/Cargo.lock b/Cargo.lock index fd99a8a..5b9584f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2,6 +2,16 @@ # It is not intended for manual editing. version = 3 +[[package]] +name = "ab_glyph" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20b228f2c198f98d4337ceb560333fb12cbb2f4948a953bf8c57d09deb219603" +dependencies = [ + "ab_glyph_rasterizer", + "owned_ttf_parser 0.13.2", +] + [[package]] name = "ab_glyph_rasterizer" version = "0.1.5" @@ -11,12 +21,13 @@ checksum = "a13739d7177fbd22bb0ed28badfff9f372f8bef46c863db4e1c6248f6b223b6e" [[package]] name = "able_graphics_library" version = "0.1.0" -source = "git+https://git.ablecorp.us/Able/able_graphics_library.git#04b16fbc221eb339e02a07d184914bf2f07865ca" +source = "git+https://git.ablecorp.us/Able/able_graphics_library.git#e8bfdb3f6d52974c471de8f38471945b3af71628" [[package]] name = "agl_simple_impl" version = "0.1.0" dependencies = [ + "ab_glyph", "able_graphics_library", "mini_gl_fb", ] @@ -873,7 +884,16 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9f923fb806c46266c02ab4a5b239735c144bdeda724a50ed058e5226f594cde3" dependencies = [ - "ttf-parser", + "ttf-parser 0.6.2", +] + +[[package]] +name = "owned_ttf_parser" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "65ee3f72636e6f164cc41c9f9057f4e58c4e13507699ea7f5e5242b64b8198ee" +dependencies = [ + "ttf-parser 0.13.4", ] [[package]] @@ -994,7 +1014,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc7c727aded0be18c5b80c1640eae0ac8e396abf6fa8477d96cb37d18ee5ec59" dependencies = [ "ab_glyph_rasterizer", - "owned_ttf_parser", + "owned_ttf_parser 0.6.0", ] [[package]] @@ -1123,6 +1143,12 @@ version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3e5d7cd7ab3e47dda6e56542f4bbf3824c15234958c6e1bd6aaa347e93499fdc" +[[package]] +name = "ttf-parser" +version = "0.13.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76dacc724328b3d5e2ed67f9e30cdb56893a34ab239032502cc8f19f8dae4bbc" + [[package]] name = "unicode-xid" version = "0.2.2" diff --git a/Cargo.toml b/Cargo.toml index d37146a..eac2079 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,4 +7,5 @@ edition = "2018" [dependencies] mini_gl_fb = "0.9.0" -able_graphics_library = {git = "https://git.ablecorp.us:443/Able/able_graphics_library.git"} +able_graphics_library = {git = "https://git.ablecorp.us:443/Able/able_graphics_library.git"} +ab_glyph = "0.2.12" \ No newline at end of file diff --git a/font/LICENSE.txt b/font/LICENSE.txt new file mode 100644 index 0000000..75b5248 --- /dev/null +++ b/font/LICENSE.txt @@ -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/font/Roboto-Black.ttf b/font/Roboto-Black.ttf new file mode 100644 index 0000000..43a00e0 Binary files /dev/null and b/font/Roboto-Black.ttf differ diff --git a/font/Roboto-BlackItalic.ttf b/font/Roboto-BlackItalic.ttf new file mode 100644 index 0000000..5082cdc Binary files /dev/null and b/font/Roboto-BlackItalic.ttf differ diff --git a/font/Roboto-Bold.ttf b/font/Roboto-Bold.ttf new file mode 100644 index 0000000..3742457 Binary files /dev/null and b/font/Roboto-Bold.ttf differ diff --git a/font/Roboto-BoldItalic.ttf b/font/Roboto-BoldItalic.ttf new file mode 100644 index 0000000..e85e7fb Binary files /dev/null and b/font/Roboto-BoldItalic.ttf differ diff --git a/font/Roboto-Italic.ttf b/font/Roboto-Italic.ttf new file mode 100644 index 0000000..c9df607 Binary files /dev/null and b/font/Roboto-Italic.ttf differ diff --git a/font/Roboto-Light.ttf b/font/Roboto-Light.ttf new file mode 100644 index 0000000..0e97751 Binary files /dev/null and b/font/Roboto-Light.ttf differ diff --git a/font/Roboto-LightItalic.ttf b/font/Roboto-LightItalic.ttf new file mode 100644 index 0000000..3ad14fa Binary files /dev/null and b/font/Roboto-LightItalic.ttf differ diff --git a/font/Roboto-Medium.ttf b/font/Roboto-Medium.ttf new file mode 100644 index 0000000..e89b0b7 Binary files /dev/null and b/font/Roboto-Medium.ttf differ diff --git a/font/Roboto-MediumItalic.ttf b/font/Roboto-MediumItalic.ttf new file mode 100644 index 0000000..a5a41d3 Binary files /dev/null and b/font/Roboto-MediumItalic.ttf differ diff --git a/font/Roboto-Regular.ttf b/font/Roboto-Regular.ttf new file mode 100644 index 0000000..3d6861b Binary files /dev/null and b/font/Roboto-Regular.ttf differ diff --git a/font/Roboto-Thin.ttf b/font/Roboto-Thin.ttf new file mode 100644 index 0000000..7d084ae Binary files /dev/null and b/font/Roboto-Thin.ttf differ diff --git a/font/Roboto-ThinItalic.ttf b/font/Roboto-ThinItalic.ttf new file mode 100644 index 0000000..c173389 Binary files /dev/null and b/font/Roboto-ThinItalic.ttf differ diff --git a/src/graphics_api_impl.rs b/src/graphics_api_impl.rs index c11da3c..e951554 100644 --- a/src/graphics_api_impl.rs +++ b/src/graphics_api_impl.rs @@ -1,5 +1,6 @@ #![allow(dead_code, unused)] +use ab_glyph::FontRef; use able_graphics_library::{AglApi, FrameBuffer, Point, HEIGHT, RGBA, WIDTH}; use mini_gl_fb::glutin::platform::unix::x11::ffi::XK_R10; @@ -53,6 +54,7 @@ impl AglApi for GraphicsRenderer { self.buff[coordinates as usize] = color; } + fn put_triangle( &mut self, coords_1: Point, @@ -63,6 +65,7 @@ impl AglApi for GraphicsRenderer { ) { todo!(); } + fn paint_cursor(&mut self, coords: Point) { todo!(); } @@ -72,6 +75,31 @@ impl AglApi for GraphicsRenderer { fn show_cursor() { todo!(); } + fn draw_text(&mut self, coords: Point, scale: u8, color: RGBA, text: String) { + use ab_glyph::{point, Font, FontRef, Glyph}; + + let font: FontRef = + FontRef::try_from_slice(include_bytes!("../font/Roboto-Regular.ttf")).unwrap(); + + // Get a glyph for 'q' with a scale & position. + let q_glyph: Glyph = font + .glyph_id('a') + .with_scale_and_position(scale as f32, point(coords.x as f32, coords.y as f32)); + // Draw it. + if let Some(q) = font.outline_glyph(q_glyph) { + q.draw(|x, y, c| { + /* draw pixel `(x, y)` with coverage: `c` */ + println!("h"); + self.put_pixel( + Point { + x: x as u16, + y: y as u16, + }, + color, + ); + }); + } + } /// Actually move the double buffer to the single buffer and "update" the screen fn draw(&mut self) {} fn clear(&mut self, color: RGBA) { diff --git a/src/main.rs b/src/main.rs index a3fb635..0bda1e5 100644 --- a/src/main.rs +++ b/src/main.rs @@ -59,6 +59,7 @@ fn main() { }, ); } + xyz.put_line( Point { x: 3, y: 30 }, Point { x: 324, y: 50 }, @@ -71,9 +72,8 @@ fn main() { }, ); - xyz.put_line( - Point { x: 1, y: 300 }, - Point { x: 1, y: 200 }, + xyz.draw_text( + Point { x: 1000, y: 90 }, 1, RGBA { r: 0, @@ -81,8 +81,8 @@ fn main() { b: 0, a: 0, }, + "Hello".to_string(), ); - // update pixels for x in 0..600 * 400 { buffer[x] = [xyz.buff[x].r, xyz.buff[x].g, xyz.buff[x].b, xyz.buff[x].a]