From 49243256667b076f9362c1eed6ab9f102b8666b2 Mon Sep 17 00:00:00 2001 From: frperalde Date: Sat, 6 Mar 2021 11:43:39 +0100 Subject: [PATCH 1/7] formeseeeee --- SwichGIT/src/css/base.css | 4 ++ SwichGIT/src/css/desktops.css | 13 ++++- SwichGIT/src/css/formes.css | 18 +++--- SwichGIT/src/js/main.js | 107 ++++++++++++++++++++++------------ SwichGIT/src/js/menu.js | 30 +++++----- 5 files changed, 110 insertions(+), 62 deletions(-) diff --git a/SwichGIT/src/css/base.css b/SwichGIT/src/css/base.css index 7cb4e34..a4ff6d2 100644 --- a/SwichGIT/src/css/base.css +++ b/SwichGIT/src/css/base.css @@ -25,6 +25,10 @@ --x : 10vw; --y : 7vw; --z : 3.75vw; + /*Formes ete*/ + --l: 3vw; + --m: 2.5vw; + --n: 1.5vw; } .test{ diff --git a/SwichGIT/src/css/desktops.css b/SwichGIT/src/css/desktops.css index 50d6e46..5ae9c5d 100644 --- a/SwichGIT/src/css/desktops.css +++ b/SwichGIT/src/css/desktops.css @@ -7,7 +7,15 @@ height: var(--x); width: var(--x); display: table-cell; - vertical-align: middle; + /*vertical-align: middle;*/ + } + + .containform3carte { + position: relative; + height: var(--l); + width: var(--l); + display: table-cell; + /*vertical-align: middle;*/ } .containinte { @@ -226,6 +234,9 @@ margin-top: 0.25vw; height: 3vw; border-radius: 10px; + display: table-cell; + position: relative; + vertical-align: middle; background-color: var(--lighttercia); } diff --git a/SwichGIT/src/css/formes.css b/SwichGIT/src/css/formes.css index c810914..f41d53a 100644 --- a/SwichGIT/src/css/formes.css +++ b/SwichGIT/src/css/formes.css @@ -110,7 +110,7 @@ clip-path: polygon(30% 0%, 70% 0%, 100% 30%, 100% 70%, 70% 100%, 30% 100%, 0% 70%, 0% 30%); } -.rond{ +.rondv2{ -webkit-clip-path: circle(50% at 50% 50%); clip-path: circle(50% at 50% 50%); } @@ -126,19 +126,19 @@ } .containinteCarte{ - top:calc((var(--x) - var(--z)) / 2); - left:calc((var(--x) - var(--z)) / 2); - height: var(--z); - width: var(--z); + top:calc((var(--l) - var(--n)) / 2); + left:calc((var(--l) - var(--n)) / 2); + height: var(--n); + width: var(--n); z-index: 2; position: absolute; } .containexteCarte{ - top:calc((var(--x) - var(--y)) / 2); - left:calc((var(--x) - var(--y)) / 2); - height: var(--y); - width: var(--y); + top:calc((var(--l) - var(--m)) / 2); + left:calc((var(--l) - var(--m)) / 2); + height: var(--m); + width: var(--m); z-index: 1; position: absolute; } \ No newline at end of file diff --git a/SwichGIT/src/js/main.js b/SwichGIT/src/js/main.js index 6ded03a..0384579 100644 --- a/SwichGIT/src/js/main.js +++ b/SwichGIT/src/js/main.js @@ -269,6 +269,7 @@ class Figure { } var divcase = document.createElement('div'); divcase.className = "item-form"; + //AJOUT FRANCOIS //Pour chaque type on regarde les formes switch (this.forme) { case FormeFigure.Rond: @@ -276,111 +277,141 @@ class Figure { case TypeFigure.Moyen: - var divContainForm = document.createElement('div'); - divContainForm.className = "containform"; - divContainForm.classList.add("ajustementGrandeForme"); + var containInte = document.createElement('div'); + var formeInte = document.createElement('div'); + var containExte = document.createElement('div'); + var formeExte = document.createElement('div'); - var unCercle = document.createElement('div'); - unCercle.className = "anneau"; - unCercle.style.backgroundColor = "var(--colorbase)"; + var vidcontainer = document.createElement('div'); + vidcontainer.className = "containform3carte"; + + formeExte.className = "formeexte"; + formeExte.classList.add('rondv2'); + + formeInte.className = "formeinte"; + formeInte.classList.add('rondv2'); + formeInte.style.backgroundColor = "var(--lighttercia)"; + + + if (this.couleur != null) { - if (this.couleur == CouleurFigure.Couleur2) { - unCercle.style.backgroundColor = "var(--colorone)"; + if (this.couleur == CouleurFigure.Couleur1){ + formeExte.style.backgroundColor = "var(--colorbase)" + } else if (this.couleur == CouleurFigure.Couleur2) { + formeExte.style.backgroundColor = "var(--colorone)"; } else if (this.couleur == CouleurFigure.Couleur3) { - unCercle.style.backgroundColor = "var(--colortwo)"; + formeExte.style.backgroundColor = "var(--colortwo)"; } else if (this.couleur == CouleurFigure.Couleur4) { - unCercle.style.backgroundColor = "var(--colorthree)"; + formeExte.style.backgroundColor = "var(--colorthree)"; } } else { if (selectionDiemension == 0) { this.couleur = CouleurFigure.Couleur1; if (this.pos == 0 || this.pos == 2 || this.pos == 9 || this.pos == 11) { - unCercle.style.backgroundColor = "var(--colorone)"; + formeExte.style.backgroundColor = "var(--colorone)"; this.couleur = CouleurFigure.Couleur2; } if (this.pos == 1 || this.pos == 10) { - unCercle.style.backgroundColor = "var(--colortwo)"; + formeExte.style.backgroundColor = "var(--colortwo)"; this.couleur = CouleurFigure.Couleur3; } if (this.pos == 4 || this.pos == 7) { - unCercle.style.backgroundColor = "var(--colorthree)"; + formeExte.style.backgroundColor = "var(--colorthree)"; this.couleur = CouleurFigure.Couleur4; } } else if (selectionDiemension == 1) { if (this.pos == 0 || this.pos == 2 || this.pos == 6 || this.pos == 8) { - unCercle.style.backgroundColor = "var(--colorone)"; + formeExte.style.backgroundColor = "var(--colorone)"; this.couleur = CouleurFigure.Couleur2; } if (this.pos == 1 || this.pos == 7) { - unCercle.style.backgroundColor = "var(--colortwo)"; + formeExte.style.backgroundColor = "var(--colortwo)"; this.couleur = CouleurFigure.Couleur3; } if (this.pos == 4) { - unCercle.style.backgroundColor = "var(--colorthree)"; + formeExte.style.backgroundColor = "var(--colorthree)"; this.couleur = CouleurFigure.Couleur4; } } } + containInte.appendChild(formeInte); + containInte.className = "containinteCarte"; + containExte.appendChild(formeExte); + containExte.className = "containexteCarte"; - var unRond = document.createElement('div'); - unRond.className = "rondinterieur inte"; + vidcontainer.appendChild(containInte); + vidcontainer.appendChild(containExte); - unCercle.appendChild(unRond); - divContainForm.appendChild(unCercle); - divcase.appendChild(divContainForm); + divcase.appendChild(vidcontainer); this.CodeHTML = divcase; break; case TypeFigure.Petit: - var divContainForm = document.createElement('div'); - divContainForm.className = "containform"; - divContainForm.classList.add("ajustementPetiteForme"); + var containInte = document.createElement('div'); + var formeInte = document.createElement('div'); + var containExte = document.createElement('div'); + var formeExte = document.createElement('div'); - var unRond = document.createElement('div'); - unRond.className = "rond"; - unRond.style.backgroundColor = "var(--colorbase)"; + var vidcontainer = document.createElement('div'); + vidcontainer.className = "containform3carte"; + + formeExte.className = "formeexte"; + formeExte.classList.add('rondv2'); + formeExte.style.backgroundColor = "var(--lighttercia)"; + + formeInte.className = "formeinte"; + formeInte.classList.add('rondv2'); if (this.couleur != null) { if (this.couleur == CouleurFigure.Couleur2) { - unRond.style.backgroundColor = "var(--colorone)"; + formeInte.style.backgroundColor = "var(--colorbase)"; + } else if (this.couleur == CouleurFigure.Couleur2) { + formeInte.style.backgroundColor = "var(--colorone)"; } else if (this.couleur == CouleurFigure.Couleur3) { - unRond.style.backgroundColor = "var(--colortwo)"; + formeInte.style.backgroundColor = "var(--colortwo)"; } else if (this.couleur == CouleurFigure.Couleur4) { - unRond.style.backgroundColor = "var(--colorthree)"; + formeInte.style.backgroundColor = "var(--colorthree)"; } } else { if (selectionDiemension == 0) { this.couleur = CouleurFigure.Couleur1; if (this.pos == 0 || this.pos == 2 || this.pos == 9 || this.pos == 11) { - unRond.style.backgroundColor = "var(--colorone)"; + formeInte.style.backgroundColor = "var(--colorone)"; this.couleur = CouleurFigure.Couleur2; } if (this.pos == 1 || this.pos == 10) { - unRond.style.backgroundColor = "var(--colortwo)"; + formeInte.style.backgroundColor = "var(--colortwo)"; this.couleur = CouleurFigure.Couleur3; } if (this.pos == 4 || this.pos == 7) { - unRond.style.backgroundColor = "var(--colorthree)"; + formeInte.style.backgroundColor = "var(--colorthree)"; this.couleur = CouleurFigure.Couleur4; } } else if (selectionDiemension == 1) { if (this.pos == 0 || this.pos == 2 || this.pos == 6 || this.pos == 8) { - unRond.style.backgroundColor = "var(--colorone)"; + formeInte.style.backgroundColor = "var(--colorone)"; this.couleur = CouleurFigure.Couleur2; } if (this.pos == 1 || this.pos == 7) { - unRond.style.backgroundColor = "var(--colortwo)"; + formeInte.style.backgroundColor = "var(--colortwo)"; this.couleur = CouleurFigure.Couleur3; } if (this.pos == 4) { - unRond.style.backgroundColor = "var(--colorthree)"; + formeInte.style.backgroundColor = "var(--colorthree)"; this.couleur = CouleurFigure.Couleur4; } } } - divContainForm.appendChild(unRond); - divcase.appendChild(divContainForm); + containInte.appendChild(formeInte); + containInte.className = "containinteCarte"; + containExte.appendChild(formeExte); + containExte.className = "containexteCarte"; + + vidcontainer.appendChild(containInte); + vidcontainer.appendChild(containExte); + + divcase.appendChild(vidcontainer); this.CodeHTML = divcase; break; diff --git a/SwichGIT/src/js/menu.js b/SwichGIT/src/js/menu.js index b77c13c..f14e1b6 100644 --- a/SwichGIT/src/js/menu.js +++ b/SwichGIT/src/js/menu.js @@ -1,4 +1,4 @@ -var FormeSelect = []; +var FormeSelect = ["rond"]; var ListeCouleur = ["colorbase","colorcarre","colorone","colortwo","colorthree"] var ListeClassForme = ["rond","carre","triangle","croix","losange","penta","hexa","hocto"] @@ -13,12 +13,23 @@ function settingOpen(){ } } -function disableCache(formName){ +function ableCache(formName){ cacheName = "cache"+formName; - document.getElementById(cacheName).style.display = "none"; - FormeSelect.push(form); + const pos = FormeSelect.indexOf(formName); + if (pos > -1) { + FormeSelect.splice(pos, 1); + } + document.getElementById(cacheName).style.display = "block"; +} - //document.getElementById("SettingName").innerHTML = FormeSelect.length; +function disableCache(formName){ + if (FormeSelect.length < 4) + { + cacheName = "cache"+formName; + document.getElementById(cacheName).style.display = "none"; + FormeSelect.push(formName); + console.log(FormeSelect); + } } function changeContour(value){ @@ -27,15 +38,6 @@ function changeContour(value){ //document.getElementById("SettingName").innerHTML = newvalue; } -function ableCache(formName){ - cacheName = "cache"+formName; - const pos = FormeSelect.indexOf(formName); - if (pos > -1) { - FormeSelect.splice(pos, 1); - } - document.getElementById(cacheName).style.display = "block"; -} - function getVarColor(color){ var getvar = color; getvar = getvar.substring(6,getvar.length-1); From 3292e0fe5b58ba9901af08cd55d9697f9b5776de Mon Sep 17 00:00:00 2001 From: frperalde Date: Sat, 6 Mar 2021 12:03:51 +0100 Subject: [PATCH 2/7] formes pf --- SwichGIT/src/js/main.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/SwichGIT/src/js/main.js b/SwichGIT/src/js/main.js index 0384579..358a1f6 100644 --- a/SwichGIT/src/js/main.js +++ b/SwichGIT/src/js/main.js @@ -355,16 +355,16 @@ class Figure { var vidcontainer = document.createElement('div'); vidcontainer.className = "containform3carte"; + vidcontainer.className = "proute"; formeExte.className = "formeexte"; formeExte.classList.add('rondv2'); - formeExte.style.backgroundColor = "var(--lighttercia)"; formeInte.className = "formeinte"; formeInte.classList.add('rondv2'); if (this.couleur != null) { - if (this.couleur == CouleurFigure.Couleur2) { + if (this.couleur == CouleurFigure.Couleur1) { formeInte.style.backgroundColor = "var(--colorbase)"; } else if (this.couleur == CouleurFigure.Couleur2) { formeInte.style.backgroundColor = "var(--colorone)"; @@ -403,6 +403,7 @@ class Figure { } } } + containInte.appendChild(formeInte); containInte.className = "containinteCarte"; containExte.appendChild(formeExte); @@ -2220,7 +2221,7 @@ function doublonInterdit(uneCarte) { } function bacASable() { - majSizeCard(2); + majSizeCard(3); var lesCartes = []; var LesFigure = []; From b19e779825dd515652fbb698a4fedb8ae91dac11 Mon Sep 17 00:00:00 2001 From: frperalde Date: Sat, 6 Mar 2021 12:20:17 +0100 Subject: [PATCH 3/7] formes gerer taille --- SwichGIT/src/css/formes.css | 5 +++++ SwichGIT/src/js/main.js | 2 +- SwichGIT/src/js/menu.js | 3 +++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/SwichGIT/src/css/formes.css b/SwichGIT/src/css/formes.css index f41d53a..929e8c8 100644 --- a/SwichGIT/src/css/formes.css +++ b/SwichGIT/src/css/formes.css @@ -115,6 +115,11 @@ clip-path: circle(50% at 50% 50%); } +.rond{ + -webkit-clip-path: circle(50% at 50% 50%); + clip-path: circle(50% at 50% 50%); +} + .formeinte{ height: 100%; width: 100%; diff --git a/SwichGIT/src/js/main.js b/SwichGIT/src/js/main.js index 358a1f6..276a3a8 100644 --- a/SwichGIT/src/js/main.js +++ b/SwichGIT/src/js/main.js @@ -574,7 +574,7 @@ function lancerpartie() { function retour() { document.getElementById("pageAccueil").style.visibility = "visible"; document.getElementById("pageGame").style.visibility = "hidden"; - window.location.reload(); + //window.location.reload(); } function rechargerGAME() { diff --git a/SwichGIT/src/js/menu.js b/SwichGIT/src/js/menu.js index f14e1b6..7d93c20 100644 --- a/SwichGIT/src/js/menu.js +++ b/SwichGIT/src/js/menu.js @@ -35,6 +35,9 @@ function disableCache(formName){ function changeContour(value){ var newvalue = value * 0.055 + 1; document.documentElement.style.setProperty('--z', newvalue+'vw'); + var valcard = value * 0.013 + 1; + document.documentElement.style.setProperty('--n', valcard+'vw'); + //document.documentElement.style.setProperty('--n', newvalue+'vw'); //document.getElementById("SettingName").innerHTML = newvalue; } From 1ca4c233290fd88abf527dd05952cc0b11e128cc Mon Sep 17 00:00:00 2001 From: frperalde Date: Sat, 6 Mar 2021 14:56:09 +0100 Subject: [PATCH 4/7] 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); } } From c3875d73ee77d11fa3082d2deaa157dcde569891 Mon Sep 17 00:00:00 2001 From: frperalde Date: Sat, 6 Mar 2021 15:39:01 +0100 Subject: [PATCH 5/7] a --- SwichGIT/src/js/main.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/SwichGIT/src/js/main.js b/SwichGIT/src/js/main.js index ea740ce..12a7743 100644 --- a/SwichGIT/src/js/main.js +++ b/SwichGIT/src/js/main.js @@ -514,6 +514,7 @@ class Figure { this.couleur = CouleurFigure.Couleur4; } } else if (selectionDiemension == 1) { + this.couleur = CouleurFigure.Couleur1; if (this.pos == 0 || this.pos == 2 || this.pos == 6 || this.pos == 8) { formeInte.style.backgroundColor = "var(--colorone)"; this.couleur = CouleurFigure.Couleur2; @@ -699,7 +700,7 @@ function lancerpartie() { function retour() { document.getElementById("pageAccueil").style.visibility = "visible"; document.getElementById("pageGame").style.visibility = "hidden"; - //window.location.reload(); + window.location.reload(); } function rechargerGAME() { From 30d738f109040787edb0ca936285c123d407a7fe Mon Sep 17 00:00:00 2001 From: frperalde Date: Sat, 6 Mar 2021 15:40:24 +0100 Subject: [PATCH 6/7] correction couleur 3x3 --- SwichGIT/src/js/main.js | 1 + 1 file changed, 1 insertion(+) diff --git a/SwichGIT/src/js/main.js b/SwichGIT/src/js/main.js index 12a7743..52a7041 100644 --- a/SwichGIT/src/js/main.js +++ b/SwichGIT/src/js/main.js @@ -382,6 +382,7 @@ class Figure { this.couleur = CouleurFigure.Couleur4; } } else if (selectionDiemension == 1) { + this.couleur = CouleurFigure.Couleur1; if (this.pos == 0 || this.pos == 2 || this.pos == 6 || this.pos == 8) { formeExte.style.backgroundColor = "var(--colorone)"; this.couleur = CouleurFigure.Couleur2; From 8c8d303222674d9249f52ac2b594955b8f05af3b Mon Sep 17 00:00:00 2001 From: frperalde Date: Sat, 6 Mar 2021 15:53:21 +0100 Subject: [PATCH 7/7] correction erreur --- SwichGIT/src/js/main.js | 254 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 253 insertions(+), 1 deletion(-) diff --git a/SwichGIT/src/js/main.js b/SwichGIT/src/js/main.js index 52a7041..7148d9c 100644 --- a/SwichGIT/src/js/main.js +++ b/SwichGIT/src/js/main.js @@ -292,7 +292,7 @@ class Figure { formeInte.classList.add('rondv2'); formeInte.style.backgroundColor = "var(--lighttercia)"; - + formeExte.style.backgroundColor = "var(--colorbase)"; if (this.couleur != null) { if (this.couleur == CouleurFigure.Couleur1){ @@ -367,33 +367,158 @@ class Figure { } } } else { + this.couleur = CouleurFigure.Couleur1; if (selectionDiemension == 0) { this.couleur = CouleurFigure.Couleur1; if (this.pos == 0 || this.pos == 2 || this.pos == 9 || this.pos == 11) { formeExte.style.backgroundColor = "var(--colorone)"; this.couleur = CouleurFigure.Couleur2; + 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"); + } + } } if (this.pos == 1 || this.pos == 10) { formeExte.style.backgroundColor = "var(--colortwo)"; this.couleur = CouleurFigure.Couleur3; + 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"); + } + } } if (this.pos == 4 || this.pos == 7) { formeExte.style.backgroundColor = "var(--colorthree)"; this.couleur = CouleurFigure.Couleur4; + 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 == 1) { this.couleur = CouleurFigure.Couleur1; if (this.pos == 0 || this.pos == 2 || this.pos == 6 || this.pos == 8) { formeExte.style.backgroundColor = "var(--colorone)"; this.couleur = CouleurFigure.Couleur2; + 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"); + } + } } if (this.pos == 1 || this.pos == 7) { formeExte.style.backgroundColor = "var(--colortwo)"; this.couleur = CouleurFigure.Couleur3; + 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"); + } + } } if (this.pos == 4) { formeExte.style.backgroundColor = "var(--colorthree)"; this.couleur = CouleurFigure.Couleur4; + 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"); + } + } } } } @@ -426,6 +551,8 @@ class Figure { formeInte.className = "formeinte"; formeInte.classList.add('rondv2'); + formeInte.style.backgroundColor = "var(--colorbase)"; + if (this.couleur != null) { if (this.couleur == CouleurFigure.Couleur1) { formeInte.style.backgroundColor = "var(--colorbase)"; @@ -500,33 +627,158 @@ class Figure { } } } else { + this.couleur = CouleurFigure.Couleur1; if (selectionDiemension == 0) { this.couleur = CouleurFigure.Couleur1; if (this.pos == 0 || this.pos == 2 || this.pos == 9 || this.pos == 11) { formeInte.style.backgroundColor = "var(--colorone)"; this.couleur = CouleurFigure.Couleur2; + 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"); + } + } } if (this.pos == 1 || this.pos == 10) { formeInte.style.backgroundColor = "var(--colortwo)"; this.couleur = CouleurFigure.Couleur3; + 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"); + } + } } if (this.pos == 4 || this.pos == 7) { formeInte.style.backgroundColor = "var(--colorthree)"; this.couleur = CouleurFigure.Couleur4; + 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 == 1) { this.couleur = CouleurFigure.Couleur1; if (this.pos == 0 || this.pos == 2 || this.pos == 6 || this.pos == 8) { formeInte.style.backgroundColor = "var(--colorone)"; this.couleur = CouleurFigure.Couleur2; + 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"); + } + } } if (this.pos == 1 || this.pos == 7) { formeInte.style.backgroundColor = "var(--colortwo)"; this.couleur = CouleurFigure.Couleur3; + 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"); + } + } } if (this.pos == 4) { formeInte.style.backgroundColor = "var(--colorthree)"; this.couleur = CouleurFigure.Couleur4; + 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"); + } + } } } }