|
|
|
@ -82,7 +82,7 @@
|
|
|
|
|
canvasT.height=height;
|
|
|
|
|
canvasO.height=height;
|
|
|
|
|
|
|
|
|
|
function faireCercle0(x,y,color,lectx){
|
|
|
|
|
function faireCercle(x,y,color,lectx){
|
|
|
|
|
var cercle = new Path2D();
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -97,7 +97,7 @@
|
|
|
|
|
lectx.fill(cercle);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
function drawImg(x,y,color,lectx)
|
|
|
|
|
function drawImg0(x,y,color,lectx)
|
|
|
|
|
{
|
|
|
|
|
var img= new Image();
|
|
|
|
|
|
|
|
|
@ -157,10 +157,10 @@
|
|
|
|
|
{
|
|
|
|
|
if(Array.isArray(pts[i]))
|
|
|
|
|
{
|
|
|
|
|
drawImg(pts[i][0],pts[i][1],pts[i][2],lectx);
|
|
|
|
|
faireCercle(pts[i][0],pts[i][1],pts[i][2],lectx);
|
|
|
|
|
}
|
|
|
|
|
//else
|
|
|
|
|
//drawImg(pts[i][0],pts[i][1],pts[i][2],lectx);
|
|
|
|
|
//faireCercle(pts[i][0],pts[i][1],pts[i][2],lectx);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
@ -480,6 +480,8 @@
|
|
|
|
|
toutDessiner(tab2,canvas2,ctx2);
|
|
|
|
|
toutDessiner(tab3,canvas3,ctx3);
|
|
|
|
|
toutDessiner(tab4,canvas4,ctx4);
|
|
|
|
|
empiler();
|
|
|
|
|
toutDessiner(tabTotal,canvasT,ctxT);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|