diff --git a/site/vue/js/createElement.js b/site/vue/js/createElement.js index c28f13c..132dd56 100644 --- a/site/vue/js/createElement.js +++ b/site/vue/js/createElement.js @@ -91,6 +91,35 @@ function createLine(points, id, end) { newPoints = [startX, startY, startX + distance20, startY, endX - distance20, endY, endX, endY]; } + for (let j = 0; j < 3; j++) { + var maxX = newPoints[2 + (2 * j)] - newPoints[0 + (2 * j)], + resteX = newPoints[0 + (2 * j)], + maxY = newPoints[1 + (2 * j)] - newPoints[3 + (2 * j)], + isGoingUp = function () { + if (newPoints[1 + (2 * j)] < newPoints[3 + (2 * j)]) + return true; + else return false + } + resteY = newPoints[3 + (2 * j)]; + iscollapsing = false; + + for (let i = 0; i < 100; i++) { + iscollapsing = false; + var x = (maxX / 100 * i) + resteX; + if (isGoingUp) + var y = (maxY - (maxY / 100 * i)) + resteY; + else var y = (maxY / 100 * i) + resteY; + logiques.forEach(function (logique) { + if (x > logique.x && x < logique.x + imageWidth && y > logique.y && y < logique.y + imageHeight) iscollapsing = true; + if (iscollapsing) { + createCircle(x, y, ["l"]) + console.log("ouiiiiii") + } + }); + } + } + + let line = new Konva.Line({ points: newPoints, stroke: colorLineInnactive, @@ -104,6 +133,7 @@ function createLine(points, id, end) { }; lines.push(lineObj); layer.add(line); + if (iscollapsing) line.stroke("red"); } diff --git a/site/vue/js/func.js b/site/vue/js/func.js index d204768..e964480 100644 --- a/site/vue/js/func.js +++ b/site/vue/js/func.js @@ -228,7 +228,6 @@ function changeLineColorBlack(idLine) { setLineStateFalse(idLine); let line = stage.findOne("#" + idLine); line.stroke(colorLineInnactive); - console.log(idLine); circles.forEach(function (circle) { if (circle === "circle" + idLine) { stage.findOne("#circle" + idLine).stroke(colorLineInnactive); @@ -935,10 +934,4 @@ function flip() { element.style.transform = 'rotate(' + deg + 'deg)'; }); rotated = !rotated; -} - -function setCanvasScale(x, y) { - console.log(document.getElementsByTagName("canvas")); - var ctx = document.getElementsByTagName("canvas").getContext("2d"); - console.log(ctx); } \ No newline at end of file diff --git a/site/vue/js/generateGame.js b/site/vue/js/generateGame.js index 8037d1f..653ad31 100644 --- a/site/vue/js/generateGame.js +++ b/site/vue/js/generateGame.js @@ -582,7 +582,6 @@ function generate2(col, matchs, fork) { initEndGame(); invertLine(); checkAllSortieLogique(); - console.log(circles); } function getNumberFork(arr, col) { diff --git a/site/vue/js/init.js b/site/vue/js/init.js index d4e736d..3fb7835 100644 --- a/site/vue/js/init.js +++ b/site/vue/js/init.js @@ -8,7 +8,6 @@ function initAllSwitch(mode) { layer.draw(); lineUpdate(element); checkEnd(mode); - setCanvasScale(); }); switche.on('mouseover', function () { document.body.style.cursor = "pointer";