From 41a3a295c64b8ab6ae90759fa011ab952f9778c2 Mon Sep 17 00:00:00 2001 From: Asraelite Date: Sat, 26 Mar 2016 14:23:02 +0000 Subject: [PATCH] made graphics more cartoony --- public/img/favicon.png | Bin 245 -> 486 bytes public/img/favicon_large.png | Bin 0 -> 649 bytes public/img/main.png | Bin 0 -> 678 bytes public/img/ships/01/hull.png | Bin 355 -> 422 bytes public/img/ships/01/hull_old.png | Bin 0 -> 355 bytes public/js/wingbase/render/asteroids.js | 7 ++++++- public/js/wingbase/render/render.js | 12 ++++++++---- public/js/wingbase/world/physics.js | 4 +++- public/js/wingbase/world/world.js | 4 ---- 9 files changed, 17 insertions(+), 10 deletions(-) create mode 100644 public/img/favicon_large.png create mode 100644 public/img/main.png create mode 100644 public/img/ships/01/hull_old.png diff --git a/public/img/favicon.png b/public/img/favicon.png index ff74b33b1402777d61a7c06a34852f0cebbc92ed..1f887b8382f11532a63fff9037a667b1408eeed3 100644 GIT binary patch delta 445 zcmey$_>6giaXsT)PZ!4!i{7^rH)h{1=ltxFgY4$imR@&Gh%*f6L?6f3Mqq`>&wWpR}G>t)*GMmkVOA8%Xu8n|=0Kw(sS* z!gKl0KmUAQe{IPWt3VM>&D4h$=OU-2PJO-W`MTHh(j&tx`-;_;>MYU_niBMUry0Le z>~;RqSoj?}D3=E#GelF{r G5}E*&G1Z*_ delta 202 zcmaFH{FQNnaXrHtPZ!4!i{7O{2L%r+@JuegyHNYfOTj&nCro0S1uM#0eIC{cU3c&) zZnu-!q{DsgfJ#QdW$P$q(STofL%(kovopV3{kACazTdl`Sl7VoE0h-XU2a?bXVLWII!{`(*an1yh{P+;Lkop_t8h@sy&;65_`~APY?r}W7^X5<3EA#7qW&e2__q$8iY?aBHn%cLaOJcr# zvBym3wVTcghTVI7SZ0#XRjt=md->X%-#4u}bMfBme=jUIm+`E2yJ;I^2)lVJ-5R@{%gtGTF>n?wckGJ~i#+L(r6jjiuQc~`_5H!)ien3Qik7a` z-nH%N-F;j4E^Ank9T=Gv{pxS)(!H-5R(w}o`*v&G`mbN_eGk|ElkFh3b^e05=h|G) z8d9wH2b>qY_&uG=W14#YyY}xteOvN0wQpB?O#3&3Y0}zlsZ$@;otZx&XRGe&d*7XP zwI!J*oe6&9yk@8E>+R9gPJCC~n;m^|t6^#NrCN`W-0WP@r@Xb5nQ(9G+PzVM zuYXrxUFYTV>f{OauQ|WF!uI~w=k=H-`+c#|mw2%W_x`8nOUX7z&c`boFyt=akR{04F&-cK`qY literal 0 HcmV?d00001 diff --git a/public/img/main.png b/public/img/main.png new file mode 100644 index 0000000000000000000000000000000000000000..baea3a91c5985c883b4377a79c7c8b17cfc4207a GIT binary patch literal 678 zcmeAS@N?(olHy`uVBq!ia0y~yVB}$7U})iBV_;xNl@Oi8z`(##?Bp53!NI{%!;#X# zz`zvi>EaktG3V`F$Gk%ZA`SV zCs@GfjDgz2bG7H|&YVOR`ueI^()~Qcxw^ijZRbxH`$;&cNpOFh*J3N-YasT>mb2Pm z*4_D6F20|&=l9)7o9p+@JSqWJz1{b>U1HDC`gDf+yFcS=*FD;Qzy8awN`7@71z|AyEOTs8*#67w_x;O% r+QOL91V-}?GZ?{DK-3Kg`I|NBh`;et=Iks61_lOCS3j3^P6)YuY`&twP+UoV9BZ59N9J};S>i(HKvv1yrmXdFnb*WEV zFL?rMqCj!@o%uO;VpE^Zo+#dPeB9xTY5wW=|OsfA4- zM7LuR&yHQ(ht4rvP77K;>(~e8x9mkL`Ij|Mxe;2roX4^&?ePBkL`Da%nOib?Ece~l zysp4d{;j=X_A-T%(eaPb`b4*rJ?G6HL~7Vs=Fxh1)H?tKN0Bdsf9+wv6@Il}vyp1hEM5ZIvq zkyG>OO7$OJx^C*RQy0FMa45O3^YRoH?glRdwv9Tcmwt{g?_mn4Ub_1Aj@;;9va!}h z(S-sHi%yD`I>z5Q`XYSV;{dihx{)W-F7v8b?kkhrG>7@6mPV!SSF@${MbUA;6N08R oF7HoMO)YvuLd^;SuKQ=o9Jm#HWBJE4zdX0(_nIqqGGMnA~G{RUv{Q>k!vg2N^a^FNJFtO|Eci zTn|3|e$MnW;x7Xe4y}w-IHIsLwIZeVBI_b?19i`(6F5E2hBx1-{~ELO4U@(53)^xn z%3|3WHe3tp&Xbd7-7>xHhw7GVY{g!+_n8^o><>x^OS7$D&0$`>s>!rD>$OaS8Efeiodde{r?c~Yx`Zr>v)TSs6j$xEv)WL9 VBYk@b2Ll5GgQu&X%Q~loCIF+WiT(fp diff --git a/public/img/ships/01/hull_old.png b/public/img/ships/01/hull_old.png new file mode 100644 index 0000000000000000000000000000000000000000..a45c0f4add1dbfbf29a15a96c76b96cc4b01f506 GIT binary patch literal 355 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANL}EX7WqAsieW95oy%9SjVN zQl2i3ArY-_ryB}2D+svmpDA+mGuGq<#ImL04-tLZzO8YM+w*3FI zYc+%TYQ*hzgpY%pPRkKt8?2!^afTw5Jv*fhNqu3a>_!l`jR`1JcZ)6a;% z3`{t*GE(7)!qU`=l-i4|i^L7oJ(o`4^f(*deCKP-(l<;N&o6AtwJ3{aXV`Eps5?(i znsv+cwjZinuCWz+)!t`jaI-%sAuP?df;ESE^{OV*);VtWtP?^sUEUh~VOpq=G?z=^ zqWpu9hVsv+zI7~5b6m$0oZRr1eW7><<0ZE#S@WJJtjl!So^w=-qtWnr@!#h&jP+Rq z|4vx3${}OjuGcaRW~`-8bPnj&pU%$r=@POi&Sv{lQCzjt&T2#bjr8p$91IK$44$rj JF6*2UngIXaj_Lpa literal 0 HcmV?d00001 diff --git a/public/js/wingbase/render/asteroids.js b/public/js/wingbase/render/asteroids.js index a8d79c3..12514bc 100644 --- a/public/js/wingbase/render/asteroids.js +++ b/public/js/wingbase/render/asteroids.js @@ -15,9 +15,14 @@ Renderer.prototype.renderAsteroid = (pallet, body) => { context.lineTo(points[i][0], points[i][1]); } context.closePath(); - context.strokeStyle = '#fff'; + context.clip(); context.fillStyle = body.debug ? `rgb(${body.debug}, 9, 9)` : '#090909'; context.fill(); + context.lineWidth = 7; + context.strokeStyle = '#000'; + context.stroke(); + context.lineWidth = 3; + context.strokeStyle = '#fff'; context.stroke(); pallet.restore(); diff --git a/public/js/wingbase/render/render.js b/public/js/wingbase/render/render.js index 0b161bd..68bbf8f 100644 --- a/public/js/wingbase/render/render.js +++ b/public/js/wingbase/render/render.js @@ -39,7 +39,7 @@ class Renderer { } pallet.clear(); - pallet.fill('#000'); + pallet.fill('#020202'); context.save(); @@ -49,16 +49,20 @@ class Renderer { // Grid var gridx = cx % 50; var gridy = cy % 50; + pallet.opacity(0.05); for (var x = gridx - cw / 2 - 50; x < cw + 50; x += 50) { for (var y = gridy - ch / 2 - 50; y < ch + 50; y += 50) { var wx = (-cx + x) / SCALE; var wy = (-cy + y) / SCALE; var b = game.world.bounds; - if (wx > b.right || wx < b.left || wy > b.bottom || wy < b.top) - pallet.outline('#141424', x, y, 51, 51, 1); - else pallet.outline('#0a0a0a', x, y, 51, 51, 1); + if (wx > b.right || wx < b.left || wy > b.bottom || wy < b.top) { + pallet.opacity(0.2); + pallet.outline('#8af', x, y, 51, 51, 1); + pallet.opacity(0.05); + } else pallet.outline('#fff', x, y, 51, 51, 1); } } + pallet.opacity(1); for (var id in game.world.bodies) { var body = game.world.bodies[id]; diff --git a/public/js/wingbase/world/physics.js b/public/js/wingbase/world/physics.js index 88c6050..43dfde0 100644 --- a/public/js/wingbase/world/physics.js +++ b/public/js/wingbase/world/physics.js @@ -60,7 +60,8 @@ class Physics { } removeBody(body) { - this.toRemove.push(body.b2body); + if (body) + this.toRemove.push(body.b2body); } step() { @@ -81,6 +82,7 @@ class Physics { body.b2body.SetLinearVelocity(new b2Vec2(body.xvel, body.yvel)); body.b2body.SetAngularVelocity(body.rvel); } + for (var i = 0; i < this.toRemove.length; i++) { this.world.DestroyBody(this.toRemove[i]); } diff --git a/public/js/wingbase/world/world.js b/public/js/wingbase/world/world.js index 7bebc08..86a7bd2 100644 --- a/public/js/wingbase/world/world.js +++ b/public/js/wingbase/world/world.js @@ -38,15 +38,11 @@ class World { if (data.type == 'structure') body = new Structure(data); if (data.type == 'missile') body = new Missile(data); - //if(data.type == 'ship') console.log(body); - this.bodies[body.id] = body; - //if(data.type == 'ship') console.log(this.bodies); this.physics.createBody(body); }; remove(id) { - //console.log(id); this.physics.removeBody(this.bodies[id]); delete this.bodies[id]; };