From 1ca4c233290fd88abf527dd05952cc0b11e128cc Mon Sep 17 00:00:00 2001 From: frperalde Date: Sat, 6 Mar 2021 14:56:09 +0100 Subject: [PATCH] formes fonctionnelles --- SwichGIT/src/css/formes.css | 9 ++- SwichGIT/src/js/main.js | 125 ++++++++++++++++++++++++++++++++++++ SwichGIT/src/js/menu.js | 2 +- 3 files changed, 134 insertions(+), 2 deletions(-) diff --git a/SwichGIT/src/css/formes.css b/SwichGIT/src/css/formes.css index 929e8c8..03ba9dc 100644 --- a/SwichGIT/src/css/formes.css +++ b/SwichGIT/src/css/formes.css @@ -79,6 +79,14 @@ margin-top: calc( (var(--y) - var(--z)) / 10); } +.castrianglec{ + margin-top: calc( (var(--m) - var(--n)) / 5); +} + +.caspentac{ + margin-top: calc( (var(--m) - var(--n)) / 10); +} + .losange{ -webkit-clip-path: polygon(50% 0%, 100% 50%, 50% 100%, 0% 50%); clip-path: polygon(50% 0%, 100% 50%, 50% 100%, 0% 50%); @@ -123,7 +131,6 @@ .formeinte{ height: 100%; width: 100%; - margin: 0 auto; } .formeexte{ height: 100%; diff --git a/SwichGIT/src/js/main.js b/SwichGIT/src/js/main.js index 276a3a8..ea740ce 100644 --- a/SwichGIT/src/js/main.js +++ b/SwichGIT/src/js/main.js @@ -299,10 +299,72 @@ class Figure { formeExte.style.backgroundColor = "var(--colorbase)" } else if (this.couleur == CouleurFigure.Couleur2) { formeExte.style.backgroundColor = "var(--colorone)"; + if(FormeSelect.length > 1) + { + //suppression formeBase + formeExte.classList.remove('rondv2'); + formeInte.classList.remove('rondv2'); + //ajout forme + formeExte.classList.add(FormeSelect[1]); + formeInte.classList.add(FormeSelect[1]); + //verification triangle ou penda + if(FormeSelect[1] == "triangle"){ + formeInte.classList.add("castrianglec"); + } + if(FormeSelect[1] == "penta"){ + formeInte.classList.add("caspentac"); + } + } } else if (this.couleur == CouleurFigure.Couleur3) { formeExte.style.backgroundColor = "var(--colortwo)"; + if(FormeSelect.length > 2) + { + //suppression formeBase + formeExte.classList.remove('rondv2'); + formeInte.classList.remove('rondv2'); + //ajout forme + formeExte.classList.add(FormeSelect[2]); + formeInte.classList.add(FormeSelect[2]); + //verification triangle ou penda + if(FormeSelect[2] == "triangle"){ + formeInte.classList.add("castrianglec"); + } + if(FormeSelect[2] == "penta"){ + formeInte.classList.add("caspentac"); + } + } } else if (this.couleur == CouleurFigure.Couleur4) { formeExte.style.backgroundColor = "var(--colorthree)"; + if(FormeSelect.length > 3) + { + //suppression formeBase + formeExte.classList.remove('rondv2'); + formeInte.classList.remove('rondv2'); + //ajout forme + formeExte.classList.add(FormeSelect[3]); + formeInte.classList.add(FormeSelect[3]); + //verification triangle ou penda + if(FormeSelect[3] == "triangle"){ + formeInte.classList.add("castrianglec"); + } + if(FormeSelect[3] == "penta"){ + formeInte.classList.add("caspentac"); + } + } else if (FormeSelect.length > 1){ + //suppression formeBase + formeExte.classList.remove('rondv2'); + formeInte.classList.remove('rondv2'); + //ajout forme + formeExte.classList.add(FormeSelect[1]); + formeInte.classList.add(FormeSelect[1]); + //verification triangle ou penda + if(FormeSelect[1] == "triangle"){ + formeInte.classList.add("castrianglec"); + } + if(FormeSelect[1] == "penta"){ + formeInte.classList.add("caspentac"); + } + } } } else { if (selectionDiemension == 0) { @@ -368,10 +430,73 @@ class Figure { formeInte.style.backgroundColor = "var(--colorbase)"; } else if (this.couleur == CouleurFigure.Couleur2) { formeInte.style.backgroundColor = "var(--colorone)"; + if(FormeSelect.length > 1) + { + //suppression formeBase + formeExte.classList.remove('rondv2'); + formeInte.classList.remove('rondv2'); + //ajout forme + formeExte.classList.add(FormeSelect[1]); + formeInte.classList.add(FormeSelect[1]); + //verification triangle ou penda + if(FormeSelect[1] == "triangle"){ + formeInte.classList.add("castrianglec"); + } + if(FormeSelect[1] == "penta"){ + formeInte.classList.add("caspentac"); + } + } + } else if (this.couleur == CouleurFigure.Couleur3) { formeInte.style.backgroundColor = "var(--colortwo)"; + if(FormeSelect.length > 2) + { + //suppression formeBase + formeExte.classList.remove('rondv2'); + formeInte.classList.remove('rondv2'); + //ajout forme + formeExte.classList.add(FormeSelect[2]); + formeInte.classList.add(FormeSelect[2]); + //verification triangle ou penda + if(FormeSelect[2] == "triangle"){ + formeInte.classList.add("castrianglec"); + } + if(FormeSelect[2] == "penta"){ + formeInte.classList.add("caspentac"); + } + } } else if (this.couleur == CouleurFigure.Couleur4) { formeInte.style.backgroundColor = "var(--colorthree)"; + if(FormeSelect.length > 3) + { + //suppression formeBase + formeExte.classList.remove('rondv2'); + formeInte.classList.remove('rondv2'); + //ajout forme + formeExte.classList.add(FormeSelect[3]); + formeInte.classList.add(FormeSelect[3]); + //verification triangle ou penda + if(FormeSelect[3] == "triangle"){ + formeInte.classList.add("castrianglec"); + } + if(FormeSelect[3] == "penta"){ + formeInte.classList.add("caspentac"); + } + } else if (FormeSelect.length > 1){ + //suppression formeBase + formeExte.classList.remove('rondv2'); + formeInte.classList.remove('rondv2'); + //ajout forme + formeExte.classList.add(FormeSelect[1]); + formeInte.classList.add(FormeSelect[1]); + //verification triangle ou penda + if(FormeSelect[1] == "triangle"){ + formeInte.classList.add("castrianglec"); + } + if(FormeSelect[1] == "penta"){ + formeInte.classList.add("caspentac"); + } + } } } else { if (selectionDiemension == 0) { diff --git a/SwichGIT/src/js/menu.js b/SwichGIT/src/js/menu.js index 7d93c20..5c7c507 100644 --- a/SwichGIT/src/js/menu.js +++ b/SwichGIT/src/js/menu.js @@ -28,7 +28,7 @@ function disableCache(formName){ cacheName = "cache"+formName; document.getElementById(cacheName).style.display = "none"; FormeSelect.push(formName); - console.log(FormeSelect); + console.log(FormeSelect.length); } }