master
Maël#GEEK#KingBurger#kouyk4 Maël#GEEK#KingBurger#kouyk4 4 years ago
parent a67f8875fe
commit 5634394014

Binary file not shown.

@ -805,7 +805,7 @@
$sedeplace=$_POST['sedeplace'.$i]; $sedeplace=$_POST['sedeplace'.$i];
$tiring=$_POST['tiring'.$i]; $tiring=$_POST['tiring'.$i];
$isDragging=$_POST['isDragging'.$i]; $isDragging=$_POST['isDragging'.$i];
$dribb=$_POST['dribb'.$i]; $dribb=$_POST['dribbb'.$i];
$statement = $db->query('INSERT INTO JOUEUR (numero,posX,posY,rayon,couleur,gottheball,setball,sedeplace,tiring,isDragging,appartient,dribbb) $statement = $db->query('INSERT INTO JOUEUR (numero,posX,posY,rayon,couleur,gottheball,setball,sedeplace,tiring,isDragging,appartient,dribbb)
VALUES ("'.$numero.'","'.$posX.'","'.$posY.'","'.$rayon.'","'.$couleur.'","'.$gottheball.'","'.$setball.'","'.$sedeplace.'","'.$tiring.'","'.$isDragging.'","'.$appar.'","'.$dribb.'");'); VALUES ("'.$numero.'","'.$posX.'","'.$posY.'","'.$rayon.'","'.$couleur.'","'.$gottheball.'","'.$setball.'","'.$sedeplace.'","'.$tiring.'","'.$isDragging.'","'.$appar.'","'.$dribb.'");');
@ -983,7 +983,7 @@
$sedeplace=$_POST['sedeplace'.$i]; $sedeplace=$_POST['sedeplace'.$i];
$tiring=$_POST['tiring'.$i]; $tiring=$_POST['tiring'.$i];
$isDragging=$_POST['isDragging'.$i]; $isDragging=$_POST['isDragging'.$i];
$dribb=$_POST['dribb'.$i]; $dribb=$_POST['dribbb'.$i];
$statement = $db->query('INSERT INTO JOUEUR (numero,posX,posY,rayon,couleur,gottheball,setball,sedeplace,tiring,isDragging,appartient,dribbb) $statement = $db->query('INSERT INTO JOUEUR (numero,posX,posY,rayon,couleur,gottheball,setball,sedeplace,tiring,isDragging,appartient,dribbb)
VALUES ("'.$numero.'","'.$posX.'","'.$posY.'","'.$rayon.'","'.$couleur.'","'.$gottheball.'","'.$setball.'","'.$sedeplace.'","'.$tiring.'","'.$isDragging.'","'.$idPlanCharge.'","'.$dribb.'");'); VALUES ("'.$numero.'","'.$posX.'","'.$posY.'","'.$rayon.'","'.$couleur.'","'.$gottheball.'","'.$setball.'","'.$sedeplace.'","'.$tiring.'","'.$isDragging.'","'.$idPlanCharge.'","'.$dribb.'");');
@ -1106,7 +1106,7 @@
$zonedit=$_POST['zonedit'.$j]; $zonedit=$_POST['zonedit'.$j];
$state = $db->query('INSERT INTO ZONE (X,Y,rayon,isDragging,edit,appartient,numero) $state = $db->query('INSERT INTO ZONE (X,Y,rayon,isDragging,edit,appartient,numero)
VALUES ("'.$zonX.'","'.$zonY.'","'.$zonrayon.'","'.$zonisDragging.'","'.$zonedit.'","'.$idPlanCharge.'","'.$zonenum.'");'); VALUES ("'.$zonX.'","'.$zonY.'","'.$zonrayon.'","'.$zonisDragging.'","'.$zonedit.'","'.$appar.'","'.$zonenum.'");');
} }
echo "ok"; echo "ok";

