|
|
@ -130,7 +130,7 @@
|
|
|
|
faireCercle(pts[i][0],pts[i][1],pts[i][2],lectx);
|
|
|
|
faireCercle(pts[i][0],pts[i][1],pts[i][2],lectx);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
else
|
|
|
|
faireCercle(pts[i][0],pts[i][1],pts[i][2],lectx);
|
|
|
|
faireCercle(pts[i][0],pts[i][1],pts[i][2],lectx);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
/*
|
|
|
|
/*
|
|
|
@ -157,48 +157,48 @@
|
|
|
|
{
|
|
|
|
{
|
|
|
|
|
|
|
|
|
|
|
|
tab1.forEach(element => {
|
|
|
|
tab1.forEach(element => {
|
|
|
|
tabTotal.push(element);
|
|
|
|
tabTotal.push(element);
|
|
|
|
})
|
|
|
|
})
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if(tab2[0]){
|
|
|
|
if(tab2[0]){
|
|
|
|
|
|
|
|
|
|
|
|
tab2.forEach(element => {
|
|
|
|
tab2.forEach(element => {
|
|
|
|
colors.forEach(col => {
|
|
|
|
colors.forEach(col => {
|
|
|
|
test=[element[0],element[1],col];
|
|
|
|
test=[element[0],element[1],col];
|
|
|
|
|
|
|
|
if(!exists)
|
|
|
|
|
|
|
|
exists=!tabTotal.every(unique);
|
|
|
|
|
|
|
|
})
|
|
|
|
if(!exists)
|
|
|
|
if(!exists)
|
|
|
|
exists=!tabTotal.every(unique);
|
|
|
|
tabTotal.push(element);
|
|
|
|
|
|
|
|
exists=false;
|
|
|
|
})
|
|
|
|
})
|
|
|
|
if(!exists)
|
|
|
|
|
|
|
|
tabTotal.push(element);
|
|
|
|
|
|
|
|
exists=false;
|
|
|
|
|
|
|
|
})
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if(tab3[0])
|
|
|
|
if(tab3[0])
|
|
|
|
{
|
|
|
|
{
|
|
|
|
|
|
|
|
|
|
|
|
tab3.forEach(element => {
|
|
|
|
tab3.forEach(element => {
|
|
|
|
colors.forEach(col => {
|
|
|
|
colors.forEach(col => {
|
|
|
|
test=[element[0],element[1],col];
|
|
|
|
test=[element[0],element[1],col];
|
|
|
|
|
|
|
|
if(!exists)
|
|
|
|
|
|
|
|
exists=!tabTotal.every(unique);
|
|
|
|
|
|
|
|
})
|
|
|
|
if(!exists)
|
|
|
|
if(!exists)
|
|
|
|
exists=!tabTotal.every(unique);
|
|
|
|
tabTotal.push(element);
|
|
|
|
|
|
|
|
exists=false;
|
|
|
|
})
|
|
|
|
})
|
|
|
|
if(!exists)
|
|
|
|
|
|
|
|
tabTotal.push(element);
|
|
|
|
|
|
|
|
exists=false;
|
|
|
|
|
|
|
|
})
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if(tab4[0]){
|
|
|
|
if(tab4[0]){
|
|
|
|
|
|
|
|
|
|
|
|
tab4.forEach(element => {
|
|
|
|
tab4.forEach(element => {
|
|
|
|
colors.forEach(col => {
|
|
|
|
colors.forEach(col => {
|
|
|
|
test=[element[0],element[1],col];
|
|
|
|
test=[element[0],element[1],col];
|
|
|
|
|
|
|
|
if(!exists)
|
|
|
|
|
|
|
|
exists=!tabTotal.every(unique);
|
|
|
|
|
|
|
|
})
|
|
|
|
if(!exists)
|
|
|
|
if(!exists)
|
|
|
|
exists=!tabTotal.every(unique);
|
|
|
|
tabTotal.push(element);
|
|
|
|
|
|
|
|
exists=false;
|
|
|
|
})
|
|
|
|
})
|
|
|
|
if(!exists)
|
|
|
|
|
|
|
|
tabTotal.push(element);
|
|
|
|
|
|
|
|
exists=false;
|
|
|
|
|
|
|
|
})
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
checkAllOK();
|
|
|
|
checkAllOK();
|
|
|
|
toutDessiner(tabTotal,canvasT,ctxT);
|
|
|
|
toutDessiner(tabTotal,canvasT,ctxT);
|
|
|
@ -288,36 +288,39 @@
|
|
|
|
function rotationManager(e)
|
|
|
|
function rotationManager(e)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
canvasNumber=e.currentTarget.id.substring(6);
|
|
|
|
canvasNumber=e.currentTarget.id.substring(6);
|
|
|
|
lecanvas=eval("canvas"+canvasNumber);
|
|
|
|
if(canvasNumber=="R")
|
|
|
|
letab=eval("tab"+canvasNumber);
|
|
|
|
|
|
|
|
lectx=lecanvas.getContext('2d');
|
|
|
|
|
|
|
|
dir = compas(e.clientX,e.clientY,e.currentTarget);
|
|
|
|
|
|
|
|
if(mousePos[0]==canvasNumber)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
if((mousePos[1]=="N" && dir == "O") || (mousePos[1]=="S" && dir == "E") || (mousePos[1]=="O" && dir == "S") || (mousePos[1]=="E" && dir == "N"))
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
tourneG(letab,lecanvas,lectx);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
else if((mousePos[1] == "N" && dir == "E") || (mousePos[1] == "S" && dir == "O") || (mousePos[1] == "E" && dir == "S") || (mousePos[1] == "O" && dir == "N"))
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
tourneD(letab,lecanvas,lectx);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
else if ((mousePos[1] == "E" && dir == "O") || (mousePos[1] == "O" && dir == "E"))
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
swap(letab,lecanvas,lectx,"V");
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
else if ((mousePos[1] == "N" && dir == "S") || (mousePos[1] == "S" && dir == "N"))
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
swap(letab,lecanvas,lectx,"H");
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
else if(canvasNumber=="R")
|
|
|
|
|
|
|
|
{
|
|
|
|
{
|
|
|
|
toggleVisible(mousePos[0]);
|
|
|
|
toggleVisible(mousePos[0]);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
else
|
|
|
|
{
|
|
|
|
{
|
|
|
|
changeOrder(mousePos[0],canvasNumber);
|
|
|
|
lecanvas=eval("canvas"+canvasNumber);
|
|
|
|
|
|
|
|
letab=eval("tab"+canvasNumber);
|
|
|
|
|
|
|
|
lectx=lecanvas.getContext('2d');
|
|
|
|
|
|
|
|
dir = compas(e.clientX,e.clientY,e.currentTarget);
|
|
|
|
|
|
|
|
if(mousePos[0]==canvasNumber)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
if((mousePos[1]=="N" && dir == "O") || (mousePos[1]=="S" && dir == "E") || (mousePos[1]=="O" && dir == "S") || (mousePos[1]=="E" && dir == "N"))
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
tourneG(letab,lecanvas,lectx);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
else if((mousePos[1] == "N" && dir == "E") || (mousePos[1] == "S" && dir == "O") || (mousePos[1] == "E" && dir == "S") || (mousePos[1] == "O" && dir == "N"))
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
tourneD(letab,lecanvas,lectx);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
else if ((mousePos[1] == "E" && dir == "O") || (mousePos[1] == "O" && dir == "E"))
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
swap(letab,lecanvas,lectx,"V");
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
else if ((mousePos[1] == "N" && dir == "S") || (mousePos[1] == "S" && dir == "N"))
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
swap(letab,lecanvas,lectx,"H");
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
else
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
changeOrder(mousePos[0],canvasNumber);
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
@ -335,7 +338,7 @@
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
else
|
|
|
|
exists=false;
|
|
|
|
exists=false;
|
|
|
|
|
|
|
|
|
|
|
|
if(exists)
|
|
|
|
if(exists)
|
|
|
|
{
|
|
|
|
{
|
|
|
@ -351,7 +354,7 @@
|
|
|
|
for(i=0;i<toTab.length;i++)
|
|
|
|
for(i=0;i<toTab.length;i++)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
|
|
|
|
|
|
|
|
[fromTab[i],toTab[i]]=[toTab[i],fromTab[i]];
|
|
|
|
[fromTab[i],toTab[i]]=[toTab[i],fromTab[i]];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
//[fromTab,toTab]=[toTab,fromTab];
|
|
|
|
//[fromTab,toTab]=[toTab,fromTab];
|
|
|
|
toutDessiner(fromTab,eval("canvas"+from),eval("ctx"+from));
|
|
|
|
toutDessiner(fromTab,eval("canvas"+from),eval("ctx"+from));
|
|
|
|