[lib] Replaced char extents with caret edges

Author: mta452

tehreer-android/src/main/java/com/mta/tehreer/internal/layout/CaretEdgeList.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018 Muhammad Tayyab Akram
+ * Copyright (C) 2018-2019 Muhammad Tayyab Akram
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,30 +22,25 @@
 import com.mta.tehreer.internal.Exceptions;
 
 public final class CaretEdgeList extends FloatList {
-    private final @NonNull float[] extentArray;
+    private final @NonNull FloatList allEdges;
     private final int offset;
     private final int edgeCount;
     private final float pivotDistance;
 
-    public CaretEdgeList(@NonNull float[] charExtents, boolean backward) {
-        this(charExtents, 0, charExtents.length, 0, 0, backward, false);
+    public CaretEdgeList(@NonNull FloatList allEdges) {
+        this(allEdges, 0, allEdges.size(), 0, 0, false);
     }
 
-    public CaretEdgeList(@NonNull float[] charExtents, int chunkOffset, int chunkLength,
-                         int startExtra, int endExtra, boolean backward, boolean visuallyRTL) {
-        this.extentArray = charExtents;
-        this.offset = chunkOffset + (backward ? 0 : -1);
+    public CaretEdgeList(@NonNull FloatList allEdges, int chunkOffset, int chunkLength,
+                         int startExtra, int endExtra, boolean visuallyRTL) {
+        this.allEdges = allEdges;
+        this.offset = chunkOffset;
         this.edgeCount = chunkLength + 1;
         this.pivotDistance = edgeAt(visuallyRTL ? chunkLength - endExtra : startExtra);
     }
 
     private float edgeAt(int index) {
-        int relativeIndex = index + offset;
-        if (relativeIndex == -1 || relativeIndex == extentArray.length) {
-            return 0.0f;
-        }
-
-        return extentArray[relativeIndex];
+        return allEdges.get(index + offset);
     }
 
     public float distance(int fromIndex, int toIndex, boolean visuallyRTL) {

tehreer-android/src/main/java/com/mta/tehreer/internal/layout/IntrinsicRun.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016-2018 Muhammad Tayyab Akram
+ * Copyright (C) 2016-2019 Muhammad Tayyab Akram
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,6 +19,7 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Size;
 
+import com.mta.tehreer.collections.FloatList;
 import com.mta.tehreer.graphics.Typeface;
 import com.mta.tehreer.internal.util.Clusters;
 import com.mta.tehreer.sfnt.WritingDirection;
@@ -38,15 +39,16 @@ public class IntrinsicRun {
     public final @NonNull float[] glyphOffsets;
     public final @NonNull float[] glyphAdvances;
     public final @NonNull int[] clusterMap;
-    public final @NonNull float[] charExtents;
+    public final @NonNull FloatList caretEdges;
 
     public IntrinsicRun(int charStart, int charEnd, boolean isBackward, byte bidiLevel,
                         @NonNull WritingDirection writingDirection,
                         @NonNull Typeface typeface, float typeSize,
                         float ascent, float descent, float leading,
                         @NonNull int[] glyphIds,
                         @NonNull float[] offsets, @NonNull float[] advances,
-                        @NonNull int[] clusterMap) {
+                        @NonNull int[] clusterMap,
+                        @NonNull FloatList caretEdges) {
         this.charStart = charStart;
         this.charEnd = charEnd;
         this.isBackward = isBackward;
@@ -61,8 +63,7 @@ public IntrinsicRun(int charStart, int charEnd, boolean isBackward, byte bidiLev
         this.glyphOffsets = offsets;
         this.glyphAdvances = advances;
         this.clusterMap = clusterMap;
-        this.charExtents = new float[clusterMap.length];
-        Clusters.loadCharExtents(clusterMap, isBackward, isVisuallyRTL(), glyphIds, advances, charExtents);
+        this.caretEdges = caretEdges;
     }
 
     public boolean isVisuallyRTL() {
@@ -87,7 +88,7 @@ public int clusterEnd(int charIndex) {
     }
 
     public float measureChars(int fromIndex, int toIndex) {
-        CaretEdgeList caretEdges = new CaretEdgeList(charExtents, isBackward);
-        return caretEdges.distance(fromIndex - charStart, toIndex - charStart, isVisuallyRTL());
+        CaretEdgeList edgeList = new CaretEdgeList(caretEdges);
+        return edgeList.distance(fromIndex - charStart, toIndex - charStart, isVisuallyRTL());
     }
 }

tehreer-android/src/main/java/com/mta/tehreer/internal/layout/ShapeResolver.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018 Muhammad Tayyab Akram
+ * Copyright (C) 2018-2019 Muhammad Tayyab Akram
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,6 +22,7 @@
 
 import androidx.annotation.NonNull;
 
+import com.mta.tehreer.collections.FloatList;
 import com.mta.tehreer.graphics.Typeface;
 import com.mta.tehreer.sfnt.ShapingEngine;
 import com.mta.tehreer.sfnt.ShapingOrder;
@@ -135,6 +136,7 @@ private static void resolveTypefaces(@NonNull String text, @NonNull Spanned span
                     float[] offsets = shapingResult.getGlyphOffsets().toArray();
                     float[] advances = shapingResult.getGlyphAdvances().toArray();
                     int[] clusterMap = shapingResult.getClusterMap().toArray();
+                    FloatList caretEdges = shapingResult.getCaretEdges(null);
 
                     float scaleX = locator.getScaleX();
                     if (Float.compare(scaleX, 1.0f) != 0) {
@@ -154,7 +156,8 @@ private static void resolveTypefaces(@NonNull String text, @NonNull Spanned span
                     intrinsicRun = new IntrinsicRun(runStart, runEnd, isBackward, bidiLevel,
                                                     writingDirection, typeface, typeSize,
                                                     ascent, descent, leading,
-                                                    glyphIds, offsets, advances, clusterMap);
+                                                    glyphIds, offsets, advances,
+                                                    clusterMap, caretEdges);
                 } finally {
                     if (shapingResult != null) {
                         shapingResult.dispose();
@@ -177,11 +180,13 @@ private static void resolveTypefaces(@NonNull String text, @NonNull Spanned span
                 float[] offsets = new float[] { 0.0f, 0.0f };
                 float[] advances = new float[] { replacementSize };
                 int[] clusterMap = new int[runEnd - runStart];
+                FloatList caretEdges = FloatList.of(new float[runEnd - runStart + 1]);
 
                 intrinsicRun = new IntrinsicRun(runStart, runEnd, false, bidiLevel,
                                                 writingDirection, typeface, typeSize,
                                                 -metrics.ascent, metrics.descent, metrics.leading,
-                                                glyphIds, offsets, advances, clusterMap);
+                                                glyphIds, offsets, advances,
+                                                clusterMap, caretEdges);
             }
 
             runs.add(intrinsicRun);

tehreer-android/src/main/java/com/mta/tehreer/layout/LineResolver.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018 Muhammad Tayyab Akram
+ * Copyright (C) 2018-2019 Muhammad Tayyab Akram
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -76,8 +76,8 @@ static GlyphRun createGlyphRun(@NonNull IntrinsicRun intrinsicRun, int spanStart
                             new JFloatArrayPointList(intrinsicRun.glyphOffsets, glyphOffset, glyphCount),
                             new JFloatArrayList(intrinsicRun.glyphAdvances, glyphOffset, glyphCount),
                             new ClusterMap(intrinsicRun.clusterMap, chunkOffset, chunkLength, glyphOffset),
-                            new CaretEdgeList(intrinsicRun.charExtents, chunkOffset, chunkLength,
-                                              startExtra, endExtra, intrinsicRun.isBackward, intrinsicRun.isVisuallyRTL()));
+                            new CaretEdgeList(intrinsicRun.caretEdges, chunkOffset, chunkLength,
+                                              startExtra, endExtra, intrinsicRun.isVisuallyRTL()));
     }
 
     static @NonNull ComposedLine createComposedLine(@NonNull CharSequence text, int charStart, int charEnd,