Properly close paths (#83)

Fixes #43
airbnb · Feb 9, 2017 · 3a4de71 · 3a4de71
1 parent df28554
commit 3a4de71
Show file tree

Hide file tree

Showing 10 changed files with 15 additions and 0 deletions.
diff --git a/LottieSample/screenshots/MotionCorpse-Jrcanest 0.png b/LottieSample/screenshots/MotionCorpse-Jrcanest 0.png
diff --git a/LottieSample/screenshots/MotionCorpse-Jrcanest 10.png b/LottieSample/screenshots/MotionCorpse-Jrcanest 10.png
diff --git a/LottieSample/screenshots/MotionCorpse-Jrcanest 100.png b/LottieSample/screenshots/MotionCorpse-Jrcanest 100.png
diff --git a/LottieSample/screenshots/MotionCorpse-Jrcanest 20.png b/LottieSample/screenshots/MotionCorpse-Jrcanest 20.png
diff --git a/LottieSample/screenshots/MotionCorpse-Jrcanest 5.png b/LottieSample/screenshots/MotionCorpse-Jrcanest 5.png
diff --git a/LottieSample/screenshots/MotionCorpse-Jrcanest 50.png b/LottieSample/screenshots/MotionCorpse-Jrcanest 50.png
diff --git a/LottieSample/screenshots/Tests_Hosts 20.png b/LottieSample/screenshots/Tests_Hosts 20.png
diff --git a/lottie/src/main/java/com/airbnb/lottie/AnimatableShapeValue.java b/lottie/src/main/java/com/airbnb/lottie/AnimatableShapeValue.java
@@ -106,6 +106,7 @@ class AnimatableShapeValue extends BaseAnimatableValue<ShapeData, Path> {
       }
 
       shape.addCurve(new CubicCurveData(shapeCp1, shapeCp2, vertex));
+      shape.setClosed(true);
     }
     return shape;
 

diff --git a/lottie/src/main/java/com/airbnb/lottie/MiscUtils.java b/lottie/src/main/java/com/airbnb/lottie/MiscUtils.java
@@ -19,6 +19,9 @@ static void getPathFromData(ShapeData shapeData, Path outPath) {
           curveData.getControlPoint2().x, curveData.getControlPoint2().y,
           curveData.getVertex().x, curveData.getVertex().y);
     }
+    if (shapeData.isClosed()) {
+      outPath.close();
+    }
   }
 
   static float lerp(float a, float b, @FloatRange(from = 0f, to = 1f) float percentage) {

diff --git a/lottie/src/main/java/com/airbnb/lottie/ShapeData.java b/lottie/src/main/java/com/airbnb/lottie/ShapeData.java
@@ -9,6 +9,7 @@
 class ShapeData {
   private final List<CubicCurveData> curves = new ArrayList<>();
   private PointF initialPoint;
+  private boolean closed;
 
   void setInitialPoint(PointF initialPoint) {
     this.initialPoint = initialPoint;
@@ -29,6 +30,14 @@ void addCurve(CubicCurveData curve) {
     curves.add(curve);
   }
 
+  public boolean isClosed() {
+    return closed;
+  }
+
+  public void setClosed(boolean closed) {
+    this.closed = closed;
+  }
+
   List<CubicCurveData> getCurves() {
     return curves;
   }
@@ -38,6 +47,8 @@ void interpolateBetween(ShapeData shapeData1, ShapeData shapeData2,
     if (initialPoint == null) {
       initialPoint = new PointF();
     }
+    setClosed(shapeData1.isClosed() || shapeData2.isClosed());
+
     if (!curves.isEmpty() && curves.size() != shapeData1.getCurves().size()
         && curves.size() != shapeData2.getCurves().size()) {
       throw new IllegalStateException("Curves must have the same number of control points. This: "
-Original file line number
+Diff line change
@@ Expand Up @@
           }
           shape.addCurve(new CubicCurveData(shapeCp1, shapeCp2, vertex));
+          shape.setClosed(true);
         }
         return shape;
@@ Expand Down @@