Step 7.22: Add line-circle intersection method

Author: DAB0mB

resources/cpp/src/geometry/line.cpp

@@ -4,6 +4,7 @@
 #include "../nullable.h"
 #include "../utils.h"
 #include "point.h"
+#include "circle.h"
 #include "line.h"
 
 namespace geometry {
@@ -100,6 +101,11 @@ namespace geometry {
     return Nullable<Point>();
   }
 
+  // circle - circle intersection method
+  Nullable<std::vector<Point>> Line::getIntersection(Circle circle) {
+    return circle.getIntersection(*this);
+  }
+
   emscripten::val EMLine::getMatchingX(double y) {
     Nullable<double> nullableX = Line::getMatchingX(y);
     return nullableX.hasValue() ?
@@ -126,6 +132,10 @@ namespace geometry {
     emPoint.set("y", emscripten::val(point.y));
     return emPoint;
   }
+
+  emscripten::val EMLine::getIntersection(EMCircle emCircle) {
+    return emCircle.getIntersection(*this);
+  }
 }
 
 EMSCRIPTEN_BINDINGS(geometry_line_module) {
@@ -146,5 +156,10 @@ EMSCRIPTEN_BINDINGS(geometry_line_module) {
       emscripten::select_overload<emscripten::val(geometry::EMLine)>(
         &geometry::EMLine::getIntersection
       )
+    )
+    .function("getCircleIntersection",
+      emscripten::select_overload<emscripten::val(geometry::EMCircle)>(
+        &geometry::EMLine::getIntersection
+      )
     );
 }

resources/cpp/src/geometry/line.h

@@ -4,6 +4,7 @@
 #include <emscripten/val.h>
 #include "../nullable.h"
 #include "point.h"
+#include "circle.h"
 
 namespace geometry {
   class Circle;
@@ -27,6 +28,8 @@ namespace geometry {
     bool boundsHavePoint(double x, double y);
 
     Nullable<Point> getIntersection(Line line);
+
+    Nullable<std::vector<Point>> getIntersection(Circle circle);
   };
 
   class EMLine : public Line {
@@ -38,5 +41,7 @@ namespace geometry {
     emscripten::val getMatchingY(double x);
 
     emscripten::val getIntersection(EMLine line);
+
+    emscripten::val getIntersection(EMCircle circle);
   };
 }

resources/scripts/engine/geometry/line.js

@@ -14,11 +14,6 @@ Engine.Geometry.Line = class Line extends Utils.proxy(CPP.Geometry.Line) {
       return this.getPolygonIntersection(shape);
   }
 
-  // line - circle intersection method
-  getCircleIntersection(circle) {
-    return circle.getLineIntersection(this);
-  }
-
   // line - polygon intersection method
   getPolygonIntersection(polygon) {
     return polygon.getLineIntersection(this);