Fixed an issue where font metrics were incorrect for monospaced fonts.

com.dynamo.cr/com.dynamo.cr.bob/src/com/dynamo/bob/font/Fontc.java

@@ -725,7 +725,8 @@ else if (channelCount==3)
  throw new FontFormatException("Could not generate font preview: " + e.getMessage());
  }
  }
-
+ boolean is_monospaced = true;
+ float base_advance = include_glyph_count > 0 ? glyphs.get(0).advance : 0;
  for (int i = 0; i < include_glyph_count; i++) {
  Glyph glyph = glyphs.get(i);
  GlyphBank.Glyph.Builder glyphBuilder = GlyphBank.Glyph.newBuilder()
@@ -745,8 +746,12 @@ else if (channelCount==3)
  }
 
  glyphBankBuilder.addGlyphs(glyphBuilder);
+ if (base_advance != glyph.advance)
+ {
+ is_monospaced = false;
+ }
  }
-
+ glyphBankBuilder.setIsMonospaced(is_monospaced);
  return previewImage;
 
  }

editor/src/clj/editor/font.clj

@@ -162,16 +162,18 @@
  :defold)
  :distance-field))
 
-(defn- measure-line [glyphs text-tracking ^String line]
+(defn- measure-line [is-monospaced glyphs text-tracking ^String line]
  (let [w (transduce (comp
  (map #(:advance (glyphs (int %)) 0.0))
  (interpose text-tracking))
  +
  0.0
  line)
  len (.length line)]
- (if-let [last (get glyphs (and (pos? len) (int (.charAt line (dec len)))))]
- (- (+ w (:left-bearing last) (:width last)) (:advance last))
+ (if (not is-monospaced)
+ (if-let [last (get glyphs (and (pos? len) (int (.charAt line (dec len)))))]
+ (- (+ w (:left-bearing last) (:width last)) (:advance last))
+ w)
  w)))
 
 (defn- split-text [glyphs ^String text line-break? max-width text-tracking]
@@ -274,7 +276,7 @@
  line-height (+ (:max-descent font-map) (:max-ascent font-map))
  text-tracking (* line-height text-tracking)
  lines (split-text glyphs text line-break? max-width text-tracking)
- line-widths (map (partial measure-line glyphs text-tracking) lines)
+ line-widths (map (partial measure-line (:is-monospaced font-map) glyphs text-tracking) lines)
  max-width (reduce max 0 line-widths)]
  [max-width (* line-height (+ 1 (* text-leading (dec (count lines)))))]))))
 
@@ -301,7 +303,7 @@
  line-height (+ (:max-descent font-map) (:max-ascent font-map))
  text-tracking (* line-height text-tracking)
  lines (split-text glyphs text line-break? max-width text-tracking)
