font handle stuff

assets/fonts/roboto/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.

kubi-ui-examples/examples/text.rs

@@ -26,6 +26,9 @@ fn main() {
   let (window, display) = SimpleWindowBuilder::new().build(&event_loop);
 
   let mut kui = KubiUi::new();
+
+  let handle = kui.add_font_from_bytes(include_bytes!("../../assets/fonts/roboto/Roboto-Regular.ttf"));
+
   let mut backend = GliumUiRenderer::new(&display);
 
   let instant = Instant::now();
@@ -37,7 +40,7 @@ fn main() {
       },
       Event::AboutToWait => {
         let mut frame = display.draw();
-        frame.clear_color_srgb(0.5, 0.5, 0.5, 0.);
+        frame.clear_color_srgb(0., 0., 0., 1.);
 
         let resolution = UVec2::from(display.get_framebuffer_dimensions()).as_vec2();
 
@@ -51,6 +54,7 @@ fn main() {
           elements: vec![
             Box::new(Text {
               text: "Hello_world".into(),
+              font: handle,
               ..Default::default()
             }),
           ],

kubi-ui/src/draw.rs

@@ -23,6 +23,8 @@ pub enum UiDrawCommand {
     color: Vec4,
     ///Text to draw
     text: Cow<'static, str>,
+    ///Font handle to use
+    font: FontHandle,
   },
 }
 
@@ -146,12 +148,12 @@ impl UiDrawPlan {
             },
           ]);
         },
-        UiDrawCommand::Text { position, size, color, text } => {
+        UiDrawCommand::Text { position, size, color, text, font } => {
           let mut rpos_x = 0.;
           for char in text.chars() {
             let vidx = swapper.current().vertices.len() as u32;
-            let glyph = tr.glyph(FontHandle(0), char, *size);
+            let glyph = tr.glyph(*font, char, *size);
-            rpos_x += 32.;//glyph.metrics.advance_width;
+            rpos_x += glyph.metrics.advance_width;//glyph.metrics.advance_width;
             swapper.current_mut().indices.extend([vidx, vidx + 1, vidx + 2, vidx, vidx + 2, vidx + 3]);
             let p0x = glyph.position.x as f32 / 1024.;
             let p1x = (glyph.position.x + glyph.size.x as i32) as f32 / 1024.;
@@ -164,17 +166,17 @@ impl UiDrawPlan {
                 uv: vec2(p0x, p0y),
               },
               UiVertex {
-                position: *position + vec2(rpos_x + 32., 0.0),
+                position: *position + vec2(rpos_x + glyph.metrics.width as f32, 0.0),
                 color: *color,
                 uv: vec2(p1x, p0y),
               },
               UiVertex {
-                position: *position + vec2(rpos_x + 32., 32.),
+                position: *position + vec2(rpos_x + glyph.metrics.width as f32, glyph.metrics.height as f32),
                 color: *color,
                 uv: vec2(p1x, p1y),
               },
               UiVertex {
-                position: *position + vec2(rpos_x + 0.0, 32.),
+                position: *position + vec2(rpos_x, glyph.metrics.height as f32),
                 color: *color,
                 uv: vec2(p0x, p1y),
               },

kubi-ui/src/element/builtin/text.rs

@@ -6,13 +6,14 @@ use crate::{
   element::UiElement,
   state::StateRepo,
   measure::Response,
-  draw::UiDrawCommand
+  draw::UiDrawCommand, text::FontHandle
 };
 
 pub struct Text {
   pub text: Cow<'static, str>,
   pub size: (UiSize, UiSize),
   pub color: Vec4,
+  pub font: FontHandle
 }
 
 impl Default for Text {
@@ -21,6 +22,7 @@ impl Default for Text {
       text: "".into(),
       size: (UiSize::Percentage(1.), UiSize::Pixels(32.)),
       color: Vec4::new(1., 1., 1., 1.),
+      font: FontHandle(0)
     }
   }
 }
@@ -51,6 +53,7 @@ impl UiElement for Text {
       position: layout.position,
       size: 32,
       color: self.color,
+      font: self.font
     });
   }
 }

kubi-ui/src/lib.rs

@@ -1,4 +1,3 @@
-use std::collections::VecDeque;
 use glam::Vec2;
 
 pub mod element;
@@ -11,9 +10,8 @@ pub mod interaction;
 
 use element::UiElement;
 use state::StateRepo;
-use event::UiEvent;
 use draw::{UiDrawCommands, UiDrawPlan};
-use text::{TextRenderer, FontTextureInfo};
+use text::{TextRenderer, FontTextureInfo, FontHandle};
 
 // pub struct ElementContext<'a> {
 //   pub state: &'a mut StateRepo,
@@ -51,6 +49,10 @@ impl KubiUi {
     }
   }
 
+  pub fn add_font_from_bytes(&mut self, font: &[u8]) -> FontHandle {
+    self.text_renderer.add_font_from_bytes(font)
+  }
+
   pub fn add<T: UiElement>(&mut self, element: T, max_size: Vec2) {
     let layout = LayoutInfo {
       position: Vec2::ZERO,

kubi-ui/src/text.rs

@@ -5,6 +5,7 @@ mod ftm;
 
 use font::FontManager;
 pub use font::FontHandle;
+use fontdue::{Font, FontSettings};
 use ftm::FontTextureManager;
 pub use ftm::{FontTextureInfo, GlyphCacheEntry};
 
@@ -21,6 +22,10 @@ impl TextRenderer {
     }
   }
 
+  pub fn add_font_from_bytes(&mut self, font: &[u8]) -> FontHandle {
+    self.fm.add_font(Font::from_bytes(font, FontSettings::default()).unwrap())
+  }
+
   pub fn reset_frame(&mut self) {
     self.ftm.reset_modified();
   }

kubi-ui/src/text/font.rs

@@ -3,7 +3,7 @@ use fontdue::Font;
 #[cfg(feature = "builtin_font")]
 const BIN_FONT: &[u8] = include_bytes!("../../assets/font/ProggyTiny.ttf");
 
-#[derive(Clone, Copy, PartialEq, Eq, Hash)]
+#[derive(Clone, Copy, PartialEq, Eq, Hash, Debug)]
 pub struct FontHandle(pub(crate) usize);
 
 #[cfg(feature = "builtin_font")]

kubi-ui/src/text/ftm.rs

@@ -90,7 +90,7 @@ impl FontTextureManager {
     }
     let font = font_manager.get(font_handle).unwrap();
     let (metrics, bitmap) = font.rasterize(character, size as f32);
-    log::debug!("rasterized glyph: {:?}, {:?}", metrics, bitmap);
+    log::debug!("rasterized glyph: {}, {:?}, {:?}", character, metrics, bitmap);
     let texture_position = self.packer.pack(metrics.width as i32, metrics.height as i32, false).unwrap();
     let texture_size = uvec2(metrics.width as u32, metrics.height as u32);
     let entry = Arc::new(GlyphCacheEntry {
@@ -114,8 +114,7 @@ impl FontTextureManager {
       for x in 0..size.x {
         let src = (size.x * y + x) as usize;
         let dst = (tex_size.x * (y + position.y as u32) + (x + position.x as u32)) as usize * 4;
-        self.font_texture[dst..=(dst + 3)].copy_from_slice(&[255, 0, 0, data[src]]);
+        self.font_texture[dst..=(dst + 3)].copy_from_slice(&[255, 255, 255, data[src]]);
-        self.font_texture[dst] = data[src];
         //print!("{} ", if data[src] > 0 {'#'} else {'.'});
         //print!("{src} {dst} / ");
       }