@ -234,9 +234,9 @@ function draw() {
dribdeu(); dribdeu();
} }
if(dribblement.length%4 == 0 && dribblement.length>0){ if(dribblement.length%4 == 0 && dribblement.length>0){
dribblage(); dribblage();
} }
if(currentdep == 1 || deple.length > 0){ if(currentdep == 1 || deple.length > 0){
deplacer(); deplacer();
} }
if(nbzone == 1){ if(nbzone == 1){
@ -264,10 +264,10 @@ for (var i = 0; i < adversaire.length; i++) {
if(r.setball == true){ if(r.setball == true){
r.fill = "green"; r.fill = "green";
} }
tx = r.a + r.rayon*Math.cos(r.angle); tx = r.x + r.rayon*Math.cos(r.angle);
ty = r.b+ r.rayon *Math.sin(r.angle); ty = r.y+ r.rayon *Math.sin(r.angle);
px = r.a + r.rayon*Math.cos(r.inverse); px = r.x + r.rayon*Math.cos(r.inverse);
py = r.b+ r.rayon *Math.sin(r.inverse); py = r.y+ r.rayon *Math.sin(r.inverse);
rx = tx + r.rretour *Math.cos(r.rangle); rx = tx + r.rretour *Math.cos(r.rangle);
ry = ty+ r.rretour *Math.sin(r.rangle); ry = ty+ r.rretour *Math.sin(r.rangle);
ox = px + r.rretour*Math.cos(r.rangle); ox = px + r.rretour*Math.cos(r.rangle);
@ -323,15 +323,15 @@ function myDown(e) {
untoggleDonner(); untoggleDonner();
} }
else else
window.alert("Un seul ballon sur le terrain"); window.alert("Un seul ballon sur le terrain");
ball = false; ball = false;
draw(); draw();
} }
} }
untoggleDonner(); untoggleDonner();
ball = false; ball = false;
} }
if(edit == true){ if(edit == true){
dragok = false; dragok = false;
for (var i = 0; i < zone.length; i++) { for (var i = 0; i < zone.length; i++) {
var r = zone[i]; var r = zone[i];
@ -437,22 +437,22 @@ function myDown(e) {
for(h = 0;h< (nbptsdep/4);h++){ for(h = 0;h< (nbptsdep/4);h++){
var r = deple[3+h*4]; var r = deple[3+h*4];
if (mx > r.x - 2*r.rayon && mx < r.x + 2*r.rayon && my > r.y - 2*r.rayon && my < r.y + 2*r.rayon) { if (mx > r.x - 2*r.rayon && mx < r.x + 2*r.rayon && my > r.y - 2*r.rayon && my < r.y + 2*r.rayon) {
r.ec = true; r.ec = true;
ecra = false; ecra = false;
untoggleecran(); untoggleecran();
draw(); draw();
} }
} }
for(h = 0;h< (nbdepdeu/2);h++){ for(h = 0;h< (nbdepdeu/2);h++){
var r = depdeu[1+h*2]; var r = depdeu[1+h*2];
if (mx > r.x - 2*r.rayon && mx < r.x + 2*r.rayon && my > r.y - 2*r.rayon && my < r.y + 2*r.rayon) { if (mx > r.x - 2*r.rayon && mx < r.x + 2*r.rayon && my > r.y - 2*r.rayon && my < r.y + 2*r.rayon) {
r.ec = true; r.ec = true;
ecra = false; ecra = false;
untoggleecran(); untoggleecran();
draw(); draw();
} }
} }
} }
@ -689,7 +689,7 @@ if(passable == true ){
} }
} }
if(tirable == true){ if(tirable == true){
for (var i = 0; i < joueurs.length; i++) { for (var i = 0; i < joueurs.length; i++) {
var r = joueurs[i]; var r = joueurs[i];
if (mx > r.x - r.rayon && mx < r.x + r.rayon && my > r.y - r.rayon && my < r.y + r.rayon) { if (mx > r.x - r.rayon && mx < r.x + r.rayon && my > r.y - r.rayon && my < r.y + r.rayon) {
if(r.gottheball == true){ if(r.gottheball == true){
@ -845,35 +845,36 @@ function myMove(e) {
r.x += dx; r.x += dx;
r.y += dy; r.y += dy;
if(r.sedeplace == true){ if(r.sedeplace == true){
var a = deple.length/4; var a = deple.length/4;
for(var h = 0;h<a;h++){ for(var h = 0;h<a;h++){
if(deple[h*4].jbase == i){ if(deple[h*4].jbase == i){
deple[h*4].x += dx; deple[h*4].x += dx;
deple[h*4].y += dy; deple[h*4].y += dy;
} }
} }
var b = depdeu.length/2; var b = depdeu.length/2;
for(var h = 0;h<b;h++){ for(var h = 0;h<b;h++){
if(depdeu[h*2].jbase == i){ if(depdeu[h*2].jbase == i){
depdeu[0+h*2].x += dx; depdeu[0+h*2].x += dx;
depdeu[0+h*2].y += dy; depdeu[0+h*2].y += dy;
} }
} }
} }
if(r.dribbb == true){ if(r.dribbb == true){
var a = dribblement.length/4; var a = dribblement.length/4;
for(var h = 0;h<a;h++){ for(var h = 0;h<a;h++){
if(dribblement[h*4].dbase == i){ if(dribblement[h*4].dbase == i){
dribblement[h*4].x += dx; dribblement[h*4].x += dx;
dribblement[h*4].y += dy; dribblement[h*4].y += dy;
} }
} }
var b = drideu.length/2; var b = drideu.length/2;
for(var h = 0;h<b;h++){ for(var h = 0;h<b;h++){
if(drideu[h*2].dbase == i){ if(drideu[h*2].dbase == i){
drideu[0+h*2].x += dx; console.log("ok");
drideu[0+h*2].y += dy; drideu[0+h*2].x += dx;
} drideu[0+h*2].y += dy;
}
} }
} }
} }
@ -1500,7 +1501,7 @@ function triggerfairepasse(){
} }
function addj(a){ function addj(a){
jpass.push({ jpass.push({
c : a, c : a,
}); });
} }
@ -1775,11 +1776,11 @@ function tire(){
untoggletire(); untoggletire();
} }
else{ else{
tirable = true; tirable = true;
toggletire(); toggletire();
} }
} }
else{ else{
tirable = false; tirable = false;
untoggletire(); untoggletire();
} }
@ -2029,17 +2030,17 @@ function centreIntervalle(xa, ya, xb, yb, nbIntervalle, intervalles,abon) {
ctx.lineTo(pointsATracer[i + 8], pointsATracer[i + 9]); ctx.lineTo(pointsATracer[i + 8], pointsATracer[i + 9]);
} }
if(nbIntervalle % 2 == 0) { if(nbIntervalle % 2 == 0) {
ctx.moveTo(pointsATracer[taillePointsATracer - 4], pointsATracer[taillePointsATracer - 3]); ctx.moveTo(pointsATracer[taillePointsATracer - 4], pointsATracer[taillePointsATracer - 3]);
ctx.lineTo(xb, yb); ctx.lineTo(xb, yb);
console.log("Pair"); console.log("Pair");
} }
if(nbIntervalle % 2 == 1) { if(nbIntervalle % 2 == 1) {
ctx.moveTo(pointsATracer[taillePointsATracer - 2], pointsATracer[taillePointsATracer - 1]); ctx.moveTo(pointsATracer[taillePointsATracer - 2], pointsATracer[taillePointsATracer - 1]);
ctx.lineTo(xb, yb); ctx.lineTo(xb, yb);
} }
} }
else{ else{
for(let i = 0; i < taillePointsATracer - 16; i = i + 8) { for(let i = 0; i < taillePointsATracer - 16; i = i + 8) {
ctx.moveTo(pointsATracer[i], pointsATracer[i + 1]); ctx.moveTo(pointsATracer[i], pointsATracer[i + 1]);
@ -3242,6 +3243,7 @@ function updateBtn() {
var dribbb= document.getElementById('dribbb'+i); var dribbb= document.getElementById('dribbb'+i);
dribbb.value= R.dribbb; dribbb.value= R.dribbb;
dribbb.parentElement.submit(); dribbb.parentElement.submit();
console.log(R);
} }
@ -3658,218 +3660,215 @@ function charge() {
var inverse =parseInt(depinverse); var inverse =parseInt(depinverse);
if(i==0){ if(i==0){
deple.push({ deple.push({
x : X, x : X,
y : Y, y : Y,
edit : depedit, edit : depedit,
rayon : rayon, rayon : rayon,
isDragging : false, isDragging : false,
ec :depec, ec :depec,
hig : dephig, hig : dephig,
angle : angle, angle : angle,
inverse : inverse, inverse : inverse,
jbase : dbase, jbase : dbase,
}); });
}else{ }else{
deple.push({ deple.push({
x : X, x : X,
y : Y, y : Y,
edit : depedit, edit : depedit,
rayon : rayon, rayon : rayon,
isDragging : false, isDragging : false,
ec :depec, ec :depec,
hig : dephig, hig : dephig,
angle : angle, angle : angle,
inverse : inverse, inverse : inverse,
}); });
} }
} }
console.log(deple); console.log(deple);
nbptsdep=tailledep; nbptsdep=tailledep;
var tailledep2=document.getElementById('tailledep2').value;
console.log(tailledep2);
for (var i = 0; i <= tailledep2-1 ; i++) {
var tailledep2=document.getElementById('tailledep2').value; var dep2X= document.getElementById('dep2X'+i).value;
console.log(tailledep2); var X2 =parseInt(dep2X);
for (var i = 0; i <= tailledep-1 ; i++) { var dep2Y= document.getElementById('dep2Y'+i).value;
var Y2 =parseInt(dep2Y);
var dep2X= document.getElementById('dep2X'+i).value; var dep2edit= document.getElementById('dep2edit'+i).value;
var X2 =parseInt(dep2X); if (dep2edit == 'true'){
var dep2Y= document.getElementById('dep2Y'+i).value; dep2edit = true;
var Y2 =parseInt(dep2Y); }else{
var dep2edit= document.getElementById('dep2edit'+i).value; dep2edit = false;
if (dep2edit == 'true'){ }
dep2edit = true; var dep2rayon= document.getElementById('dep2rayon'+i).value;
}else{ var rayon2 =parseInt(dep2rayon);
dep2edit = false; var dep2dbase= document.getElementById('dep2dbase'+i).value;
} var dbase2 =parseInt(dep2dbase);
var dep2rayon= document.getElementById('dep2rayon'+i).value; var dep2ec= document.getElementById('dep2ec'+i).value;
var rayon2 =parseInt(dep2rayon); if (dep2ec == 'true'){
var dep2dbase= document.getElementById('dep2dbase'+i).value; dep2ec = true;
var dbase2 =parseInt(dep2dbase); }else{
var dep2ec= document.getElementById('dep2ec'); dep2ec = false;
if (dep2ec == 'true'){
dep2ec = true;
}else{
dep2ec = false;
}
var dep2hig= document.getElementById('dep2hig'+i).value;
if (dep2hig == 'true'){
dep2hig = true;
}else{
dep2hig = false;
}
var dep2angle= document.getElementById('dep2angle');
var angle2 =parseInt(dep2angle);
var dep2inverse= document.getElementById('dep2inverse');
var inverse2 =parseInt(dep2inverse);
depdeu.push({
x : X2,
y : Y2,
edit : dep2edit,
rayon : rayon2,
isDragging : false,
ec : dep2ec,
hig : dep2hig,
angle : angle2,
inverse : inverse2,
});
} }
console.log(depdeu); var dep2hig= document.getElementById('dep2hig'+i).value;
nbdepdeu=tailledep2; if (dep2hig == 'true'){
dep2hig = true;
}else{
dep2hig = false;
}
var dep2angle= document.getElementById('dep2angle'+i).value;
var angle2 =parseInt(dep2angle);
var dep2inverse= document.getElementById('dep2inverse'+i).value;
var inverse2 =parseInt(dep2inverse);
depdeu.push({
x : X2,
y : Y2,
edit : dep2edit,
rayon : rayon2,
isDragging : false,
ec : dep2ec,
hig : dep2hig,
angle : angle2,
inverse : inverse2,
jbase : dbase2,
});
}
console.log(depdeu);
nbdepdeu=tailledep2;
var tailledri=document.getElementById('tailledri').value;
console.log(tailledri);
for (var i = 0; i <= tailledri-1 ; i++) {
var driX= document.getElementById('driX'+i).value; var tailledri=document.getElementById('tailledri').value;
var dX =parseInt(driX); console.log(tailledri);
var driY= document.getElementById('driY'+i).value; for (var i = 0; i <= tailledri-1 ; i++) {
var dY =parseInt(driY);
var driedit= document.getElementById('driedit'+i).value;
if (driedit == 'true'){
driedit = true;
}else{
driedit = false;
}
var drirayon= document.getElementById('drirayon'+i).value;
var drayon =parseInt(drirayon);
var dridbase= document.getElementById('dridbase'+i).value;
var ddbase =parseInt(dridbase);
dribblement.push({
x : dX,
y: dY,
edit : driedit,
rayon : drayon,
dbase : ddbase,
});
} var driX= document.getElementById('driX'+i).value;
nbptsdib=tailledri; var dX =parseInt(driX);
var driY= document.getElementById('driY'+i).value;
var dY =parseInt(driY);
var driedit= document.getElementById('driedit'+i).value;
if (driedit == 'true'){
driedit = true;
}else{
driedit = false;
}
var drirayon= document.getElementById('drirayon'+i).value;
var drayon =parseInt(drirayon);
var dridbase= document.getElementById('dridbase'+i).value;
var ddbase =parseInt(dridbase);
dribblement.push({
x : dX,
y: dY,
edit : driedit,
rayon : drayon,
dbase : ddbase,
});
}
nbptsdib=tailledri;
var tailledri2=document.getElementById('tailledri2').value;
console.log(tailledri2);
for (var i = 0; i <= tailledri2-1 ; i++) {
var dri2X= document.getElementById('dri2X'+i).value; var tailledri2=document.getElementById('tailledri2').value;
var d2X =parseInt(dri2X); console.log(tailledri2);
var dri2Y= document.getElementById('dri2Y'+i).value; for (var i = 0; i <= tailledri2-1 ; i++) {
var d2Y =parseInt(dri2Y);
var dri2edit= document.getElementById('dri2edit'+i).value;
if (dri2edit == 'true'){
dri2edit = true;
}else{
dri2edit = false;
}
var dri2rayon= document.getElementById('dri2rayon'+i).value;
var d2rayon =parseInt(dri2rayon);
var dri2dbase= document.getElementById('dri2dbase'+i).value;
var d2dbase =parseInt(dri2dbase);
drideu.push({
x : d2X,
y : d2Y,
edit : dri2edit,
rayon : d2rayon,
isDragging : false,
dbase : d2dbase,
});
} var dri2X= document.getElementById('dri2X'+i).value;
console.log(drideu); var d2X =parseInt(dri2X);
nbdrideu=tailledri2; var dri2Y= document.getElementById('dri2Y'+i).value;
var d2Y =parseInt(dri2Y);
var dri2edit= document.getElementById('dri2edit'+i).value;
if (dri2edit == 'true'){
dri2edit = true;
}else{
dri2edit = false;
}
var dri2rayon= document.getElementById('dri2rayon'+i).value;
var d2rayon =parseInt(dri2rayon);
var dri2dbase= document.getElementById('dri2dbase'+i).value;
var d2dbase =parseInt(dri2dbase);
drideu.push({
x : d2X,
y : d2Y,
edit : dri2edit,
rayon : d2rayon,
isDragging : false,
dbase : d2dbase,
});
}
console.log(drideu);
nbdrideu=tailledri2;
var taillepasse=document.getElementById('taillepasse').value;
console.log(taillepasse);
for (var i = 0; i <= taillepasse-1 ; i++) {
var passedep= document.getElementById('passedep'+i).value; var taillepasse=document.getElementById('taillepasse').value;
var dep =parseInt(passedep) -1 ; console.log(taillepasse);
var passearr= document.getElementById('passearr'+i).value; for (var i = 0; i <= taillepasse-1 ; i++) {
var arr =parseInt(passearr) -1 ;
passes.push({
x: joueurs[dep],
y: joueurs[dep],
x2 : joueurs[arr],
y2 : joueurs[arr],
});
}
var passedep= document.getElementById('passedep'+i).value;
var dep =parseInt(passedep) -1 ;
var passearr= document.getElementById('passearr'+i).value;
var arr =parseInt(passearr) -1 ;
passes.push({
x: joueurs[dep],
y: joueurs[dep],
x2 : joueurs[arr],
y2 : joueurs[arr],
});
}
var taillezone=document.getElementById('taillezone').value;
console.log(taillezone);
for (var i = 0; i <= taillezone-1 ; i++) {
var zoneX= document.getElementById('zoneX'+i).value; var taillezone=document.getElementById('taillezone').value;
var zX =parseInt(zoneX); console.log(taillezone);
var zoneY= document.getElementById('zoneY'+i).value; for (var i = 0; i <= taillezone-1 ; i++) {
var zY =parseInt(zoneY);
var zonerayon= document.getElementById('zonerayon'+i).value;
var zrayon =parseInt(zonerayon);
var zoneisDragging= document.getElementById('zoneisDragging'+i).value;
if (zoneisDragging == 'true'){
zoneisDragging = true;
}else{
zoneisDragging = false;
}
var zoneedit= document.getElementById('zoneedit'+i).value;
if (zoneedit == 'true'){
zoneedit = true;
}else{
zoneedit = false;
}
zone.push({
x : zX, var zoneX= document.getElementById('zoneX'+i).value;
y : zY, var zX =parseInt(zoneX);
edit : zoneedit, var zoneY= document.getElementById('zoneY'+i).value;
rayon : zrayon, var zY =parseInt(zoneY);
isDragging : zoneisDragging, var zonerayon= document.getElementById('zonerayon'+i).value;
}); var zrayon =parseInt(zonerayon);
var zoneisDragging= document.getElementById('zoneisDragging'+i).value;
if (zoneisDragging == 'true'){
zoneisDragging = true;
}else{
zoneisDragging = false;
} }
if(taillezone>2){ var zoneedit= document.getElementById('zoneedit'+i).value;
if (zoneedit == 'true'){
nbzone=1; zoneedit = true;
nbpoints=taillezone; }else{
console.log(zone); zoneedit = false;
console.log(nbzone);
} }
draw(); zone.push({
x : zX,
y : zY,
edit : zoneedit,
rayon : zrayon,
isDragging : zoneisDragging,
});
}
if(taillezone>2){
nbzone=1;
nbpoints=taillezone;
console.log(zone);
console.log(nbzone);
}
draw();
} }

Loading…
Cancel
Save