コミット: fb923892c39f0bb13f0192998fb8bbd9275497ca - mel (hg)

コミットメタ情報

• リビジョン: fb923892c39f0bb13f0192998fb8bbd9275497ca (tree)
• 日時: 2019-10-05 21:11:43
• 作者: Martin Krošlák <kroslakma@gmai...>
• コミッター: Martin Krošlák

ログメッセージ

* enabled compilation of stbtt code path for fonts

変更サマリ

• modified: mel-asset/src/font.rs

差分

diff -r a3fa2de2fc2a -r fb923892c39f mel-asset/src/font.rs
--- a/mel-asset/src/font.rs	Thu Oct 03 22:06:58 2019 +0200
+++ b/mel-asset/src/font.rs	Sat Oct 05 14:11:43 2019 +0200
@@ -291,31 +291,33 @@
         // stb_truetype version
         // -----------------------------------------------------------------------------------------
         {
-            let _offset = stbtt::get_font_offset_for_index(&bytes, 0).unwrap();
-            // let font_stb = stbtt::FontInfo::new(bytes, offset as usize).unwrap();
-            // let v_metrics = font_stb.get_v_metrics();
-            // let font_scale_px = font_stb.scale_for_pixel_height(glyph_height_px);
-            // let _font_scale_inv_px = 1.0 / font_scale_px;
-            // let _font_scale_norm = font_stb.scale_for_pixel_height(1.0);
-            // new_font.ascent_tt = v_metrics.ascent;
-            // new_font.descent_tt = v_metrics.descent;
-            // new_font.line_gap_tt = v_metrics.line_gap;
-            // for &c in charset.iter() {
-            //     let glyph_idx = font_stb.find_glyph_index(c.into());
-            //     let h_metrics = font_stb.get_glyph_h_metrics(glyph_idx);
-            //     let is_empty = font_stb.is_glyph_empty(glyph_idx);
-            //     if is_empty && h_metrics.advance_width == 0 {
-            //         new_font.code_points.push(CodePoint {
-            //             value: c,
-            //             glyph_idx: 0,
-            //         });
-            //         continue;
-            //     }
-            //     new_font.code_points.push(CodePoint {
-            //         value: c,
-            //         glyph_idx: new_font.glyphs.len() as u32,
-            //     });
-            // }
+            let offset = stbtt::get_font_offset_for_index(&bytes, 0).unwrap();
+            if false {
+                let font_stb = stbtt::FontInfo::new(bytes, offset as usize).unwrap();
+                let v_metrics = font_stb.get_v_metrics();
+                let font_scale_px = font_stb.scale_for_pixel_height(glyph_height_px);
+                let _font_scale_inv_px = 1.0 / font_scale_px;
+                let _font_scale_norm = font_stb.scale_for_pixel_height(1.0);
+                new_font.ascent_tt = v_metrics.ascent as f32;
+                new_font.descent_tt = v_metrics.descent as f32;
+                new_font.line_gap_tt = v_metrics.line_gap as f32;
+                for &c in charset.iter() {
+                    let glyph_idx = font_stb.find_glyph_index(c.into());
+                    let h_metrics = font_stb.get_glyph_h_metrics(glyph_idx);
+                    let is_empty = font_stb.is_glyph_empty(glyph_idx);
+                    if is_empty && h_metrics.advance_width == 0 {
+                        new_font.code_points.push(CodePoint {
+                            value: c,
+                            glyph_idx: 0,
+                        });
+                        continue;
+                    }
+                    new_font.code_points.push(CodePoint {
+                        value: c,
+                        glyph_idx: new_font.glyphs.len() as u32,
+                    });
+                }
+            }
         }
 
         Ok((