diff --git a/code/index.html b/code/index.html
index f9b0ad8..c3413a6 100644
--- a/code/index.html
+++ b/code/index.html
@@ -15,7 +15,7 @@
@@ -63,10 +64,10 @@
tabTotal=[];
tabObjCmp=[];
mousePos=[];
- colors=["red","blue","green","brown"];
+ colors=["red","yellow","green","purple"];
- width=240; // 6 lignes de 50px
- height=240; // 6 colonnes de 50px
+ width=180; // 6 lignes de 50px
+ height=180; // 6 colonnes de 50px
canvas1.width=width;
canvas2.width=width;
canvas3.width=width;
@@ -81,7 +82,7 @@
canvasT.height=height;
canvasO.height=height;
- function faireCercle(x,y,color,lectx){
+ function faireCercle0(x,y,color,lectx){
var cercle = new Path2D();
@@ -95,6 +96,22 @@
lectx.fillStyle = color;
lectx.fill(cercle);
}
+
+ function drawImg(x,y,color,lectx)
+ {
+ var img= new Image();
+ img.src="ress/"+color+".png";
+
+ //lectx2=eval(lectx);
+
+ nx=(width/6)*(x>0 ? x+2 : x+3);
+ ny=(height/6)*(y>0 ? y+2 : y+3);
+
+ img.onload = function(){
+ console.log("x:"+x+" y:"+y+" col:"+color);
+ lectx.drawImage(img,nx,ny,width/6,height/6);
+ }
+ }
function tourneG(letab,lecanvas,lectx)
{
@@ -137,26 +154,12 @@
{
if(Array.isArray(pts[i]))
{
- /*
- pts[i].forEach(element => {
- faireCercle(element[0],element[1],element[2],lectx);
- })*/
- faireCercle(pts[i][0],pts[i][1],pts[i][2],lectx);
+ drawImg(pts[i][0],pts[i][1],pts[i][2],lectx);
}
- else
- faireCercle(pts[i][0],pts[i][1],pts[i][2],lectx);
+ //else
+ //drawImg(pts[i][0],pts[i][1],pts[i][2],lectx);
}
}
- /*
- pts.forEach(element=> {
- if(Array.isArray(element[0])){
- element.forEach(element2 => {
- faireCercle(element2[0],element2[1],element2[2],lectx);
- })
- }
- else
- faireCercle(element[0],element[1],element[2],lectx);
- })*/
}
function empiler(obj=false)
@@ -256,9 +259,7 @@
}
function generateEasy(){
- tabObj=[[],[]];
- tabObj[0]=Array.from(tab1);
- tabObj[1]=Array.from(tab2);
+ tabObj=[Array.from(tab1),Array.from(tab2),Array.from(tab3),Array.from(tab4)];
tabObjCmp=[];
actions=getRandomInt(8);
@@ -267,7 +268,7 @@
actions--;
}
empiler(true);
- toutDessiner(tabObj,canvasO,ctxO);
+ toutDessiner(tabObjCmp,canvasO,ctxO);
}
@@ -299,10 +300,10 @@
if(!ne && !se ) return "O";
}
-
+
/*
6 cas : v1 vis->v1 vis
-
+
*/
function rotationManager(e)
{
@@ -457,23 +458,29 @@
})
- /*
- tab1.push([-3,-3,"green"],[-3,2,"red"],[1,2,"blue"],[3,-3,"brown"]);
- tab2.push([-3,-3,"green"],[-3,2,"red"],[1,2,"blue"],[3,-3,"brown"]);
- tab3.push([-3,-3,"green"],[-3,2,"red"],[1,2,"blue"],[3,-3,"brown"]);
- tab4.push([-3,-3,"green"],[-3,2,"red"],[1,2,"blue"],[3,-3,"brown"]);
- */
+ tab1.push(true,[-3,-3,"green"],[-3,2,"red"],[1,2,"yellow"],[3,-3,"purple"]);
+ //tab2.push(true,[-3,-3,"green"],[-3,2,"red"],[1,2,"yellow"],[3,-3,"purple"]);
+ //tab3.push(true,[-3,-3,"green"],[-3,2,"red"],[1,2,"yellow"],[3,-3,"purple"]);
+ //tab4.push(true,[-3,-3,"green"],[-3,2,"red"],[1,2,"yellow"],[1,1,"purple"]);
+
+ /*
tab1.push(true,[-1,-1,"green"],[-2,-2,"red"]);
tab2.push(true,[-1,-1,"green"],[-2,-2,"red"]);
tab3.push(true,[-1,-1,"green"],[-2,-2,"red"]);
tab4.push(true,[-1,-1,"green"],[-2,-2,"red"]);
-
+ */
toutDessiner(tab1,canvas1,ctx1);
- toutDessiner(tab2,canvas2,ctx2);
- toutDessiner(tab3,canvas3,ctx3);
- toutDessiner(tab4,canvas4,ctx4);
+ //toutDessiner(tab2,canvas2,ctx2);
+ //toutDessiner(tab3,canvas3,ctx3);
+ //toutDessiner(tab4,canvas4,ctx4);
+
+
+
+
+
+
diff --git a/code/ress/fond.png b/code/ress/fond.png
new file mode 100644
index 0000000..d66000e
Binary files /dev/null and b/code/ress/fond.png differ
diff --git a/code/ress/green.png b/code/ress/green.png
new file mode 100644
index 0000000..8ccb3ed
Binary files /dev/null and b/code/ress/green.png differ
diff --git a/code/ress/material_08.png b/code/ress/material_08.png
new file mode 100644
index 0000000..f6a660b
Binary files /dev/null and b/code/ress/material_08.png differ
diff --git a/code/ress/material_10.png b/code/ress/material_10.png
new file mode 100644
index 0000000..338c677
Binary files /dev/null and b/code/ress/material_10.png differ
diff --git a/code/ress/purple.png b/code/ress/purple.png
new file mode 100644
index 0000000..1c1adf6
Binary files /dev/null and b/code/ress/purple.png differ
diff --git a/code/ress/red.png b/code/ress/red.png
new file mode 100644
index 0000000..e45e788
Binary files /dev/null and b/code/ress/red.png differ
diff --git a/code/ress/wi.png b/code/ress/wi.png
new file mode 100644
index 0000000..6ba0967
Binary files /dev/null and b/code/ress/wi.png differ
diff --git a/code/ress/yellow.png b/code/ress/yellow.png
new file mode 100644
index 0000000..dddfe0f
Binary files /dev/null and b/code/ress/yellow.png differ