From 1894e311bdeb098c3bef9bd342e0eaf78d197a9b Mon Sep 17 00:00:00 2001
From: Andy <drumsetmonkey@gmail.com>
Date: Fri, 20 Jan 2017 10:37:18 -0500
Subject: [PATCH] Walking player

---
 assets/player/player.png | Bin 840 -> 1558 bytes
 src/player.cpp           | 102 ++++++++++++++++++++++++++++++++++++++-
 2 files changed, 100 insertions(+), 2 deletions(-)

diff --git a/assets/player/player.png b/assets/player/player.png
index 0f7f13a4f68228b925af1eb0350205281bd62f04..42cea0b234c706bc27c94848cab1e0dc08098579 100644
GIT binary patch
delta 1528
zcmV<U1qb@b29^vViBL{Q4GJ0x0000DNk~Le0001s0000S2nGNE08x5O1d$;!e-sZS
z6=c52j{pD#qe(<TRA}DqThD77M-={M8+?fip;ya$&>v8Y!1Q2{=^;iU$FK*Td-EyA
zII8~wrICX!r6=Vah{!Qu+(W1#v|uVq@5w>l(rcjZ#b8Yj+1ZYs=FN{?Z5_FOut=JH
z-<u!rn>RCWY=K#cvd=4+MKI;qe_UV5zrT6D2b(;2`~pAyHo;AoM)YwwPmd1(0L@k(
z<LPv1`$L^CspEAyJHMR6G@?lA_C8y?V<bzn)t3P9`Ij|8iINSf1c32$Dl7vp0SME8
z>o#n5^fsGxl!INiOnRoaX?jad6zX`%k%S|R8uY_j%^7(B$X=Sx4XW<sf5Tc0$z)=*
zF^XgK(o~w9LTvzG?PRv{w&+Bl1hCl}#qo@;sc$z;q7b5(L?cR}5M9>JqHR=R>!!#Z
zmx5YSR(HNbQ9|9y&5A5WlIVMni<2(S&M$Fs(iPhq@tnREhK<roQ{gjP$sQ<|WHP~F
zt!7+WXxQ(i>0IOrXp7X}e{uavCX<<^_x})yB3m>8fV=mfV0C8;0I<Cg<H6$>`0IDO
zGkin*?$(;|Jy&kh@zJ&E7pbdE`#4)Bn^ozSA&d8Z<@M9f+{`N@KfL`TsGRE5lR^IJ
z+862ip>_T8^Pe+yxiB_e+HRZ8s&p3?S?IC%?;pR##mU=B!W!pff37@KM<<NZr#N3b
z_g?J>V{G;Lw4*BBGGr0iao8zYGEFSQ`l=FPr^g4SmP}=15q3B-y&vset8Ssw(AoJV
zzW!z)-aOxv98t1-2M%jB^wJdVVFv)v&Ju6jCKLeL!%nV8b277b_GLX82-?~9u!CN!
zpU?CU51)azF<%EIf0C+;YYPDMT75KI{T##T>Gj@wwJ(&j=*%{ig*vt>UEgI$oSk1{
zbA3f<JA45^+`a!qtnO@y*H1gfQ&5@Ns)zO>Vj6f_N3+$RBUO<ljoR@I?`522!gBS7
z=$0bO=K6|G6zc}}`!D#xJUu=T?O}&IZc1Ix;S^!%xBy@!e?aqN^bs6U)YSu57qw$L
zo~!rDmacDWTNTU0wH=)UH@KqtZ<rSP3``~ybidlmpYe1m^uZ^N%<X)5_)NTe`3TAA
zigVr!0p7iQG-qQxor>{v%HGAOw&+BuCj+IQ+fk1H_38>;9C1#b(^u{4;)or1t=+7y
zFR`SQ|1Al#f9QgXlP>#gZ^RhIF&a^nf9j`>Miil*3?QY<J5PTrUDZMQUVWz+U;PlA
zsa(f#c1`*rZ7HJb(^end(vmq^dOm1GQBEL57+dGL!LSWhs3VHtirC}&<0B!MkO{Gf
zaq<zN-?X}tZP{K#=qHM0{~L{43EZ<3&B!XE>~5`Le|Kw50+6Opm2y^*NKZxEaC-DI
zq_Hc(F&Hb3OS5OToH!b(s~Q)_^@JOz?LXuwj;)Wr43Pwt1R(3l!1$ScpTT77u@h&&
zRElFVqFy*d7S+2xGNzUH&u~(8;(}9>Dhko1$0yyaP6~RN3#aO#dR5^#9T(13?s`v8
zZ&misf0k>q;iB7>csZo#(Rh)#=u;mcwS;MzO6fUEf^oi?QCsHN<sAB+$-D|KBb$|r
zg8e9ktAs4BH2kNE)AlDb>$wj(-;ZYR)6^hy#L4OwWv>WyT^q?3aka1rvdEBo5~W*Y
zriWm32NsPg*C?{c@<9n($<dkKp4y~6>{NDLe^1llrj);L`aA^7kxbb%rRF(Dno{>%
zYTtDwV8Kc*&0m0I()+qVo$-B-&NOqIRVM4nK-QCilv2trj`E|I{+pz+S)BS#Yz1LR
zy;dAko;${7+l0}v9(YQayiI}FIh?6q3|XAxLCNAw-Rruvkz9u?9dtTaf25Sb7=rg|
zPNQL9t#%m<e6T*w3&4g<9=44(ocd=mWA22DL_{xiofMup!6c7DF-6+As5UIRkJf+U
eE7>onjeh{enJwXsnA<r30000<MNUMnLSTX>ll&(D

delta 804
zcmV+<1Ka$T49Er{iBL{Q4GJ0x0000DNk~Le0001a0000N2nGNE051gKW04^;e+mu~
z0Y-er8~^|U)k#D_RA}DqSUqbSK@fergfwxL*2)$71?C`?Ag&@}Qidzkr!p=qf^+sS
zu${=LN$J!EUmapDMZm4VMS81|>JW(12&_qAjnIA1o=%Amc3@eZcyI1@-p=d?5H&q-
zl-4Gpk4flbd&_~f`k0D6697DafA%;PJQz)}z2&IiKgIxno7v1pux27tmbh`D1IJOv
zV=HuBOq&R7t)BL%2=M)L7XYx)K82kK^)A<mOlEPHZKHj<DAh-e29C#LTdr$Vt}_LG
z^6~^5?G^yoU3HB`7O%%&K6LQu>HQAeT8-D_c$xn5?GTgD2CD9vtOld0e+c~g{RQ@Z
zCeGH@>a_71jHYn4#`V=fs=#~+0zfh5#jB5Y^YzfnwW~D&i%Sjwz}L4I3E&<8%y-nd
zzZtU`U8mjkQKPXC*u*%CcUzkTfHHdQwl)C(lhB8&buQl3dV%A+auW`}r!3EeV}h07
z)`f+uH3g0%Zm!ncSZe}6e@(BS+Rq!BUY~<mh-cp%NE6PgJVTBYE5fY{8#yQQeRP)b
zB?u6`vu=9*NFV>7?bn+#5uSbD%w~(<QqHP8Q;rlX!L19c?TYn(tm*YJ47&dWs~_Uv
zxx{lxjL%X5N5qrZFzCX>Plg~WO{68Pl734WY~>=S1tl*?ra>&re@Ww2FriddhM5Q=
zoe(+i$;GZJvQf4SgRW_IiSe=ESCYjQ8X1(_%CC(z0PLK1uyfwQ_0>V)=8JKBzOK@4
zFZbaEcVcWAUQwx!`}NT)6eo>ih@}#1FcFamtE&(uD=16Pg+aW%+{d9h!wJ2M3_MRv
zFSs-2NhU{{U;f4zdY%N|LPS*PKMgCH5Lx4jU|p?g68ba=ed6pSBKYVfdd9k16FVUy
z^3hB5020qd__St<m+;E?%NmcQnQ)e|CS%XTDi(TvrYhVhxLVT^uIiGl4A&=B@w%oe
iULRF~k5%5Mq`beKtD%#-F0~c_0000<MNUMnLSTZmF?_%P

diff --git a/src/player.cpp b/src/player.cpp
index c0710cc..78c0b8e 100644
--- a/src/player.cpp
+++ b/src/player.cpp
@@ -9,11 +9,64 @@
 static const char *spriteXML =
 	"<Sprite> \
 		<frame> \
-			<src limb='0' offset='0,0' size='15,23' drawOffset='0,9'>assets/player/player.png</src> \
-			<src limb='1' offset='15,0' size='12,11' drawOffset='2,0'>assets/player/player.png</src>\
+			<src limb='0' offset='0,0' size='15,16' drawOffset='0,9'>assets/player/player.png</src> \
+			<src limb='1' offset='0,16' size='13,12' drawOffset='0,20'>assets/player/player.png</src>\
+			<src limb='2' offset='15,0' size='14,11' drawOffset='1,0'>assets/player/player.png</src>\
+			<src limb='3' offset='15,14' size='15,13' drawOffset='0,9'>assets/player/player.png</src>\
 		</frame> \
 	</Sprite>";
 
+static const char *animationXML = 
+	"<Animation>\
+		<movement>\
+			<limb update='60.0' id='2'>\
+				<frame>\
+					<src offset='15,0' size='14,11' drawOffset='1,0'>assets/player/player.png</src>\
+				</frame>\
+				<frame>\
+					<src offset='29,0' size='14,11' drawOffset='1,0'>assets/player/player.png</src>\
+				</frame>\
+				<frame>\
+					<src offset='43,0' size='14,11' drawOffset='1,0'>assets/player/player.png</src>\
+				</frame>\
+				<frame>\
+					<src offset='57,0' size='14,11' drawOffset='1,0'>assets/player/player.png</src>\
+				</frame>\
+				<frame>\
+					<src offset='71,0' size='14,11' drawOffset='1,0'>assets/player/player.png</src>\
+				</frame>\
+				<frame>\
+					<src offset='85,0' size='14,11' drawOffset='1,0'>assets/player/player.png</src>\
+				</frame>\
+				<frame>\
+					<src offset='99,0' size='14,11' drawOffset='1,0'>assets/player/player.png</src>\
+				</frame>\
+				<frame>\
+					<src offset='113,0' size='14,11' drawOffset='1,0'>assets/player/player.png</src>\
+				</frame>\
+				<frame>\
+					<src offset='127,0' size='14,11' drawOffset='1,0'>assets/player/player.png</src>\
+				</frame>\
+			</limb>\
+		</movement>\
+		<movement>\
+			<limb update='250.0' id='3'>\
+				<frame>\
+					<src offset='15,14' size='15,13' drawOffset='0,9'>assets/player/player.png</src>\
+				</frame>\
+				<frame>\
+					<src offset='32,14' size='14,13' drawOffset='0,9'>assets/player/player.png</src>\
+				</frame>\
+				<frame>\
+					<src offset='50,14' size='14,13' drawOffset='0,9'>assets/player/player.png</src>\
+				</frame>\
+				<frame>\
+					<src offset='68,14' size='17,13' drawOffset='-1,9'>assets/player/player.png</src>\
+				</frame>\
+			</limb>\
+		</movement>\
+	</Animation>";
+
 void PlayerSystem::create(void)
 {
 	player = game::entities.create();
@@ -32,6 +85,51 @@ void PlayerSystem::create(void)
 	vec2 dim = player.component<Sprite>().get()->getSpriteSize();
 	float cdat[2] = {dim.x, dim.y};
 	player.assign<Solid>(cdat[0], cdat[1]);
+
+	// handle player animation
+	xmld.Parse(animationXML);
+	auto entan = player.assign<Animate>();
+	auto animx = xmld.FirstChildElement()->FirstChildElement();
+	
+	uint limbid 		= 0;
+	float limbupdate 	= 0;
+	uint limbupdatetype = 0;
+	
+	while (animx) {	
+		std::string animType = animx->Name();
+		std::cout << animx->Name() << std::endl;
+		if (animType == "movement") {
+			limbupdatetype = 1;
+			auto limbx = animx->FirstChildElement();
+			while (limbx) {
+				std::string limbHopefully = limbx->Name();
+				if (limbHopefully == "limb") {
+					auto frames = developFrame(limbx);
+					
+					entan->limb.push_back(Limb());
+					entan->limb.back().updateType = limbupdatetype;
+
+					if (limbx->QueryUnsignedAttribute("id", &limbid) == XML_NO_ERROR) {
+						entan->limb.back().limbID = limbid;
+					}
+					if (limbx->QueryFloatAttribute("update", &limbupdate) == XML_NO_ERROR) {
+						entan->limb.back().updateRate = limbupdate;
+					}
+					
+					// place our newly developed frames in the entities animation stack
+					for (auto &f : frames) {
+						entan->limb.back().addFrame(f);
+						for (auto &fr : entan->limb.back().frame) {
+							for (auto &sd : fr)
+								sd.first.limb = limbid;
+						}
+					}
+				}
+			limbx = limbx->NextSiblingElement();
+			}
+		}
+		animx = animx->NextSiblingElement();
+	}
 }
 
 void PlayerSystem::configure(entityx::EventManager &ev)
-- 
2.39.5