From 281da1f81b1eef9e05e881e12d986b6b45ce8696 Mon Sep 17 00:00:00 2001 From: drumsetmonkey Date: Wed, 7 Oct 2015 12:29:55 -0400 Subject: [PATCH] Fixed jumping animation --- assets/house1.png | Bin 1483 -> 788 bytes out/entities.o | Bin 93560 -> 93600 bytes out/inventory.o | Bin 3156 -> 3156 bytes out/ui.o | Bin 9844 -> 9844 bytes out/world.o | Bin 37540 -> 38716 bytes src/entities.cpp | 9 +++++++-- 6 files changed, 7 insertions(+), 2 deletions(-) diff --git a/assets/house1.png b/assets/house1.png index 2f5034bd5c1f65c7c1c71824d64cded081bf04e9..2022992a8d3acbbe925b395c8f40c2a3e3cbf587 100644 GIT binary patch delta 678 zcmX@jJ%w#TFb6xYtcl)j{T&mdwd+qD8cqX)A7Luji!f_9(<6P zc2JDNFBHtG- zv7)WpzyE#y`FT3Kk^6bUGhZLRSruK#(!KS{n&bbfVm4%mNIeXCzSZsC(Ob99sK@sm zuRj-(tQgT4>s|UY$}RDb@_H@hAfSLm>&zY-D66r5|2nt0!-6x<{BJ+zw84OD^Q|8_ zeNx;94{2=qcvHqytf@6H~*24fJS(DwAkUsW$?O9!pw!Cj+SRl0>VST~*hP81Qk zu3_>oqgE#is6LBO9e>yQnhJ0B#R3PJ4mxcR z&=CMS2hN<9z4ev2&%LXBQ~i@ObWE=KyWf^}{OkP9y#Ctaj9Znxzf7w7U&WY;6`EW- za`JTa+V#6{-i$f*y5-gu{`HHOoDWTY_(=9(Q`!2BN#!*gwqE%BPOg3Hy!9I$fcCI( zvvhCSerVbKg}J{=g9Lx?1ck%FL#AQI8~1a|Yt7GNKscvK^Jab1mRIVw_0|7!>wg`e zd%s>bOXtPDjiym`KAV?pm$p4_`ji|fPw%}%@q6yR9A z@zmyRujls(y*3Sf1rqoyr9Jf+$KHc6$&Cq$z;NdP#s-j~0Ax0?0+|za%U^COna(HG wEg+@+<^GDO(5v?kUEOx&TyXNo^>&QB!fV%Uztkplg#idWUHx3vIVCg!0M(p7?*IS* delta 1378 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 delta 4299 zcmXZf4^UQB8V2xl4j_E~DL@l+2t_Hxu>@0r{0C$Prpbq_@sSy5DyU7exf_(bi0u|u zGYfv^BkCkHl`!L0NV7pxEjZRnITKjBLRm>=iS0J(vIVZw?(^t%Mt{D~dGERBoO>^h z4WEY%eHKeu@ZAOpmwYgBj_Q+=28=-PGXSaU_w4=;=!WbC}QWh0H@3ZFQv z71keKVc!c59G=8KeN8jD#Ehn|3ab9XUU$Zt0r{0R367q%CRO%ZlOeyhW{Ld9n$^^P zYfY)-(raXhF?EtBS?~FxXR|ln>iJhM|J!w|%t*I&m7OSo=(MYe4ty!;{J&$_U%S+b0r18tvye_MHt?BdzK2-2;Yd-ht z0o8-n{46?7RIg4|&Avrmoum3c);#9b)!z6%`I9wm@@H#4pjB?jnlBU# zTXT-uP-li!|6)xT-=%9i^jz+luXilWne|@1$*X_o)jPc!a)dL7Ww8% zAN73F^C^wS_4AoPd zN%!gns;4@$R5h<#p*qo-HD0|=^)1dkqng)0ubS5%@ahKDyuR!;1>Dhl3Qk*d%4;~S znimX69_i1LM;XSSVp`Z($vTbdEuXKN-|RiAV?xX_FZavX5VPv7YHP>NvQOZJJM7f3 zhO5SO;9dUJ-irP^Y?7S@-|TCoisJ}~lc*M_&@774L)_P6ab>o>)s`Y*4$CWJv2+g0 ztte+{$Dv*rbczZLh+7dgmt-PC)SyHZVwb2zi`b7o(FB`Djv|?$c&-gaL7Gi;gE!%c zG~VR|8a1ASE{*4D_Scw@&c&R!$WCY5Zj`CKXt7)68)#QKWbw7isi@AdF_@fT zBkc^NW^lsE2#9=*B-tW`G3Zc33VIanz_8elggeO*%0r2weC!fMXc5Ke6Wd_tlTsv$=iwJyQ7K;596HS|;?Bq7@_gRl zqOOlY$^sjS-g$O3mMySxb|lIcus0fYq89C9KKexid<%wTEwAQ zWTHphg<+9{ghiwRxuOu|q6zh)7@cA@N-}NC-c0WAVMJvz*@p~qN&`vuGlel|P(vG9 z6y>0gxZV)BEUsfalC$_U-^kR{&f?SDgGvVOdRc27SqrpGBGT+B4IJvh+I*Da&Z{-q86Rv z7zV^CMBPn3Lx$Lg65_5-!n1dCO$}&KdK>!08?Z~rV@MV!;1>r`N%k(`o?l+VJr|)% zaRn}kKVZT=qy|}HKFY*2)QJMLiz4)k6!>z;<46_1M?j>bTI@x$IEWs>EsAy|5Gkk@ zyU|S0wv1~$vz%)@f??&ENVt!5BUf;%#9c|k{`;R0T>U)M28}1V zv*Fm}=g?cIV~O4sT>o)D*WZnP2DTTze70Q-$E$ z`&RPuJq0$-{W2X#ndrM!UmWbONFI_!I{cy#l_DRFq8MFb3oa4V6mX`*Rb0rk$Xdmq zSHU&~2T{j>&$C^eLBFVl?|u@8RMCWhScGcPhGtQO9?^keQGtX)ass(x56VS1>cwm5 zB(66C7YezD6Nn0M1x@#J1&agR+_~GZHo)x;DcPgs>TNj6gg;sO)S6Ssfzd@=>=Yyy zG1#YIwSsx5RB&Fw5d}NYr64`P;HrXsnD77>!3QoPQ6_p(N8ER}$#DM=x2%2 z_3R$Ef!(u_x`A!;5fBE|;wdzXSoDaa7#8m!VIw(?T!I}Nct+bc@|*n}^~zJwN!+E` zxUi8oN=H;F(`aOfSd@qlsvK{@K*pOMqh8*}6)m)Ei6&0dU z(VpwkSw?%yxQxLvE~DXkn6im|70BAez9ZM89g1pDr-;v8oX|)TGB@$+(VKbor%2t* zoZq|dzjZUOXhSt4oK?>e_PC34aB4HR){S8fxS=_ivW2BV?iL-$W*x{D&J~J!26j9; oMJxu0J3k81kFa|hG9F>N7$qe3+qaB)dolmp?)~Eby088EKee(NTL1t6 diff --git a/out/inventory.o b/out/inventory.o index 559aff128d4eaf4348ee3380274fb97c7b1acf72..d88bf538b0fc06609290034c570b2ea692c14977 100644 GIT binary patch delta 14 Wcmca2aYbUoGG@k|o0l`M4Y=5oHj;s8gH2C@JE delta 18 Zcmez3^TlUF5g)6b3j>46=5oHj;s8fM2B-i4 diff --git a/out/world.o b/out/world.o index 6f79983b86f957d175dc573963873dad9de3c220..4997e5b39d6d19317dcedac43dd7921cd3dccf3d 100644 GIT binary patch delta 11511 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 N@HeBJ&GfPq{|{$%57qzx diff --git a/src/entities.cpp b/src/entities.cpp index 13c042b..127adae 100644 --- a/src/entities.cpp +++ b/src/entities.cpp @@ -53,7 +53,10 @@ void Entity::draw(void){ //draws the entities texState-=1; if(texState==0)up=true; } - }if(vel.x != 0){ + }if(ground == 0){ + glBindTexture(GL_TEXTURE_2D, texture[1]); + } + else if(vel.x != 0){ switch(texState){ case 0: glBindTexture(GL_TEXTURE_2D,texture[1]); @@ -65,7 +68,9 @@ void Entity::draw(void){ //draws the entities glBindTexture(GL_TEXTURE_2D,texture[2]); break; } - }else glBindTexture(GL_TEXTURE_2D,texture[0]); + }else{ + glBindTexture(GL_TEXTURE_2D,texture[0]); + } }else{ glBindTexture(GL_TEXTURE_2D,texture[0]); } -- 2.39.5