Affichage plus espacé, amélioration de la réserve

affichage-v2
adplantade 5 years ago
parent d6340c4190
commit 31cf1efc1d

@ -1,6 +1,8 @@
.all-container { .all-container {
display : flex; /* display : flex;
justify-content: space-between;
/*
align-items: baseline; align-items: baseline;
width : min-content; width : min-content;
flex-direction: row; flex-direction: row;

@ -7,6 +7,13 @@
</head> </head>
<body> <body>
<ul id="all-container" class="all-container" style="border:2px solid orangered"> <ul id="all-container" class="all-container" style="border:2px solid orangered">
<ul id="obj-container" class="obj-container" style="border:2px solid yellow">
<h1>Résultat</h1>
<canvas id="canvasTotal" style="border:1px solid #000"></canvas>
<h1>Objectif</h1>
<canvas id="canvasObj" style="border:1px solid green"></canvas>
<button onclick="generateEasy()">gen easy</button>
</ul>
<ul id="vitraux" class="vitraux" style="border:2px solid purple"> <ul id="vitraux" class="vitraux" style="border:2px solid purple">
<canvas id="canvas1" class="vitrail" style="border:1px solid #000"></canvas> <canvas id="canvas1" class="vitrail" style="border:1px solid #000"></canvas>
@ -17,17 +24,14 @@
<canvas id="canvas4" class="vitrail" style="border:1px solid #000"></canvas> <canvas id="canvas4" class="vitrail" style="border:1px solid #000"></canvas>
</ul> </ul>
<canvas id="canvasTotal" style="border:1px solid #000"></canvas>
<h1>Objectif</h1>
<canvas id="canvasObj" style="border:1px solid green"></canvas>
<button onclick="generateEasy()">gen easy</button>
<ul id="canvasR" class="flex-container" style="border:1px solid violet"> <ul id="canvasR" class="flex-container" style="border:1px solid violet">
<h1>Réserve</h1>
<canvas id="canvasR1" class="flex-item" width="150" height="150" style="border:1px solid red"></canvas> <canvas id="canvasR1" class="flex-item" width="150" height="150" style="border:1px solid red"></canvas>
<canvas id="canvasR2" class="flex-item" width="150" height="150" style="border:1px solid blue"></canvas> <canvas id="canvasR2" class="flex-item" width="150" height="150" style="border:1px solid blue"></canvas>
<canvas id="canvasR3" class="flex-item" style="border:1px solid violet"></canvas> <canvas id="canvasR3" class="flex-item" style="border:1px solid violet"></canvas>
<canvas id="canvasR4" class="flex-item" style="border:1px solid violet"></canvas> <canvas id="canvasR4" class="flex-item" style="border:1px solid violet"></canvas>
</ul> </ul>
</ul> </ul>
<script> <script>
var canvas1 = document.getElementById('canvas1'); var canvas1 = document.getElementById('canvas1');
@ -295,12 +299,35 @@
if(!ne && !se ) return "O"; if(!ne && !se ) return "O";
} }
/*
6 cas : v1 vis->v1 vis
*/
function rotationManager(e) function rotationManager(e)
{ {
canvasNumber=e.currentTarget.id.substring(6); canvasNumber=e.currentTarget.id.substring(6);
if(mousePos[0]=="R" && canvasNumber!="R")
{
if(!isVisible(canvasNumber))
{
toggleVisible(canvasNumber);
}
}
else
{
if(isVisible(mousePos[0]))
{
if(canvasNumber=="R") if(canvasNumber=="R")
{ {
/*
eval("tab"+mousePos[0]+"[0]=!tab"+mousePos[0]+"[0];");
empiler();
toutDessiner(eval("tab"+mousePos[0]),eval("canvas"+mousePos[0]),eval("ctx"+mousePos[0]));
toutDessiner(tabTotal,canvasT,ctxT);
*/
toggleVisible(mousePos[0]); toggleVisible(mousePos[0]);
tabR.push(eval("tab"+mousePos[0]));
} }
else else
{ {
@ -333,6 +360,8 @@
} }
} }
} }
}
}
function checkAllOK(){ function checkAllOK(){
@ -373,6 +402,11 @@
} }
function isVisible(what)
{
return eval("tab"+what+"[0]");
}
function toggleVisible(where) function toggleVisible(where)
{ {
eval("tab"+where+"[0]=!tab"+where+"[0];"); eval("tab"+where+"[0]=!tab"+where+"[0];");
@ -414,6 +448,10 @@
rotationManager(e); rotationManager(e);
}) })
canvasR.addEventListener("mousedown",function(e){
mousePos = [e.currentTarget.id.substring(6),compas(e.clientX,e.clientY,e.currentTarget)];
})
canvasR.addEventListener("mouseup",function(e){ canvasR.addEventListener("mouseup",function(e){
rotationManager(e); rotationManager(e);
}) })

Loading…
Cancel
Save