From 5202f0afa3185db275c56ca9b67e441f96440d29 Mon Sep 17 00:00:00 2001
From: /nick haya <74699483+The-SGPT@users.noreply.github.com>
Date: Mon, 7 Feb 2022 15:14:52 +0800
Subject: [PATCH] Animated sprites

---
 bin/data/smile.png | Bin 2035 -> 2184 bytes
 src/Main.cpp       |   5 ++++-
 src/Render.cpp     |  34 +++++++++++++++++++++++++++++++++-
 src/Render.hpp     |  32 ++++++++++++++++++++++++++++----
 4 files changed, 65 insertions(+), 6 deletions(-)

diff --git a/bin/data/smile.png b/bin/data/smile.png
index fdbd57ec009d0f3a7790eed76dee4bc4aa9689eb..7cb9d2ed39557893bfba2c840b26a81971767406 100644
GIT binary patch
delta 1384
zcmV-u1(*8s4~P*ViBL{Q4GJ0x0000DNk~Le0001F0000o2m=5B0G;cOjIkj!1AoE*
z01m<d6(~x8000FMNkl<ZSVz@Z`(IR55Wl;y%N8pv&t0Ug3<}cJQXZA5EV@V!f(jCo
z-ceE@rdXJfq{PGWQC6r?LM5#Vxr%~D;saV(P?y)@vh2NoOEc%33o8#lpL0L;gWsQK
z=FFU#GiT1+bFOfgAt1yQ8yjmf1b;IAzlSQqy6YEPOKXem$9I-SYE(>oN2vA2I7`W%
znwpyGiZ>q*RWtEiP~ZP{^Po?nxOLUGJ1vBb%m$S{!IHIc)3)jc+l8AGXd;T9?xy1S
zJGlwZsOt2P`6qGXn}oR*qfaVrxae@X$0tOl%;5Vwe;(7B4()>1nun&T1AoK|)>-2+
zz24YIf}agz`w|0~o<G#Fh4wM3A-e5{>T34c`p2ou{*0Mx(Pf?;CxbFX-$<9ewe?&t
zHS*b4%=8lWip@=wCCS<Fq6zEDu(GJO!;6wjk5Q#5=r#-xU6{=?>T>+m{N3L2oP}ny
z`N8DEdOBo(l<CR{&pkduMt`Ky^E*?5nG_K7u?wa3VT_lNe3fW>E*;)pRFIXn$l#Yz
z&C|c(zWVm)m;j+R=AWR65?zh2&cFR|XmUqkVE9?aGU)eX0gf~k#0N2nKUAi&AsBW(
z$#{Uq@;lp$;h&!ipRvc<GT2>luZFP{E1fvW#<@yJxVHk*EFRJ`R(}Y{>!mKnj%OQ~
z>^8)<!C>dZj3Wp>0GsRCI@>B3;yS>ncRAyP7jR{gG}!oZ1d~idKsltwv&lb;%P_9?
zc*f0!fGtpa<Asb{Om=YSa7M_S{Ua4~)8rR|su<jQw@&M9VGE=Ea-GxzM*FEs@IkEV
z?wrZ&2|}Q8xi!<85`Qx}hyEDoTwcsLz&#CUlgK!Ru#(1I4^4S7*g)q@4570zSpyb%
z6@ey8QSHeqeFM%bf7V&$u2l?MKa$HBSjejDVAN%#oHkTPte+p2#FD94RbN45-6=?#
z&x5+RR4yG;k^QEJ99V!j^wSEuwdpYF#HWM=s8X-ta4%h&Hh;Y`FC4v8fL)`B$OyJT
zWCK>D-ojI3n@^;Iu;7U7fT4fKeJGD>2l}9#KC_*SosJ}2vQzTCho`p=Y+K}+0J!`c
znLq@63)+KOER*xTVEs<?dcD-0@5lo%pg#uWi72L3O@>@)lr4h;(Ut&2Er`#eHp8S7
z<4I6ICAW+vSby8nt!u5-r5|nHeTuX)-<J@jx(X)fT1u3H)?@#1*FQlxLD&pV9BYC2
z3@Yy2A}T~oI!WjPg9GxeuW`Vnr`M+%v3;r{a?fDv=w1d4&U76OAf+uJ6w9@Q0jvX~
zixwcVpe-JKgbER*;Dp$$8-!`gs8A4AUxpChWem76AAiN;@Bxqo(04{R5NS5Hpq8l(
zj@s$y*%1vy<R@)^WcyWDC9J+@6;L0-v2^E9DeP~(D0PscV|eNxaDr9!5(MLUpU5h~
zu{)oT6jAAG(Fb@*UIIQ;x=^x8{jU&AyBVm@(OVMA5JAs;{X?GLsT2&`MX4WK>6$)R
z@irpE{eSJ5I+#J`cz+8)75zq)6}=>Of|KvDA{98{H{lOUL5BGgte{r-OGQD|^B28>
z^UHsHm2@KRMx>~x^0rh(UkC1wgQD*o?`KZg7n}Ekt?2H-d-VV)xJB_^q7>Z+xvztY
zZnnG^TLAwZo%@PT!28<Zer!<iy_=Lgn-F|2Ks`kdKm^}gR>@PAg6mbT<WWw+^?yOp
q?*#${e@Zxilu-Qt|9tK~2*STbOGF`WU)=ft0000<MNUMnLSTZsk*CK1

delta 1234
zcmV;@1TFiB5%UiriBL{Q4GJ0x0000DNk~Le0000o0000o2m=5B04d>kgRvnr1AoH+
z01m?e$8V@)000DhNkl<ZNK4g~`(M*#6vw|Cj8P02*9~bELP45Z%B3=up+mY5RFIf-
zkCFm0#lnmvB`%h?tWcwbN}38eML{F+0*#vr2*WY<{r)X|&hvf7zQCy8dcAu8vUAS&
ze4fjB&ht$8pP|+n;?1RdYinz3Du3U2EL6?IzEJ5B&DonaZ?9>zUb;Oc0a0}JG?ygI
zC(<RCHD0z4J0_<@%J$;^vmlt~%)t0sQ$HKn7ZdxF{CM6pfm!D#`DYo?J=Se&YrD`l
z$)<GMR?gA{ZX9BX_~slRw*S%c&Ay7<MJAK!!IYu~`IGGtp36zO&ce<sM}Kz|7iOm~
z)+_d_dFmG@zPa}X@&H43z>VNob76v(N0g|H<)ipK@C5f6s|F~v$!A%Jdn;Yo-4Pvk
zLC`^L(Yejn44n8*jM=w>dtiAV0v!q5^M&75)N`_kdsu4;cH-LR&s|Q~qG&}8l6x`g
zf$5Zc8sYXNagP&L+O&J2SAV0oBIjHT_f)HI!tFN5UO;G|ihiHFBZ;Nn{i?pic6(B}
zlXe3Nsc#AM0y3)d!%0(#lqMsKF}9+ahAgsevXMeM8_B$s0m=Pt5R7_AS{JYwqXd#$
zS<DQsVLddQ&OD(U2hg4fqYmNo56D5nE75KkgTT@7IExFy7D(*tV1ImyDqdJD2MMnv
zt`!QgB7lX#db=cDHp9q9Gai3f4iaUM++>oR2}oMK+l<;}@7);<Bl6?+-*OZctHMHi
zSCd(V`5gr;Dif8ljug<OEQLZ97|K?l`x!%bn8>7E_R94ow59|_??Dm$dbNc#NnMb9
z%TE6@k|dKwXrKP-yMKJ8M!!Rp2C3=S_T$EEXR!~^ZjM}Lg7^ke>f}evc=9iF-zP9$
z96_(Y$71VYy33gf)?CE^?{EjpG99OeeII5a$~3-_MH9QR#)GV@z*>~peRe~dfu06c
zMBX{NtUb%&(0R!<77V8mJQK!jL0C#RNxFNZt)}e5Eql&5$bWNxf&NifW6#~oSd#WI
zq9fV7%Y#41ff1t1<w6p0AEU0(oq%~NO3r$dUJt9M|Kg6xiPH@3ypQ7X9k37a8)mu)
z$5p10J;7LPyY2MI#L*vC$`3*YuGAD&j*&wT&XCzt0e_>pxbF0|{-J?uzt>wrc$AuQ
zERQ=v&><SMCx2IQg8qgTmMlwZ%=A^)oj}f2Z<8!xFXiab%n;8^b4a6it~r8x;CWga
z>elp<BB;c#0_Wr0tayU_^64D|6DM=@JT`;ac6{u5h<gl;`B%C&;LeZFhR^xO3Mj|s
z#eJTl%BT$mr(}^h-1N!<#R`BXZ=42uhPz(E^G?z$0Ds0W?n<RMh7<GAFhv_YO{FC4
zWh-kcFwppdk*3nGDz589LrT(>N9CkhsAG$4d{3gocBH;`zjaXl+mi+}=R1IaxK~?7
zXLT76FInc)L_v6Fbr*H2f?HoF&U?r*>igen8KJvH+`VqylkVxXe?S#s+5MBXwXN0q
w{oBhTH7EZvg$KV7V{B}!Q9tvD{woCGZ%XBxb=Ba&(*OVf07*qoM6N<$g8r3b5dZ)H

diff --git a/src/Main.cpp b/src/Main.cpp
index f411635..d4c7274 100644
--- a/src/Main.cpp
+++ b/src/Main.cpp
@@ -10,13 +10,16 @@ using namespace std;
 using namespace Render;
 
 class MainState : public State {
-    Object objs;
+    AnimatedObject objs;
     Object title;
     virtual void Create() {
         title.create(0, 0, "data/bg.png");
         AddObject(&title);
         objs.create(50, 50, "data/smile.png");
         AddObject(&objs);
+        objs.AddAnimation("idle", {{0, 0, 50, 50}, {50, 0, 50, 50}});
+        objs.PlayAnimation("idle");
+        objs.framerate = 1;
         title.scale.y = 0;
         title.center.x = WINDOW_WIDTH/2;
         title.center.y = WINDOW_HEIGHT/2;
diff --git a/src/Render.cpp b/src/Render.cpp
index e0799fe..45d4a8e 100644
--- a/src/Render.cpp
+++ b/src/Render.cpp
@@ -59,6 +59,11 @@ void Render::Object::create(int x, int y, string path){
     _ori_h = h_;
 }
 
+void Render::AnimatedObject::create(int x, int y, string path){
+    Render::Object::create(x,y,path);
+    startTime = SDL_GetTicks();
+}
+
 void Render::State::AddObject(Render::Object* object) {
     object->id = obj.size();
     this->obj.push_back(object);
@@ -79,6 +84,33 @@ void Render::Object::Draw(float dt) {
     _sc_h = _h-cam_rect.h;
 }
 
+void Render::AnimatedObject::Draw(float dt) {
+    Render::Object::Draw(dt);
+
+    if (current_framename != "") {
+        int frameToDraw = ((SDL_GetTicks() - startTime) * framerate / 1000) % frameRects[current_framename].size();
+        current_frame = frameToDraw;
+
+        int sx = frameRects[current_framename][current_frame].x;
+        int sy = frameRects[current_framename][current_frame].y;
+        int sw = frameRects[current_framename][current_frame].w;
+        int sh = frameRects[current_framename][current_frame].h;
+
+        _sc_w = frameRects[current_framename][current_frame].w;
+        _sc_h = frameRects[current_framename][current_frame].h;
+
+        src_rect = {sx, sy, sw, sh};
+    }
+}
+
+void Render::AnimatedObject::AddAnimation(string anim_name, vector<SDL_Rect> points) {
+    frameRects.insert({anim_name, points});
+}
+
+void Render::AnimatedObject::PlayAnimation(string anim_name) {
+    current_framename = anim_name;
+}
+
 void Render::Object::centerSelf(AXIS axis) {
     switch (axis) {
         case X:
@@ -162,7 +194,7 @@ bool Render::Update() {
 
         lastUpdate = current;
         
-        current_state->Draw();
+        current_state->Draw(dT);
 
         int end = SDL_GetPerformanceCounter();
 
diff --git a/src/Render.hpp b/src/Render.hpp
index 1f51e32..2b93953 100644
--- a/src/Render.hpp
+++ b/src/Render.hpp
@@ -46,7 +46,7 @@ namespace Render {
 
             void create(int x = 0, int y = 0, string path = "");
 
-            void Draw(float dt);
+            virtual void Draw(float dt);
 
             int x, y, w, h;
 
@@ -61,6 +61,10 @@ namespace Render {
             SDL_Texture* _tex = nullptr;
             void set_property(string name, bool value);
 
+            SDL_Rect get_src() {return src_rect;};
+
+            SDL_Rect src_rect = {0, 0, 0, 0};
+
             void centerSelf(AXIS axis = XY);
         private:
             int _x, _y, _w, _h;
@@ -69,6 +73,22 @@ namespace Render {
             map<string, bool> _properties;
     };
 
+    class AnimatedObject : public Object {
+        public:
+            void create(int x = 0, int y = 0, string path = "");
+            void AddAnimation(string anim_name, vector<SDL_Rect> points);
+            void PlayAnimation(string anim_name);
+            virtual void Draw(float dt);
+            
+            int framerate = 24;
+            map<string, vector<SDL_Rect>> frameRects;
+            string current_framename = "";
+            int current_frame = 0;
+
+        private:
+            int startTime;
+    };
+
     /*
     * A state is where you would contain said objects.
     */
@@ -89,13 +109,17 @@ namespace Render {
             /*
             * State draw point. Make sure to call State::Draw() first when overriding this!!!
             */
-            virtual void Draw(){
+            virtual void Draw(float dt){
                 SDL_RenderClear(renderer);
                 if (obj.size() > 0)
                     for (int i = 0; i < obj.size(); i++) {
-                        obj[i]->Draw(0);
+                        obj[i]->Draw(dt);
                         SDL_Rect r = {obj[i]->_sc_x, obj[i]->_sc_y, obj[i]->_sc_w, obj[i]->_sc_h};
-                        SDL_RenderCopyEx(renderer, obj[i]->_tex, NULL, &r, obj[i]->angle, &obj[i]->center, SDL_FLIP_NONE);
+                        SDL_Rect r2 = obj[i]->src_rect;
+                        if (r2.w != 0 && r2.h != 0)
+                            SDL_RenderCopyEx(renderer, obj[i]->_tex, &r2, &r, obj[i]->angle, &obj[i]->center, SDL_FLIP_NONE);
+                        else
+                            SDL_RenderCopyEx(renderer, obj[i]->_tex, NULL, &r, obj[i]->angle, &obj[i]->center, SDL_FLIP_NONE);
                     }
                 SDL_RenderPresent(renderer);
             }