From 7bbbc7e36b4ffca85667d6c9ad9bed547b9cbf44 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Sat, 5 May 2018 19:20:19 +0200 Subject: [PATCH] Refactoring --- .vs/AAWeb/v15/.suo | Bin 70656 -> 70656 bytes FloatingSpace/FloatingLayer.js | 36 ++++++++++++++++----------------- server.js | 2 +- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/.vs/AAWeb/v15/.suo b/.vs/AAWeb/v15/.suo index c4ccd2e2d274128ea08f6bd2539e7b10e6da0480..4444a05f457dc789c3fccd67fc904c1e2da026c6 100644 GIT binary patch delta 375 zcmZoz!P2mTWkU`VD+BlUFH<%bGW}*|P58K>2FPS%7hn|HTq*Y76GSDnYjO(-GcW)V z11H0h$rC5$PHyPsm|QT|VDjp&iIXQxTnMBSCiBfO++5rv%gTtNWV7L7WpLx+dp2-(i=>bjSn0(}^^X8IO?TnL^ZpdwxTl1K4 z@}mvnn}yf?V%jXU@tqJ}R}}ZmpBxpfHrb%d3gi-yt2PTAuj9hvn#qo3GSdZw7+E$e z{CdbZxoMIRP{$RqN=Bfgz(D9gH;^3-WV`eOy&FII{!Grv2{UJJy1~dXIdHZg92V}Cb3o!C-t`z(438E6(HMw|&85n?w zfsct?WPxtO$rC0no4lbbVY0(9!_CD#vaFLGyBBUYn{?Ut$EBi zx%i3DW{Gvbm^Sln{47L-^}URnPE6oLb^_aEr!wj30z!-|n-#7+V1&BnCF7N|w1IWe3#Q2vdo?EOZg{$x_w{ED0CxCrAOHXW diff --git a/FloatingSpace/FloatingLayer.js b/FloatingSpace/FloatingLayer.js index a50e97ae7..e702f50c5 100644 --- a/FloatingSpace/FloatingLayer.js +++ b/FloatingSpace/FloatingLayer.js @@ -19,7 +19,7 @@ function newFloatingLayer() { initialize: initialize }; - let innactiveFloatingObjects = []; + let invisibleFloatingObjects = []; let maxTargetRepulsionForce = 0.0005; @@ -38,9 +38,9 @@ function newFloatingLayer() { if (INFO_LOG === true) { logger.write("[INFO] addFloatingObject -> Entering function."); } - innactiveFloatingObjects.push(pFloatingObject); + invisibleFloatingObjects.push(pFloatingObject); - if (INFO_LOG === true) { logger.write("[INFO] addFloatingObject -> innactiveFloatingObjects.length = " + innactiveFloatingObjects.length); } + if (INFO_LOG === true) { logger.write("[INFO] addFloatingObject -> invisibleFloatingObjects.length = " + invisibleFloatingObjects.length); } pFloatingObject.handle = Math.floor((Math.random() * 10000000) + 1); @@ -53,16 +53,16 @@ function newFloatingLayer() { if (INFO_LOG === true) { logger.write("[INFO] removeFloatingObject -> Entering function."); } - for (let i = 0; i < innactiveFloatingObjects.length; i++) { + for (let i = 0; i < invisibleFloatingObjects.length; i++) { - let floatingObject = innactiveFloatingObjects[i]; + let floatingObject = invisibleFloatingObjects[i]; if (floatingObject.handle === pFloatingObjectHandle) { - innactiveFloatingObjects.splice(i, 1); // Delete item from array. + invisibleFloatingObjects.splice(i, 1); // Delete item from array. if (INFO_LOG === true) { logger.write("[INFO] removeFloatingObject -> floatingObject.handle = " + floatingObject.handle); } - if (INFO_LOG === true) { logger.write("[INFO] removeFloatingObject -> Removing floatingObject from innactiveFloatingObjects."); } - if (INFO_LOG === true) { logger.write("[INFO] removeFloatingObject -> innactiveFloatingObjects.length = " + innactiveFloatingObjects.length); } + if (INFO_LOG === true) { logger.write("[INFO] removeFloatingObject -> Removing floatingObject from invisibleFloatingObjects."); } + if (INFO_LOG === true) { logger.write("[INFO] removeFloatingObject -> invisibleFloatingObjects.length = " + invisibleFloatingObjects.length); } return; } @@ -88,9 +88,9 @@ function newFloatingLayer() { if (INFO_LOG === true) { logger.write("[INFO] getFloatingObject -> Entering function."); } - for (let i = 0; i < innactiveFloatingObjects.length; i++) { + for (let i = 0; i < invisibleFloatingObjects.length; i++) { - let floatingObject = innactiveFloatingObjects[i]; + let floatingObject = invisibleFloatingObjects[i]; if (floatingObject.handle === pFloatingObjectHandle) { @@ -252,9 +252,9 @@ function newFloatingLayer() { /* Now we check if any of the created FloatingObjects where enabled to run under the Physics Engine. */ - for (let i = 0; i < innactiveFloatingObjects.length; i++) { + for (let i = 0; i < invisibleFloatingObjects.length; i++) { - let floatingObject = innactiveFloatingObjects[i]; + let floatingObject = invisibleFloatingObjects[i]; let payload = { position: undefined, @@ -296,11 +296,11 @@ function newFloatingLayer() { if (INFO_LOG === true) { logger.write("[INFO] physicsLoop -> floatingObject added to thisObject.floatingObjects"); } if (INFO_LOG === true) { logger.write("[INFO] physicsLoop -> thisObject.floatingObjects.length = " + thisObject.floatingObjects.length); } - innactiveFloatingObjects.splice(i, 1); // Delete item from array. + invisibleFloatingObjects.splice(i, 1); // Delete item from array. if (INFO_LOG === true) { logger.write("[INFO] physicsLoop -> floatingObject.handle = " + floatingObject.handle); } - if (INFO_LOG === true) { logger.write("[INFO] physicsLoop -> floatingObject removed from innactiveFloatingObjects"); } - if (INFO_LOG === true) { logger.write("[INFO] physicsLoop -> innactiveFloatingObjects.length = " + innactiveFloatingObjects.length); } + if (INFO_LOG === true) { logger.write("[INFO] physicsLoop -> floatingObject removed from invisibleFloatingObjects"); } + if (INFO_LOG === true) { logger.write("[INFO] physicsLoop -> invisibleFloatingObjects.length = " + invisibleFloatingObjects.length); } return; // Only one at the time. @@ -340,11 +340,11 @@ function newFloatingLayer() { if (INFO_LOG === true) { logger.write("[INFO] physicsLoop -> payload.visible = " + payload.visible); } - innactiveFloatingObjects.push(floatingObject); + invisibleFloatingObjects.push(floatingObject); if (INFO_LOG === true) { logger.write("[INFO] physicsLoop -> floatingObject.handle = " + floatingObject.handle); } - if (INFO_LOG === true) { logger.write("[INFO] physicsLoop -> floatingObject added to innactiveFloatingObjects"); } - if (INFO_LOG === true) { logger.write("[INFO] physicsLoop -> innactiveFloatingObjects.length = " + innactiveFloatingObjects.length); } + if (INFO_LOG === true) { logger.write("[INFO] physicsLoop -> floatingObject added to invisibleFloatingObjects"); } + if (INFO_LOG === true) { logger.write("[INFO] physicsLoop -> invisibleFloatingObjects.length = " + invisibleFloatingObjects.length); } thisObject.floatingObjects.splice(i, 1); // Delete item from array. diff --git a/server.js b/server.js index f4b180fca..626140bfd 100644 --- a/server.js +++ b/server.js @@ -6,7 +6,7 @@ if (CONSOLE_LOG === true) { } -const DEBUG_MODE = false; // This forces the server to read Plotters from the local drive. +const DEBUG_MODE = true; // This forces the server to read Plotters from the local drive. if (CONSOLE_LOG === true && DEBUG_MODE === true) {