From cb7b068f379cb93c16b450b715aba66bdac0f631 Mon Sep 17 00:00:00 2001
From: Luis Fernando Molina <Luis-Fernando-Molina@users.noreply.github.com>
Date: Sat, 21 Apr 2018 11:32:03 +0200
Subject: [PATCH] Floting Space code tidied

---
 .vs/AAWeb/v15/.suo | Bin 37888 -> 40448 bytes
 Canvas.js          |  10 +++++-----
 FloatingSpace.js   |   2 ++
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/.vs/AAWeb/v15/.suo b/.vs/AAWeb/v15/.suo
index 29e42e45e4e6dd107c4c482120d67abf6d9a85ad..a5b7f4cbe018ce91986e0e88644283d502d1c0f7 100644
GIT binary patch
delta 2181
zcmc&#Z%kWN6o2>bl~-sf-3Ek7DW$8UvI3nhONJnA+F-{VwgU`>1z}O6gh345WW<dp
zBg81i_MQE6ep$f8CHvs){iY@>4t3KH;=d)v#qh=WQKKx1AFSuJuN4+aT;iY8{CfV}
zd(J!eykBqCOI&@A$Gr|N>0*_n3N*?8J)KTdbQ9w3$Xg83>;S8U8eVM)e<zQ1e*Fcr
z)A|E2Q82+if!hV?g4fY+Gr@10>_My~$%sk>R!W;uTM$Ns2~mdFj3`EwBb*4@SA@D0
zL63(+@<q2_cLMr`hjmSxNkZs%AQF*M*_Y9a8XvYSb-#R)dfbH}>XF~sqf#f=XSSD4
z-itb0ES;u4sK=a7`X2NRh^+_*q6D!8;X=@Q6>6JqKd9?Q)Lz}DJvrI7CRUxb3)6LI
zWDdM&47>K}PA;Pz{r!kX5C;%#h(zSNR^;23KvP2i;xyt6;w<7E)L6H|a8dle_t9HG
zQ1xr57ZD#IK16(kxQ@7i_!yY!n}4IEB~UCed;sx*P6Uy97rOvQEtBjuxNYeu&P0hF
z`PK7qwB%7Uk$^%Zlq6P4x?~7hJbxz}f_AT1DGPHm@r?MEFB97xW@aKeu{Rer&=wh1
ztM;4s=;7Rwh}kiLsO(;oU>Zl~6aq!0_XQaQDpj~vunSfyyNpDXKl5#~Ea~7Jc=IuS
zr5Glf+s(vsVo+`qtki|g^iv^f<%6-7S<T}Rjs`a~D(e;+XXkcs%^uvKTRP3!ZVj1k
z#p-s2gKD#a)w$bDgeBtUo+e_>E@mW;geDFvgC61VEVDT;Pg)&ZILgu9Q=nCZjJ4}B
zHy){2ZBcl#J&>P|A#<;YRlj1?Y@v0>5;2_A++m*VNO98@yclSViu4L3`W}~iM@Nr<
zH?kAn=p2AoPbkoG!VUhe1pFL{Lto@PoI3au{MaYM-s3w<kZ_DhNAiqseF0gKg6ktC
z3Kee{8gmDl4t0+`Ip^YVF;Z#FMPaa~Cj0!QXj^$GTNb~UuMXiiT@JxG_Gp7tPYM<~
z1CZ)260Og^z~FM!4VR)LwwH3vV9o`!cTmn*7Hsl1d9~*8yJiJ^7LLNZky@elFS5IN
zlgTGi#{Y7(h56Ca5dXP}mjCrci77OfdG#2FWbX|~jhhV?9C#JX_B{n`W)fP*{Tr+d
z)cg7HFf>Ly;OHNKn^E6<YMjAWQNLJt-p{Jf;Y-WP^3^xdp!<XFE&78*fgheLgT0y^
zoT^>v`ILU)68NWUVMN^msgrJS1}oTh!6sW7Je`<<`_(4vt)a_>Ef4+rPSF4D&9+~@
zpB76~UIw3sJYrb=l4&#Q9Sz}mlJmYP4vqZ|(2h6!56w-*8^p-8#=tk_60R3-F)i-X
rJ3eh#8`Lxv4kyatvABgDgqo?q=3Z$OKS!hnX-FEw={Ut;Tw#9zNm=g%

delta 1998
zcmcgtUrbYH6#u@j|1RaWbSel)TPUCmD{E)wTo$CY4Wc8og+2i84-dR-F?+g_4(BLy
z(`6x(-ou<uOeVaTm>AakvMftzhfhlsjfv63Y{ZxOv}{X_vIn|z+Fo)^_ONWrKJv@?
z&Y$nx^S7kG6X`2rHsEIZaWQ7YyFhFdi$xN1Xt8YndTgGn)??14+h<M>-oL{=sK^Ci
z(mKh%hsWZkgQInE7fOjjVt1Q$4w+x<@Q2A0-G)~)Vn;>qMCw3PBk+q%LewFiL)Z~M
z1o@GXQW&*J;dS#@?IFB`5fKC#9I8;d)9FKgBa`?^75&@{EyC-(^{eS)3OI-w3Rsi_
zE^dZr>*Q|Aa3o;xMFCh0Jo#=!-iv5QG$U#dTM%ss(o+&mmHVp|+JN*0^uD#Bz9Jz@
zN{LP<%Jx9swF@3ees?c&hYeOo@ctU2AF-hYt7|y4xm-=3BYO_<1>!v70^&==MFbqP
z&pOC^9vPxoizli*^ba38BM{jZ<N(K=Q(T3|&H)FfwozLserhw%!10=xO!Gh@IwaN#
zHA%BXz11bpx*@4?S}JagRVurwjSHDZhekzr1xo!YteAr8xEWFn{qjE4*$jFM8Jl5!
z#}BZwyIXayI7&~e3?@);CnddGr7tO-8Ll=);d*UAQySx3rmuAvo>)@IoYL04RRV<n
zpiDzei=#)SDgGpvXnb{v#e_^!TYugr7Iq5NE@_hMDOY__SziR*(%Ooa536C)ceuPs
zG+4S43ch$L8k)FGq0$;Fr)4!t3$1>wxoeGQ+xobqSCjGsrF~{0AhLB4;b62+#)4`}
zJtj=a=zXLo<uYpPFWIcBFC|Lh9g%5w|4wu>3kL+&Q`Q@!2VO2NjnH2eH*Ax#O%d+k
z`_X{5O@9W8J67tZr|+4*f#N~A2tt9VDF}*pCOeQ5_J^3@R&-!xur!*1s-g4n-ry`;
z9{L^Ln6g1G(E%fgF@R(@>A4jy4|^e=jKILC9d3-|vz;p#2K_4O&7zu^X{%uMXf0eE
z)gU*VgWpCwVB+Yzb=1M~SzF$V7h06)Ik=sC3*H{u51G_Ab$2QTjIAv{!aKDg`dP{3
z{-A52OThF{GhBOrOiRCcotMU%GSEwa0~W*mBi1-&P}qY#@5i2x=cIp?wsvD=n*XOs
z1t^=v^n`%fsnFuUNe=lF(-2Pe82Dw*;OtabJNrSHhwt&t8nL_hUx-$eW`#D%c=oa=
z>t!$EUw|ECFSC8@B<msrxD?+GH)G8XDp8mXuM%Z&CjJVf(;bjV)^nehPxoM+r~I0K
zZqA~fPFKF)!xwWI5n=5AkHQ2w2&vN&d@|p}$Dt(?fzYKKxcbcS>AVcC4<}%!*rLv-
fT@T*5TGf5v>9^7Fk9T{Y{QMDCbQx})SmNwY>kq%z

diff --git a/Canvas.js b/Canvas.js
index 1c0562e62..eb5cb9267 100644
--- a/Canvas.js
+++ b/Canvas.js
@@ -151,7 +151,7 @@ function newCanvas() {
 
         /* We check first if the mouse is over a ball/ */
 
-        ballBeingDragged = isInside(event.pageX, event.pageY);
+        ballBeingDragged = thisObject.floatingSpace.isInside(event.pageX, event.pageY);
 
         if (ballBeingDragged >= 0) {
             ballDragStarted = true;
@@ -187,7 +187,7 @@ function newCanvas() {
 
         /* We check first if the mouse is over a ball/ */ 
 
-        let ballBeingClicked = isInside(event.pageX, event.pageY);
+        let ballBeingClicked = thisObject.floatingSpace.isInside(event.pageX, event.pageY);
 
         if (ballBeingClicked >= 0) {
 
@@ -247,7 +247,7 @@ function newCanvas() {
 
             if (ballDragStarted === true) {
 
-                if (isInsideBall(ballBeingDragged, event.pageX, event.pageY) === false) {
+                if (thisObject.floatingSpace.isInsideBall(ballBeingDragged, event.pageX, event.pageY) === false) {
 
                     /* This means that the user stop moving the mouse and the ball ball out of the pointer.
                     In this case we cancell the drag operation . */
@@ -273,7 +273,7 @@ function newCanvas() {
             browserCanvas.style.cursor = "grabbing";
             thisObject.eventHandler.raiseEvent("Dragging", undefined);
 
-            let targetBall = isInside(event.pageX, event.pageY);
+            let targetBall = thisObject.floatingSpace.isInside(event.pageX, event.pageY);
 
             if (ballDragStarted) {
 
@@ -384,7 +384,7 @@ function newCanvas() {
         var event = window.event || event; // old IE support
         let delta = Math.max(-1, Math.min(1, event.wheelDelta || -event.detail));
 
-        let ballIndex = isInside(event.pageX, event.pageY);
+        let ballIndex = thisObject.floatingSpace.isInside(event.pageX, event.pageY);
 
         if (ballIndex >= 0) {
 
diff --git a/FloatingSpace.js b/FloatingSpace.js
index 8e4376648..359ef6c0b 100644
--- a/FloatingSpace.js
+++ b/FloatingSpace.js
@@ -9,6 +9,8 @@ function newFloatingSpace() {
 
     let thisObject = {
         physicsLoop: physicsLoop,
+        isInside: isInside,
+        isInsideBall: isInsideBall,
         balls: [],   // <-- TODO: Check if this is really needed here. 
         initialize: initialize
     };