Browse Source

chore: various code style

bdestombes 3 years ago
parent
commit
b52afc858a
1 changed files with 39 additions and 38 deletions
  1. 39 38
      emitter/backend/server.js

+ 39 - 38
emitter/backend/server.js

@@ -9,23 +9,22 @@ const oscClient = new Client('127.0.0.1', 3333);
 let alive = [];
 let fseq;
 
-var objTriangle = [] ;
+const objTriangle = [] ;
 
 function getHypotenuse(touch1, touch2) {
-	var x = Math.abs(touch1.x - touch2.x);
-	var y = Math.abs(touch1.y - touch2.y);
+	const x = Math.abs(touch1.x - touch2.x);
+	const y = Math.abs(touch1.y - touch2.y);
 	return Math.sqrt(Math.pow(x, 2) + Math.pow(y, 2));
 }
 
-
 function getTop(dotTrio) {
-	var dist01 = getHypotenuse(dotTrio[0], dotTrio[1]);
-	var dist02 = getHypotenuse(dotTrio[0], dotTrio[2]);
-	var dist12 = getHypotenuse(dotTrio[1], dotTrio[2]);
+	const dist01 = getHypotenuse(dotTrio[0], dotTrio[1]);
+	const dist02 = getHypotenuse(dotTrio[0], dotTrio[2]);
+	const dist12 = getHypotenuse(dotTrio[1], dotTrio[2]);
 
-	var diff01m02 = Math.abs(dist01 - dist02);
-	var diff01m12 = Math.abs(dist01 - dist12);
-	var diff02m12 = Math.abs(dist02 - dist12);
+	const diff01m02 = Math.abs(dist01 - dist02);
+	const diff01m12 = Math.abs(dist01 - dist12);
+	const diff02m12 = Math.abs(dist02 - dist12);
 
 	if (diff01m02 < diff02m12 && diff01m02 < diff01m12) {return 0;}
 	else if (diff01m12<diff01m02 && diff01m12<diff02m12) {return 1;}
@@ -33,7 +32,9 @@ function getTop(dotTrio) {
 }
 
 function getAngleApex(dotTrio, topIndex) {
-	var dotA, dotB, dotC;
+	let dotA;
+	let dotB;
+	let dotC;
 	dotB = dotTrio[topIndex];
 	if (topIndex == 0) {
 		dotA = dotTrio[1];
@@ -48,19 +49,21 @@ function getAngleApex(dotTrio, topIndex) {
 		dotC = dotTrio[1];
 	}
 
-	var AB = [dotB.x - dotA.x, dotB.y - dotA.y] ;
-	var CB = [dotB.x - dotC.x, dotB.y - dotC.y] ;
-	
-	var dotProd = (AB[0] * CB[0] + AB[1] * CB[1]);
-	var crossProd = (AB[0]*CB[1] - AB[1] * CB[0]);
+	const AB = [dotB.x - dotA.x, dotB.y - dotA.y] ;
+	const CB = [dotB.x - dotC.x, dotB.y - dotC.y] ;
+
+	const dotProd = (AB[0] * CB[0] + AB[1] * CB[1]);
+	const crossProd = (AB[0]*CB[1] - AB[1] * CB[0]);
 
-	var alpha = Math.atan2(crossProd, dotProd);
+	const alpha = Math.atan2(crossProd, dotProd);
 	//return alpha ;
 	return Math.floor(alpha * 180. / Math.PI + 0.5) ;
 }
 
 function getOrientation(dotTrio, topIndex) {
-	var dotA, dotB, dotC;
+	let dotA;
+	let dotB;
+	let dotC;
 	dotB = dotTrio[topIndex];
 	if (topIndex == 0) {
 		dotA = dotTrio[1];
@@ -75,15 +78,14 @@ function getOrientation(dotTrio, topIndex) {
 		dotC = dotTrio[1];
 	}
 
-	var middlePt = [(dotA.x+dotC.x)/2 ,(dotA.y+dotC.y)/2 ] ;
-	var diff = [dotB.x - middlePt[0], dotB.y - middlePt[1]] ;
-	var length = Math.sqrt(Math.pow(diff[0],2) + Math.pow(diff[1], 2) ) ;
+	const middlePt = [(dotA.x+dotC.x)/2 ,(dotA.y+dotC.y)/2 ] ;
+	let diff = [dotB.x - middlePt[0], dotB.y - middlePt[1]] ;
+	const length = Math.sqrt(Math.pow(diff[0],2) + Math.pow(diff[1], 2) ) ;
 	//normalize diff
 	diff = [diff[0]/length, diff[1]/length];
-	var rad = Math.atan2(diff[0], diff[1]) ;
+	const rad = Math.atan2(diff[0], diff[1]) ;
  	return Math.floor( -1 * rad * 180 / Math.PI)  ;
 	 //return length ;
-	
 }
 
 const server = require('http').Server(app);
@@ -191,7 +193,7 @@ app.post('/json', function (req, res) {
 			// console.log(segments, segments.length);
 
 			/* Listage des triangles */
-			var triangles = [];
+			const triangles = [];
 			/* on boucle sur les segments */
 			segments.forEach((segment) => {
 				const dot1 = segment.identifiers[0];
@@ -223,7 +225,7 @@ app.post('/json', function (req, res) {
 
 			//MOD TITI
 			//objet pour stocker les informations des triangles identifiés (points, centre, apexAngle, orientation, indice apex, width, height)
-			 
+
 			objTriangle = {} ;
 
 			/* Définition de l'apex */
@@ -234,10 +236,12 @@ app.post('/json', function (req, res) {
 				objTriangle.dots[2] = dots[triangle[2]];
 
 				objTriangle.apex = getTop(objTriangle.dots);
-				objTriangle.center = [(objTriangle.dots[0].x+objTriangle.dots[1].x+objTriangle.dots[2].x)/3 ,
-										(objTriangle.dots[0].y+objTriangle.dots[1].y+objTriangle.dots[2].y)/3] ;
+				objTriangle.center = [
+					(objTriangle.dots[0].x+objTriangle.dots[1].x+objTriangle.dots[2].x)/3 ,
+					(objTriangle.dots[0].y+objTriangle.dots[1].y+objTriangle.dots[2].y)/3
+				];
 
-				objTriangle.angleApex = getAngleApex(objTriangle.dots, objTriangle.apex) ;				
+				objTriangle.angleApex = getAngleApex(objTriangle.dots, objTriangle.apex) ;
 				objTriangle.orientation = getOrientation(objTriangle.dots, objTriangle.apex) ;
 				// /* on récupère les 3 côtés (segments) du triangle */
 				// const segment1 = segments.find(segment => {
@@ -255,12 +259,12 @@ app.post('/json', function (req, res) {
 				// const smallestSegment = [segment1, segment2, segment3].reduce(function(prev, current) {
 				// 	return (prev.hyp < current.hyp) ? prev : current
 				// });
-				
+
 				// /* on déduit quel point du triangle est l'apex */
 				// const apexDot = triangle.find(dot => {
 				// 	return dot !== smallestSegment.identifiers[0] && dot !== smallestSegment.identifiers[1];
 				// });
-				console.log(objTriangle.apex );
+				console.log(objTriangle.apex);
 				console.log("centerPos : " + objTriangle.center + " orientation : " + objTriangle.orientation);
 
 				/* Reste à faire:
@@ -316,7 +320,7 @@ app.post('/json', function (req, res) {
 			// 		res.status(200).json(JSON.stringify(req.body));
 			// 	});
 			// }
-	
+
 
 			// oscBundle = new Bundle(
 			// 	[ '/tuio/2Dcur', 'source', `tangibles${req.body.section.toString()}@127.0.0.1` ],
@@ -339,7 +343,6 @@ app.post('/json', function (req, res) {
 			oscBundle = new Bundle ;
 			oscBundle.append([ '/tuio/2Dobj', 'alive', 1 ]);
 			if (objTriangle.dots != undefined){
-				
 				oscBundle.append([
 						'/tuio/2Dobj',
 						'set',
@@ -356,12 +359,10 @@ app.post('/json', function (req, res) {
 					]);
 				}
 				oscBundle.append([ '/tuio/2Dobj', 'fseq', fseq ]);
-			
-			oscClient.send(oscBundle, () => {
-				res.status(200).json(JSON.stringify(req.body));
-			});}
-			
-			 else {
+				oscClient.send(oscBundle, () => {
+					res.status(200).json(JSON.stringify(req.body));
+				});
+			} else {
 				res.status(400).send();
 			}
 	}