Merge pull request #26 from ii887522/develop

Release 1.3.1

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "font-packer"
-version = "1.3.0"
+version = "1.3.1"
 edition = "2021"
 description = "A CLI tool used to generate glyph atlases for graphics applications such as GUI, video games and so on to improve performance of these applications."
 repository = "https://github.com/ii887522/font-packer"

src/opengl/gl_basic_stage.rs

@@ -110,7 +110,9 @@ impl GLBasicStage {
             });
             tex.init();
             let glyph = Glyph {
-              ch,
+              font_name: font.file_name[..font.file_name.find('.').unwrap()].to_owned(),
+              font_size: font.size,
+              name: ch.to_string(),
               atlas_id: tex.get_id(),
               atlas_size: tex.get_size(),
               line_spacing: ttf_font.recommended_line_spacing(),
@@ -122,7 +124,10 @@ impl GLBasicStage {
             };
             (
               if font.generate_blur.is_some() && font.generate_blur.unwrap() {
-                Some(glyph.clone())
+                Some(Glyph {
+                  name: ch.to_string() + "_blur",
+                  ..glyph.clone()
+                })
               } else {
                 None
               },

src/structs/atlas_region.rs

@@ -3,7 +3,9 @@ use serde::Serialize;
 
 #[derive(Clone, Debug, Serialize)]
 pub(crate) struct AtlasRegion {
-  pub ch: char,
+  pub font_name: String,
+  pub font_size: u16,
+  pub name: String,
   pub atlas_width: u32,
   pub atlas_height: u32,
   pub line_spacing: i32,
@@ -18,7 +20,9 @@ pub(crate) struct AtlasRegion {
 impl From<Glyph> for AtlasRegion {
   fn from(glyph: Glyph) -> Self {
     Self {
-      ch: glyph.ch,
+      font_name: glyph.font_name,
+      font_size: glyph.font_size,
+      name: glyph.name,
       atlas_width: glyph.atlas_size.get_x(),
       atlas_height: glyph.atlas_size.get_y(),
       line_spacing: glyph.line_spacing,

src/structs/glyph.rs

@@ -5,7 +5,9 @@ use std::cell::RefCell;
 
 #[derive(Clone, Debug)]
 pub(crate) struct Glyph {
-  pub ch: char,
+  pub font_name: String,
+  pub font_size: u16,
+  pub name: String,
   pub atlas_id: GLenum,
   pub atlas_size: UVec2,
   pub line_spacing: i32,