From b2fa345c9d1fd3702a4a17ac7d59f90e4fdb067b Mon Sep 17 00:00:00 2001 From: Richard Davey Date: Thu, 5 Sep 2013 03:35:12 +0100 Subject: [PATCH] console banner maker --- examples/assets/sprites/phaser-dude.png | Bin 0 -> 955 bytes examples/assets/sprites/phaser-ship.png | Bin 0 -> 402 bytes examples/assets/sprites/phaser_tiny.png | Bin 0 -> 940 bytes examples/bringToTop2.php | 41 +++++++++ examples/consoleBanner.php | 105 ++++++++++++++++++++++++ src/core/World.js | 84 +++++++++---------- 6 files changed, 188 insertions(+), 42 deletions(-) create mode 100644 examples/assets/sprites/phaser-dude.png create mode 100644 examples/assets/sprites/phaser-ship.png create mode 100644 examples/assets/sprites/phaser_tiny.png create mode 100644 examples/bringToTop2.php create mode 100644 examples/consoleBanner.php diff --git a/examples/assets/sprites/phaser-dude.png b/examples/assets/sprites/phaser-dude.png new file mode 100644 index 0000000000000000000000000000000000000000..9e0a2549275e0797e9f1af67d6df94948e212929 GIT binary patch literal 955 zcmV;s14R6ZP)fyq-dfGN?_6iv($*FX)3d64qN-5D`eL-fJN(C2C=iZzJ^aOhHq58MHBV zVP+xK!d*nS`QO(W@66nJ^HCS(-8Xa3`Ty=Y_uex@LI{d_rRlkd;};hs;s6sAqkS2t zcr9vFQ&}Na#)RynMi)71hN(&9UXbg)B*;dCh+~fIwg)zt-4ep}=6LCRtfQH=v zJ`hfod%e`QJiGpXAU!Pm2cp#o1!G9EdplJfJ{oxw%)OhULhh>;>VN?h7vcw1fi}#& z+k#RSCAADps1d0G_pi@TWrJZ~xYzB*AUo*t(wO{^QwKvhEo3UFD^;OLr>y5|WK|D2 z^RRZ%El_FWn4oS-Ryt-1fxS&Np7bnaiV^@J2Km`R=jxqW34}g4GL1C{e%pq33rDm9 zXm}1lIS|`Hha2mgfd}!#XsKY2G}%I8q`Xb23ZmO>|I*xgrg|>0m_5m9S{zN;DMGq} zn%ib^v?z60*AZFqL&6?7*IrBa`Ua%~r_FC|)HPxo_`x4K3}StGs13sqgWYdQJq9?8 zJL>u(r|$D)M%Gg`qW0V|ygUti&6v&+!U2x;nGU)!F+pq12W9W~A9gyBs%!rJG%yfd z4^1mZGtzP3^e{cO4rN78+1HTuyGPnT8JuzKI~)P%dkV1xCZ`=jI3q}_TFuqQg&X5) z6mF3A6$2o8Kd7#{>mZ!5P%lr0>cG0DRtz^J5atIi^GRp~*#wrWvs?Fz*V#roo_<4T zw(RqaKl?sU7>C`^w~t0-7##Wk(0DZ!Uam?|OZ9HA@$9;t!%qYDjjStussygj%O0Sr zhC^E0{@x|(rxn}hVKyJ_Q*LhTy}Vf9a&EKMj-SJheIk7~A_XsIm+V<``c9tzxDg_tK0 dwGjUiU;qkj;dcQqR8#-}002ovPDHLkV1lvEvlsvX literal 0 HcmV?d00001 diff --git a/examples/assets/sprites/phaser-ship.png b/examples/assets/sprites/phaser-ship.png new file mode 100644 index 0000000000000000000000000000000000000000..a58eff302bcc79c4e637ee8343347a8c34c3b302 GIT binary patch literal 402 zcmV;D0d4+?P)62KrUcnpa4)$^V_K_ zfrxm`EXX=5vV2iG9aBO2fjaZUL*bHX zE7A31^D|I?mT<}5R}h^OI6(*qfLvsUplGgq_YTDgXa=rajnB_O;A>!v;QR$?0NTd5 zU^U?Y1A@(mP`p%Lk=(VC0omJpvsb1aTMJKDEO=s~vtzFN)~P!ili?!ks~nxY*Dx|N zLiDqsSp{di+Zs7}XM+*Cp?kMXarVgp>PKj97ZR$N2KHXQ1TerlW^ZtMn@wyYfocOK zlB*1?tY(Xv_HCVtRS(2k6wSb>s%&}JKJD%M)Bs#o?L2(0t8*Uq04pm`dJpq3R&Ag} wij;*>G()738OQ)L=d<9E8!CkXsQ@6r0Ggk85+Z;56951J07*qoM6N<$f;0rC^#A|> literal 0 HcmV?d00001 diff --git a/examples/assets/sprites/phaser_tiny.png b/examples/assets/sprites/phaser_tiny.png new file mode 100644 index 0000000000000000000000000000000000000000..4db22440eb8d55827f65c50a8c488cf535fc3f96 GIT binary patch literal 940 zcmeAS@N?(olHy`uVBq!ia0vp^ia^Z4!3-oFW~MD>U|?nl@Ck7Ra{vGTfByXWdGqGw z=H{B3ngT^e!Dt8!?+_@BD_XE*_NPymqgKVf1$vdUz$3Dlfq`2Hgc&d0t@{HM4Dxhw z43U`H+vhEGK!L~UV9W3Loj)_n*Y+GAb(9M-hWy0kdNex=pc#0mPb3I~|`au~j+nlF<9g|4TopUXO@geCy$ CW=LZI literal 0 HcmV?d00001 diff --git a/examples/bringToTop2.php b/examples/bringToTop2.php new file mode 100644 index 00000000..8fba2e33 --- /dev/null +++ b/examples/bringToTop2.php @@ -0,0 +1,41 @@ + + + + phaser.js - a new beginning + + + + + + + + \ No newline at end of file diff --git a/examples/consoleBanner.php b/examples/consoleBanner.php new file mode 100644 index 00000000..b208f1d4 --- /dev/null +++ b/examples/consoleBanner.php @@ -0,0 +1,105 @@ + + + + phaser.js - a new beginning + + + + + + + + + + \ No newline at end of file diff --git a/src/core/World.js b/src/core/World.js index 08e0012d..37dc96a7 100644 --- a/src/core/World.js +++ b/src/core/World.js @@ -105,43 +105,43 @@ Phaser.World.prototype = { }, - swapChildren: function (stage, node1, node2) { + swapChildren: function (stage, child1, child2) { - if (node1 === node2 || !node1.parent || !node2.parent) + if (child1 === child2 || !child1.parent || !child2.parent) { - console.warn('You cannot swap a node with itself or swap un-parented nodes'); + console.warn('You cannot swap a child with itself or swap un-parented children'); return; } - // Cache the node values - var node1Prev = node1._iPrev; - var node1Next = node1._iNext; - var node2Prev = node2._iPrev; - var node2Next = node2._iNext; + // Cache the values + var child1Prev = child1._iPrev; + var child1Next = child1._iNext; + var child2Prev = child2._iPrev; + var child2Next = child2._iNext; var endNode = stage.last._iNext; var currentNode = stage.first; do { - if (currentNode !== node1 && currentNode !== node2) + if (currentNode !== child1 && currentNode !== child2) { - if (currentNode.first === node1) + if (currentNode.first === child1) { - currentNode.first = node2; + currentNode.first = child2; } - else if (currentNode.first === node2) + else if (currentNode.first === child2) { - currentNode.first = node1; + currentNode.first = child1; } - if (currentNode.last === node1) + if (currentNode.last === child1) { - currentNode.last = node2; + currentNode.last = child2; } - else if (currentNode.last === node2) + else if (currentNode.last === child2) { - currentNode.last = node1; + currentNode.last = child1; } } @@ -149,40 +149,40 @@ Phaser.World.prototype = { } while (currentNode != endNode) - if (node1._iNext == node2) + if (child1._iNext == child2) { - // This is an A-B neighbour swap - node1._iNext = node2Next; - node1._iPrev = node2; - node2._iNext = node1; - node2._iPrev = node1Prev; + // This is a downward (A to B) neighbour swap + child1._iNext = child2Next; + child1._iPrev = child2; + child2._iNext = child1; + child2._iPrev = child1Prev; - if (node1Prev) { node1Prev._iNext = node2; } - if (node2Next) { node2Next._iPrev = node1; } + if (child1Prev) { child1Prev._iNext = child2; } + if (child2Next) { child2Next._iPrev = child1; } } - else if (node2._iNext == node1) + else if (child2._iNext == child1) { - // This is a B-A neighbour swap - node1._iNext = node2; - node1._iPrev = node2Prev; - node2._iNext = node1Next; - node2._iPrev = node1; + // This is am upward (B to A) neighbour swap + child1._iNext = child2; + child1._iPrev = child2Prev; + child2._iNext = child1Next; + child2._iPrev = child1; - if (node2Prev) { node2Prev._iNext = node1; } - if (node1Next) { node2Next._iPrev = node2; } + if (child2Prev) { child2Prev._iNext = child1; } + if (child1Next) { child2Next._iPrev = child2; } } else { - // Nodes are far apart - node1._iNext = node2Next; - node1._iPrev = node2Prev; - node2._iNext = node1Next; - node2._iPrev = node1Prev; + // Children are far apart + child1._iNext = child2Next; + child1._iPrev = child2Prev; + child2._iNext = child1Next; + child2._iPrev = child1Prev; - if (node1Prev) { node1Prev._iNext = node2; } - if (node1Next) { node1Next._iPrev = node2; } - if (node2Prev) { node2Prev._iNext = node1; } - if (node2Next) { node2Next._iPrev = node1; } + if (child1Prev) { child1Prev._iNext = child2; } + if (child1Next) { child1Next._iPrev = child2; } + if (child2Prev) { child2Prev._iNext = child1; } + if (child2Next) { child2Next._iPrev = child1; } } }