- line-widths (mapv (partial measure-line glyphs text-tracking) lines)
+ line-widths (mapv (partial measure-line (:is-monospaced font-map) glyphs text-tracking) lines)
  max-width (reduce max 0 line-widths)]
  (assoc text-layout
  :width max-width

editor/src/clj/editor/pipeline/fontc.clj

@@ -148,6 +148,12 @@
 (defn- make-glyph-data-bank ^bytes [glyph-extents]
  (byte-array (transduce (map :glyph-data-size) + 0 glyph-extents)))
 
+(defn check-monospaced [semi-glyphs]
+ (let [base-advance (if-let [first-glyph (first semi-glyphs)]
+ (:advance first-glyph)
+ 0)]
+ (every? #(= base-advance (:advance %)) semi-glyphs)))
+
 (def ^:private positive-glyph-extent-pairs-xf (comp (map pair) (filter (comp positive-wh? :glyph-wh second))))
 
 (defn- compile-fnt-bitmap [font-desc font-resource resolver]
@@ -173,7 +179,8 @@
  line-height (+ cache-cell-max-ascent cache-cell-max-descent)
  cache-cell-wh (max-glyph-cell-wh glyph-extents line-height padding glyph-cell-padding)
  cache-wh (cache-wh font-desc cache-cell-wh (count semi-glyphs))
- glyph-data-bank (make-glyph-data-bank glyph-extents)]
+ glyph-data-bank (make-glyph-data-bank glyph-extents)
+ is-monospaced (check-monospaced semi-glyphs)]
 
  (doall
  (pmap (fn [[semi-glyph glyph-extents]]
@@ -225,7 +232,8 @@
  :cache-cell-height (:height cache-cell-wh)
  :cache-cell-max-ascent max-ascent
  :glyph-channels channel-count
- :glyph-data (ByteString/copyFrom glyph-data-bank)})))
+ :glyph-data (ByteString/copyFrom glyph-data-bank)
+ :is-monospaced is-monospaced})))
 
 (defn- do-blend-rasters [^Raster src ^Raster dst-in ^WritableRaster dst-out]
  (let [width (min (.getWidth src) (.getWidth dst-in) (.getWidth dst-out))
@@ -438,7 +446,8 @@
  (update :width #(* (int (Math/ceil (/ ^double % 4.0))) 4)))
  cache-wh (cache-wh font-desc cache-cell-wh (count semi-glyphs))
  glyph-data-bank (make-glyph-data-bank glyph-extents)
- layer-mask (font-desc->layer-mask font-desc)]
+ layer-mask (font-desc->layer-mask font-desc)
+ is-monospaced (check-monospaced semi-glyphs)]
  (doall
  (pmap (fn [[semi-glyph glyph-extents]]
  (let [^BufferedImage glyph-image (let [face-color (Color. ^double (:alpha font-desc) 0.0 0.0)
@@ -494,7 +503,8 @@
  :glyph-data (ByteString/copyFrom glyph-data-bank)
  :alpha (:alpha font-desc)
  :outline-alpha (:outline-alpha font-desc)
- :shadow-alpha (:shadow-alpha font-desc)}))
+ :shadow-alpha (:shadow-alpha font-desc)
+ :is-monospaced is-monospaced}))
 
 (defn- calculate-ttf-distance-field-edge-limit [^double width ^double spread ^double edge]
  (let [sdf-limit-value (- (/ width spread))]
@@ -640,7 +650,8 @@
  cache-cell-wh (max-glyph-cell-wh glyph-extents line-height padding glyph-cell-padding)
  cache-wh (cache-wh font-desc cache-cell-wh (count semi-glyphs))
  glyph-data-bank (make-glyph-data-bank glyph-extents)
- layer-mask (font-desc->layer-mask font-desc)]
+ layer-mask (font-desc->layer-mask font-desc)
+ is-monospaced (check-monospaced semi-glyphs)]
  (doall
  (pmap (fn [[semi-glyph glyph-extents]]
  (let [{:keys [^bytes field]} (draw-ttf-distance-field semi-glyph padding channel-count outline-width sdf-outline sdf-spread sdf-shadow-spread edge shadow-blur shadow-alpha)
@@ -685,7 +696,8 @@
  :glyph-data (ByteString/copyFrom glyph-data-bank)
  :alpha (:alpha font-desc)
  :outline-alpha (:outline-alpha font-desc)
- :shadow-alpha (:shadow-alpha font-desc)}))
+ :shadow-alpha (:shadow-alpha font-desc)
+ :is-monospaced is-monospaced}))
 
 (defn compile-font [font-desc font-resource resolver]
  (let [font-ext (resource/type-ext font-resource)]

engine/engine/src/test/def-3575/def-3575.script

@@ -24,9 +24,9 @@ function init(self)
 end
 
 function update(self, dt)
- -- Values are taken from the output from label.get_text_metrics from defold version 1.2.138
+ -- Values are taken from the output from resource.get_text_metrics from defold version 1.2.138
  -- The base settings used are:
- -- font: "/builtins/fonts/vera_mo_bd.ttf"
+ -- font: "/builtins/fonts/vera_mo_bd.ttf" - monospaced
  -- size: 14
  -- antialias: 1
  -- alpha: 1.0
@@ -35,9 +35,11 @@ function update(self, dt)
  -- shadow_alpha: 1.0
  -- shadow_blur: 2
 
- local function test_label_metrics(label_name,test_metrics)
+ local function test_label_metrics(label_name, test_metrics)
  -- Test that we are getting the expected value back from get_text_metrics
- local metrics = label.get_text_metrics("#" .. label_name)
+ local comp = "#" .. label_name
+ local font = go.get(comp, "font")
+ local metrics = resource.get_text_metrics(font, label.get_text(comp))
 
  local result = test_metrics.max_ascent == metrics.max_ascent and
  test_metrics.max_descent == metrics.max_descent and
@@ -54,7 +56,7 @@ function update(self, dt)
  local function test_label_bitmap()
  local metrics_valid = {
  max_ascent = 13,
- width = 781,
+ width = 768,
  height = 17,
  max_descent = 4
  }
@@ -65,7 +67,7 @@ function update(self, dt)
  local function test_label_df()
  local metrics_valid ={
  max_ascent = 13,
- width = 783,
+ width = 768,
  height = 17,
  max_descent = 4,
  }

engine/gamesys/src/gamesys/resources/res_font_map.cpp

@@ -109,6 +109,7 @@ namespace dmGameSystem
  params.m_ImageFormat = glyph_bank->m_ImageFormat;
  params.m_GlyphChannels = glyph_bank->m_GlyphChannels;
  params.m_GlyphData = glyph_bank->m_GlyphData.m_Data;
+ params.m_IsMonospaced = glyph_bank->m_IsMonospaced;
 
  if (font_map == 0)
  {

engine/render/proto/render/font_ddf.proto

@@ -76,6 +76,8 @@ message GlyphBank
  optional uint32 cache_cell_width = 14;
  optional uint32 cache_cell_height = 15;
  optional uint32 cache_cell_max_ascent = 16;
+
+ optional bool is_monospaced = 17 [default = false];
 }
 
 message FontMap

engine/render/src/render/font_renderer.cpp

@@ -83,6 +83,7 @@ namespace dmRender
  , m_CacheCellPadding(0)
  , m_LayerMask(FACE)
  , m_ImageFormat(dmRenderDDF::TYPE_BITMAP)
+ , m_IsMonospaced(false)
  {
 
  }
@@ -111,6 +112,7 @@ namespace dmRender
  , m_CacheCellMaxAscent(0)
  , m_CacheCellPadding(0)
  , m_LayerMask(FACE)
+ , m_IsMonospaced(false)
  {
 
  }
@@ -162,6 +164,8 @@ namespace dmRender
  uint32_t m_CacheCellMaxAscent;
  uint8_t m_CacheCellPadding;
  uint8_t m_LayerMask;
+ uint8_t m_IsMonospaced:1;
+ uint8_t :7;
  };
 
  static float GetLineTextMetrics(HFontMap font_map, float tracking, const char* text, int n, bool measure_trailing_space);
@@ -235,6 +239,7 @@ namespace dmRender
  uint32_t cell_count = font_map->m_CacheColumns * font_map->m_CacheRows;
 
  font_map->m_CellTempData = (uint8_t*)malloc(font_map->m_CacheCellWidth*font_map->m_CacheCellHeight*4);
+ font_map->m_IsMonospaced = params.m_IsMonospaced;
 
  switch (params.m_GlyphChannels)
  {
@@ -325,6 +330,7 @@ namespace dmRender
  font_map->m_OutlineAlpha = params.m_OutlineAlpha;
  font_map->m_ShadowAlpha = params.m_ShadowAlpha;
  font_map->m_LayerMask = params.m_LayerMask;
+ font_map->m_IsMonospaced = params.m_IsMonospaced;
 
  font_map->m_CacheWidth = params.m_CacheWidth;
  font_map->m_CacheHeight = params.m_CacheHeight;
@@ -1206,10 +1212,14 @@ namespace dmRender
  }
  if (n > 0 && 0 != last)
  {
- uint32_t last_width = (measure_trailing_space && last->m_Character == ' ') ? (int16_t)last->m_Advance : last->m_Width;
- float last_end_point = last->m_LeftBearing + last_width;
- float last_right_bearing = last->m_Advance - last_end_point;
- width = width - last_right_bearing - tracking;
+ if (!font_map->m_IsMonospaced) 
+ {
+ uint32_t last_width = (measure_trailing_space && last->m_Character == ' ') ? (int16_t)last->m_Advance : last->m_Width;
+ float last_end_point = last->m_LeftBearing + last_width;
+ float last_right_bearing = last->m_Advance - last_end_point;
+ width = width - last_right_bearing;
+ }
+ width -= tracking;
  }
 
  return width;

engine/render/src/render/font_renderer.h

@@ -111,6 +111,8 @@ namespace dmRender
  uint32_t m_CacheCellMaxAscent;
  uint8_t m_CacheCellPadding;
  uint8_t m_LayerMask;
+ uint8_t m_IsMonospaced:1;
+ uint8_t :7;
 
  dmRenderDDF::FontTextureFormat m_ImageFormat;
  };