Added Polygon Union

This commit is contained in:
Umbra Sheep
2018-10-02 12:26:28 +13:00
parent 45eae9a076
commit 21c230e77b
4 changed files with 29 additions and 20 deletions
File diff suppressed because one or more lines are too long
@@ -1 +1 @@
╨╛o<▐Пр╞╚#'?╪й┌╛'л
�zsuɹe��O�u�~�^
Vendored Regular → Executable
View File
+5 -4
View File
@@ -24,9 +24,7 @@ module.exports = {
}
return polygons
},
submitFinalCollation(res, gameID, userID, points, mergedPolygonIDs) {
console.log(module.exports.convertPointsObjToArray(points));
let area = mathFunc.calculateArea(points);
submitFinalCollation(res, gameID, userID, points, area, mergedPolygonIDs) {
query = util.format("CALL insertPolygon(\"%s\", \"%s\", %d)", gameID, userID, area);
db.get().query(query, function(err, rows) {
if (err) {
@@ -95,7 +93,10 @@ module.exports = {
polygonResult.push(polygon);
}
});
module.exports.submitFinalCollation(res, gameID, userID, polygonPoints, polygonsMerged);
let area = mathFunc.calculateArea(points);
module.exports.polygonDestruction(res, gameID, userID, polygonPoints, area, polygonsMerged);
module.exports.submitFinalCollation(res, gameID, userID, polygonPoints, area, polygonsMerged);
});
},
unionPolygon(points1, points2){