From 80bd84230d607503353acd052cf4179aa56e20e0 Mon Sep 17 00:00:00 2001
From: Asraelite <markusscully@gmail.com>
Date: Tue, 22 Mar 2016 13:18:43 +0000
Subject: [PATCH] add ship rendering and damping

---
 public/img/ships/01/hull.png        | Bin 390 -> 355 bytes
 public/img/ships/01/teama.png       | Bin 148 -> 154 bytes
 public/img/ships/01/teamb.png       | Bin 151 -> 156 bytes
 public/img/ships/01/thrust0.png     | Bin 133 -> 126 bytes
 public/img/ships/01/thrust1.png     | Bin 124 -> 122 bytes
 public/img/ships/01/thrust2.png     | Bin 125 -> 124 bytes
 public/img/ships/01/thrust3.png     | Bin 123 -> 121 bytes
 public/img/ships/01/thrust4.png     | Bin 141 -> 127 bytes
 public/img/ships/01/thrust5.png     | Bin 151 -> 144 bytes
 public/img/ships/01/thrust6.png     | Bin 181 -> 167 bytes
 public/img/ships/01/thrust7.png     | Bin 197 -> 179 bytes
 public/img/ships/01/thrust8.png     | Bin 212 -> 210 bytes
 public/img/ships/01/thrust9.png     | Bin 208 -> 219 bytes
 public/js/starbugs/assets.js        |  35 ++++++++++++++++++++++++++++
 public/js/starbugs/main.js          |   2 ++
 public/js/starbugs/net.js           |   1 +
 public/js/starbugs/render/render.js |   6 ++++-
 public/js/starbugs/render/ships.js  |  12 ++++++++--
 public/js/starbugs/world/ship.js    |   3 +++
 public/js/starbugs/world/world.js   |   5 ++++
 server/game/room/world/physics.js   |   2 ++
 server/game/room/world/ship.js      |   6 ++---
 22 files changed, 66 insertions(+), 6 deletions(-)
 create mode 100644 public/js/starbugs/assets.js

diff --git a/public/img/ships/01/hull.png b/public/img/ships/01/hull.png
index cbba37bf787f3c27ac04964b95860b1e6527f692..a45c0f4add1dbfbf29a15a96c76b96cc4b01f506 100644
GIT binary patch
delta 312
zcmZo;e#|t%q+ZI?#W5tJ_3d;+p=JdE*ZnhP4%`a9vHWA2U!Gg?d(9O)88fFiZqnP`
zaZzdi#l)8Xe|D{A5MQl$tmfe!Ee1QO&xZ{rOzttfsu01Db%<-LgAALdm%_D+CRaE$
zt_PofKWF+G@t1)KhgL=^98p-BT9HzFk#&){fx73?37j5h!<+Bae~nrChRNdjg>AVO
zWwGoG8?FU)=gCR4ZkgWpLv_nFwqmc^`^*e(_6H?|rP)@n<}j~b)nwW_$IYH~LWriz
zTcbZr3l);)aw%Mte-P48{`u6mj^$~N>v)2b8{V=n6z^cX<TfR1-t&ZYnJ(LNj%sl<
z8a^-n`+SD6K5O9L2`g4PWEig7^;)LEjJ5QM&H>%})7kkxT|ySc*=&C*imP_oS#7Al
Vk-oizgMop8!PC{xWt~$(699axiQWJJ

delta 347
zcmaFN)W$r)q~6xk#W5tJ^=+6nU$X&E=_<K~nZX-2|48eYo%-^e=8T<<)>9VznR6p^
z#x3=QUX1qk`z`z!>tvT1_Emk{%Aw$LX5WTut1P!N-FUKANzRM$?!v+aQG1(@v94@T
z`8o3m)8~Ds{)=#VoDi>K&0alISWw7AhGW%v)#olAF)K_J%kP=iYZR^Ub6i=)(9jy^
znSUkV6=PF>tt0E|nW3CEeQ&}Fm~J#=&g#0kEjPF`U_O(YW4J)eHesb>*`a+tKGT%*
zoIY;JK6p~LLts9W{*GT6T_36!NZmLr>%x-#_UeRljnQk*cQzDjH|eh6omeQd{{EfE
z^@kPDT`ZA&`}>~IwAL&U?+~Hvqbp@B`kcSqHQ@QqaY4ZQVOnwFshz@$N*xM}rQ#XB
zA8)J?45~Qky(fwB<W?Prk5YZCJ6QW(NZ&d7+g*MS<B4UhTt&{8-ZC&SFnGH9xvX<a
GXaWFg8=Zmx

diff --git a/public/img/ships/01/teama.png b/public/img/ships/01/teama.png
index 3ca0fdd877ae6f76dcc437b00b0d79e16747a772..09502ae8e250af81c670c74c50f4e8d8f2c5c81b 100644
GIT binary patch
delta 109
zcmbQjIE!(DNm`(%i(^Pc>)UG^IS&}{uwD#KJ7X88VSTEW>u`I6;m+$^M?|$)F5SPH
zb>qUrO;7h(JXqPq#PIH&h0}AX3(7WEw!dC2!OUZDfI&9<xAUgIs*_C^ncVq>tJ>0~
R7#J8BJYD@<);T3K0RT)@Erb97

delta 103
zcmbQmIE8V7NrJbhi(^Pc>)Q*7TnqvNEf*tqZohL}_Bv;V>XLomryrBxWN7G2d$!#8
z(u)I2-yT<vJj}HH$<))TJG`dq%=&qqN!z}=Y99luh65wR`O+9B&aZ1{F8{&6z`)??
L>gTe~DWM4fO+hTJ

diff --git a/public/img/ships/01/teamb.png b/public/img/ships/01/teamb.png
index 8247bd8d2ff5d004fd73d12e7553f1555bee248d..859f9c7264e8d2a42d6ed0b469950465280fcebf 100644
GIT binary patch
delta 111
zcmbQvIEQh9Nk*`zi(^Pc>)UG^IT;jqSTC;E-qD=hmA$Lk_{cS{4i2Sz*~|~SL?$-e
zZ+&Vqd*`;T8}2>l^EfK5;JJ5~@`nu}Ij{ZHK8A2JvIsaZ%q#t?xbxp6Mv2}V{FYGy
T-ai-^7#KWV{an^LB{Ts5jJPhd

delta 106
zcmbQkIGu5VNwS}(i(^PcYjT1F>*55Fo~A$pt`Ce4fBoNL*37xQ=T`kGUG+mcclZ_v
zCn$QFZVddiZQ{fT<@N}U2@i~u4mPwOSi$TjYw)Te(16SBU;{G)%S!HVg)RqvFfcGM
Nc)I$ztaD0e0s!=`Dl`B9

diff --git a/public/img/ships/01/thrust0.png b/public/img/ships/01/thrust0.png
index 7ade62bf18945667fc7dabd19001e4316ac61bd6..00d439c692830da4f8c7ece5cf5914d953d9632f 100644
GIT binary patch
delta 80
zcmZo=tearsW$NkT7!uL?_S!;01_d4#M>g5%`!3a+A6y(@_{QvmdcCgR)QeLu23J>S
mc{DIEG^EFEY<SOPvHlh7(ap0o_A@XrFnGH9xvX<aXaWHCp&yh0

delta 87
zcmb<xWt?CVXyfVP7!uK%oFKuvI6<VRDbRq+?VtvfGm%dsk;gu9-v1jSIaR+~1!r4q
nY?!dqXNrU!mm8xg1B2u)4wjc9PR|(_7#KWV{an^LB{Ts58Dt$A

diff --git a/public/img/ships/01/thrust1.png b/public/img/ships/01/thrust1.png
index 9148d91169e69c4a72199d7aebf827b1c21d0387..6a1456a034e9ec3ead0e9153c60843cfb87cb5c8 100644
GIT binary patch
delta 75
zcmb=anqcB)=;`7Z64Cnh+Co7F10H6>c=7WuH1)N(I=3{)TRjZ)48Igyou1{<z`)Ru
fAGfiglrbjeFdOd!yQ+5#3=9mOu6{1-oD!M<5FQ%p

delta 77
zcmb=bnPB2!?CIhd64Cnhj3FO`fQZY%^GA=KT&cp<$uf6lR`=O%1_p*7u~Lg&wp?B4
jH(z*n-oDPm+_HA1EG)0Z+5{OG7#KWV{an^LB{Ts5x&a-3

diff --git a/public/img/ships/01/thrust2.png b/public/img/ships/01/thrust2.png
index c930c6b44deb425116df683960bed07c36e02087..f518f075e272f8ae517569540f898e4436897ebb 100644
GIT binary patch
delta 77
zcmb=enPB2!?CIhd64Cnh+Co7F10H6>`0w}CA1~drLPO;eQ{9Uechy)=|F?5jDl#%L
iFzl;5%5;sjfN`xg+gsnrLvaiY3=E#GelF{r5}E*{NF4+K

delta 78
zcmb=aonYc=;_2cT64Cnhj3FO`fQZY%^Ka+e__#uatCMB!%&hLS-3$y2KVqd8yKT9;
k&}Y8z?!0}Shq+}vzOu0N?oC<5z`(%Z>FVdQ&MBb@01k>D!~g&Q

diff --git a/public/img/ships/01/thrust3.png b/public/img/ships/01/thrust3.png
index a504c30920849ecacb795821b3affbe73bf3aa9d..33da71c9b2326138d9b6e9c852d5503cd47bf485 100644
GIT binary patch
delta 74
zcmb=foM7T=;OXKR64Cnh+Co7F10H6>`0w{`K6Q0foGA9eS>0yV7SHA1&Rv<nz{tRG
ge@_zQYo;Bs4>)+0XP&;oz`(%Z>FVdQ&MBb@0CSWbmH+?%

delta 76
zcmb=do?zl`<muuV64Cnhj3F0;0uS?nYybc6^vmmN%Dd;Q*y6&#!0<=UeMLtUPtmpc
hxBhOMU0kt{Ijoe0CClb@6axbTgQu&X%Q~loCIGZS9zXy9

diff --git a/public/img/ships/01/thrust4.png b/public/img/ships/01/thrust4.png
index b2b8f36bb96c42bfda95272f3eecef17d7b21b9f..d418cacd572a8fc0fa24e6c96238a6d1781a9f74 100644
GIT binary patch
delta 81
zcmeBWte;@wZRY9X7!uL?_L`v}gMt9FBb)t>1BZT37pl@)m4Cx@g0?Z+^bpnRrP=vq
myqp3I3?I&Di+zY?V2?e@<$O2Au7iPrfx*+&&t;ucLK6U=%p3~<

delta 95
zcmb>LWt?CV>Eh|)7!uK%oFKuvI6<VRDbRq+?VtvfGm%dsvFE?uuKydgZWPZHoNckO
vVZu(G0zpS!8Ml~aN9u0PwB~B#WnlPS#3g6vm#E9Yz`)??>gTe~DWM4fdCDQ9

diff --git a/public/img/ships/01/thrust5.png b/public/img/ships/01/thrust5.png
index 8f72cba9b70ac48ad530fcf0acc0f3f4ea7b883f..e1ee6f2f51d9a7acba7548479eb144d129694d6b 100644
GIT binary patch
delta 99
zcmbQvIDv73NsPOvi(^Pc>)UG^MHvJHSOTwfi(P4G3O^&<@s8!Q^o^ZwoDMkJdapg1
zr60*_%bFpw`Sf~5xor&*=_R}j3=BV*;x}eDu<uLK;gk_!RuTR5hJk^B!PC{xWt~$(
F699&PBw+vm

delta 106
zcmbQhIGu5VNwS}(i(^Pc>)Ue&IT;jrTmo6OZ`iGM%sFVcHqqv#<|ge#|9|CN&NEb4
z7#J8BcErwU_L{geAbZQF_4leSd(C^db94Ev)zg+vJG<WY->cT!4C0?ee>`&5*#c7S
M>FVdQ&MBb@037%(4*&oF

diff --git a/public/img/ships/01/thrust6.png b/public/img/ships/01/thrust6.png
index 3bfae914402c3c34b7c014bc47cf98f1a6219264..2d590e326e9bb0a16286b4bf05189bb7ae93b489 100644
GIT binary patch
delta 122
zcmdnWxSVl<NpYN~i(^PcYjT1FYsQ1mZJqz?{pbIiANS30VYHuq_eQIR#>U3R&#cym
z;{z`?7BlQ+Y-8T%{U;@%?r&9s%mL{M=RM44yC2k$U|pOb($f@Zz*W$AG3;Z;>WVF)
dHjfw>Vw4n4Z*P~r$H2hA;OXk;vd$@?2>|k_GpGOn

delta 137
zcmZ3^xRr5&Nqvr|i(^Pc>)Z2&d=3r*tq<#)ofh6Xv^FMLJ3Vk`Te4@^as`(R4-XZU
z6?@jt@=S~S<lq7VPu`y~>q)g__PNF+P{Hr;WR7L^p4VFDcldsnFet2(X4q9)|4Qro
rg>`GYD)*~L{#)_)`p!>XtbV%`Uq{(*QDk6XVDNPHb6Mxal+XkK@XtGE

diff --git a/public/img/ships/01/thrust7.png b/public/img/ships/01/thrust7.png
index 397ee8a1c883e1ce04c743a3b1f97118b3e87908..5e26be6b11f3ce0ed029fe0b7d0ff50914c39c98 100644
GIT binary patch
delta 134
zcmX@gxS4T+Nqv^5i(^Pc>)UG^1sxnjS{~MNO)zkF&|eie@rBfdV_%&P@N}|;l^N$9
z@lV*#_KjbB0#CBS^Uk<xSG&HqA8ysL8L%bUGfs23|C7B&mGy>!)GV$I+!0~_8$>Q%
q%X_S(q@=X|OV`(~uU+-e+019^nlrRL6=7gtVDNPHb6Mw<&;$VIiZ^-y

delta 153
zcmdnYc$9I1Nqvo{i(^PcYjT1F>*55Fo~A$pF1LdkP|id?iNv1&r<eapPe@2em@u`G
z!={cYP+;caj+MO?4ku#7c6fQ3v9*ckKj4y(us1aD=m<zM4}7-h$GiWHk^d#*_O%uq
zX_b_ay`=HUHuBj&dxO{i|1)p?7koIWYKHX}Mus(?h4dxMqNSJ_7#J8lUHx3vIVCg!
E0Cy2SYybcN

diff --git a/public/img/ships/01/thrust8.png b/public/img/ships/01/thrust8.png
index 49af3566b781dca45b3e68c7fd0d60ca36be6851..f95724f5c0801f70eb15054d0ed62ac4a784ba19 100644
GIT binary patch
delta 166
zcmcb@c!_a>NqwiMi(^Pc>)UIFT+IOjEf4EerzSksoTRn1)!fkil;xz^DhV@B%{k<@
z=DL$Wu!mG6>+{!Q_mY>%SXj-L|5s)4mfh<3s@=M^QNc#7`{xH+JXcbZZn%8@s$~q9
z$L9@9C;zJlvffcN&d7Rk`v+6ly`Dc-(|%k_WOZ?IaVgu<mHtrv_L?N)wMlCqB}*}!
YK5Zfy&8#KIz`(%Z>FVdQ&MBb@01>uG82|tP

delta 168
zcmcb_c!hC-Nqx7ci(^Pc>)Q((c@G%~v_AYVAnWy5^F>h52F^1RHD@T_WKo$OQqfg%
zA&yJCQ)9x!NnH2TBdzAw_-}J`0f8s?Z$?yHxA@Kc#wpLH+C$Jf_RZxF=3YBzzf4J;
zptR@Lo}e>(mvZgAy^_ncpxu2AyYt>ZOs#jetN&X2x$^OikBWN^i8sVYAJ6%E=e_~M
Z3TcDzy{#cv7#J8BJYD@<);T3K0RWzEPJ{pe

diff --git a/public/img/ships/01/thrust9.png b/public/img/ships/01/thrust9.png
index ed757673fbef50148151502d67371433680b26bc..5f1899e94438554dae2d5487c4419562d30e5ce6 100644
GIT binary patch
delta 175
zcmcb>c$;y8N&O^G7srr@*0<Lb`3^aVv^@N8%EA}0gVFbZQuGccnU3Itf-Bg#Gy5-y
zMi_KQFne;g*|2=x>H96!jqi_jb={HAdY9%U*c>^vcCYoXWoz{3Bt4zTdw@Y9?%Tv?
z9FqgN&QH%{-E=-)hU-R7t_b&wybCf4SN5?o<m~fQJtP~opGiqWNl7W{Xw=d5t1V*c
i_jE0v8n$sa`__I7{=|JbQy3T+7(8A5T-G@yGywpOcu9N!

delta 164
zcmcc3c!6<(NqxJgi(^Pc>)VUge9Z;|EEgg>SMTufKCM`!#mC})KuA^B!;Wdm0$*dz
zrZdYO4{}}IbMD^Vi(cFvU~r--*Rzjz@kYhllm4GOoAmq(+XKeU@2!74)xYTZZdb$U
z#tV$kt~*X&u3vDb_H2W8(#>sq-)Jk96kd=!ANzOJ{36RMvQGlk@BdqOCq<s^Sd4cl
T+s^_91_lOCS3j3^P6<r_tRPM;

diff --git a/public/js/starbugs/assets.js b/public/js/starbugs/assets.js
new file mode 100644
index 0000000..3a54a80
--- /dev/null
+++ b/public/js/starbugs/assets.js
@@ -0,0 +1,35 @@
+function loadAssets() {
+	var sources = {
+		images: {
+			ships: {
+				'01': {
+					hull: 'img/ships/01/hull.png',
+					teama: 'img/ships/01/teama.png',
+					teamb: 'img/ships/01/teamb.png',
+					thrust0: 'img/ships/01/thrust0.png',
+					thrust5: 'img/ships/01/thrust5.png',
+					thrust8: 'img/ships/01/thrust8.png'
+				}
+			}
+		}
+	}
+
+	var result = {};
+
+	// Magical recursive magic.
+	(function r(o, t) {
+		for (var i in o) {
+			console.log(i);
+			if (typeof o[i] == 'string') {
+				t[i] = new Image();
+				t[i].src = o[i];
+			} else {
+				t[i] = {};
+				r(o[i], t[i]);
+			}
+		}
+		t = o;
+	})(sources, result);
+
+	return result;
+}
diff --git a/public/js/starbugs/main.js b/public/js/starbugs/main.js
index 45bbbff..519b043 100644
--- a/public/js/starbugs/main.js
+++ b/public/js/starbugs/main.js
@@ -15,6 +15,8 @@ function init() {
 function Game() {
 	var self = this;
 
+	this.assets = loadAssets();
+
 	this.connected = false;
 	this.state = 'connecting';
 
diff --git a/public/js/starbugs/net.js b/public/js/starbugs/net.js
index 9a42f0b..402e9dd 100644
--- a/public/js/starbugs/net.js
+++ b/public/js/starbugs/net.js
@@ -19,6 +19,7 @@ function Net() {
 		});
 
 		this.socket.on('world', function(data) {
+			game.world.clear();
 			game.world.playerShipId = data;
 		});
 	};
diff --git a/public/js/starbugs/render/render.js b/public/js/starbugs/render/render.js
index 7cec100..d4bb22f 100644
--- a/public/js/starbugs/render/render.js
+++ b/public/js/starbugs/render/render.js
@@ -43,7 +43,11 @@ function Renderer() {
 		for (var id in game.world.bodies) {
 			var body = game.world.bodies[id];
 
-			pallet.rect('#338', body.x, body.y, 10, 10);
+			if (body.bodyType == 'ship') {
+				renderShip(pallet, body);
+			} else {
+				pallet.rect('#338', body.x, body.y, 10, 10);
+			}
 		}
 
 		context.restore();
diff --git a/public/js/starbugs/render/ships.js b/public/js/starbugs/render/ships.js
index dd723fd..c00fcc6 100644
--- a/public/js/starbugs/render/ships.js
+++ b/public/js/starbugs/render/ships.js
@@ -1,3 +1,11 @@
-function RenderShip(ship) {
-	
+function renderShip(pallet, ship) {
+	var img = game.assets.images.ships[ship.hull].hull;
+	var col = game.assets.images.ships[ship.hull].teamb;
+	var thr0 = game.assets.images.ships[ship.hull].thrust0;
+	var thr5 = game.assets.images.ships[ship.hull].thrust5;
+	var thr8 = game.assets.images.ships[ship.hull].thrust8;
+	//pallet.view(ship.x, ship.y, false, ship.r);
+	pallet.image(col, ship.x, ship.y, ship.r);
+	pallet.image(img, ship.x, ship.y, ship.r);
+	pallet.image(ship.move[0] ? thr8 : thr0, ship.x, ship.y, ship.r);
 }
diff --git a/public/js/starbugs/world/ship.js b/public/js/starbugs/world/ship.js
index 62bb691..6a651ca 100644
--- a/public/js/starbugs/world/ship.js
+++ b/public/js/starbugs/world/ship.js
@@ -2,8 +2,11 @@ function Ship(id) {
 	this.id = id;
 	this.x = 0;
 	this.y = 0;
+	this.r = 0;
+	this.hull = '01';
 	this.move = [];
 	this.lastMove = [];
+	this.bodyType = 'ship';
 
 	this.updateMove = function() {
 		if (JSON.stringify(this.move) != JSON.stringify(this.lastMove) || true) {
diff --git a/public/js/starbugs/world/world.js b/public/js/starbugs/world/world.js
index 36a8999..f2b39fd 100644
--- a/public/js/starbugs/world/world.js
+++ b/public/js/starbugs/world/world.js
@@ -3,6 +3,11 @@ function World() {
 	this.playerShip = false;
 	this.playerShipId = false;
 
+	this.clear = function() {
+		this.bodies = {};
+		this.playerShip = false;
+	}
+
 	this.update = function(data) {
 		this.playerShip = this.bodies[this.playerShipId];
 
diff --git a/server/game/room/world/physics.js b/server/game/room/world/physics.js
index b237cde..ae6ba26 100644
--- a/server/game/room/world/physics.js
+++ b/server/game/room/world/physics.js
@@ -25,6 +25,8 @@ class Physics {
 		bodyDef.active = true;
 		bodyDef.linearVelocity = new b2Vec2(body.xvel / s || 0, body.yvel / s || 0);
 		bodyDef.angularVelocity = body.rvel || 0;
+		bodyDef.linearDamping = 0.001;
+		bodyDef.angularDamping = 0.001;
 		bodyDef.type = body.type == 'static' ?
 			Box2D.b2BodyType.b2_staticBody : Box2D.b2BodyType.b2_dynamicBody;
 		if (body.player) bodyDef.allowSleep = false;
diff --git a/server/game/room/world/ship.js b/server/game/room/world/ship.js
index c20fdab..e2c39c0 100644
--- a/server/game/room/world/ship.js
+++ b/server/game/room/world/ship.js
@@ -22,18 +22,18 @@ class Ship extends Body {
 		}
 
 		if (data.forward) {
-			let power = 0.02;
+			let power = 0.05;
 			let x = Math.cos(this.b2body.GetAngleRadians()) * power;
 			let y = Math.sin(this.b2body.GetAngleRadians()) * power;
 			this.applyForce(x, y);
 		}
 
 		if (data.left) {
-			this.applyTorque(-0.02);
+			this.applyTorque(-0.0001);
 		}
 
 		if (data.right) {
-			this.applyTorque(0.02);
+			this.applyTorque(0.0001);
 		}
 	}
 }