From e3741047bc4c0a02f40ce4aa141e8eac810ffcf7 Mon Sep 17 00:00:00 2001 From: thatscringebro Date: Tue, 10 Oct 2023 16:28:44 -0400 Subject: [PATCH] more tweeks --- game.cpp | 10 ++++------ game.h | 6 +++--- racecar.cpp | 15 ++++++++++----- terminal_racer | Bin 59352 -> 59352 bytes 4 files changed, 17 insertions(+), 14 deletions(-) diff --git a/game.cpp b/game.cpp index 55e866c..667bb24 100644 --- a/game.cpp +++ b/game.cpp @@ -4,7 +4,7 @@ Game::Game() :max_x(1000), max_y(800), direction(0), window(sf::VideoMode(max_x, max_y), "SFML Window"), - racecar(300.0f, 30.0f, 1.7f) { // maxSpeed, acceleration, and steerSpeed values + racecar(400.0f, 30.0f, 1.7f) { // maxSpeed, acceleration, and steerSpeed values if (!font.loadFromFile("cascaydia.otf")) { std::cerr << "Failed to load font" << std::endl; exit(1); @@ -68,17 +68,15 @@ void Game::run() { speedText.setString(std::to_string(static_cast(racecar.getSpeed())) + " km/h"); speedText.setCharacterSize(24); speedText.setFillColor(sf::Color::Green); - speedText.setPosition(10, 770); + speedText.setPosition(racecar.getX() - 475, racecar.getY() + 350); if(racecar.getSpeed() < 0){ speedText.setFillColor(sf::Color::Blue); } - if(racecar.getSpeed() >= 150){ - speedText.setPosition(10, 767); + if(racecar.getSpeed() >= 250){ speedText.setCharacterSize(27); speedText.setFillColor(sf::Color::Yellow); } - if(racecar.getSpeed() >= 260){ - speedText.setPosition(10, 764); + if(racecar.getSpeed() >= 360){ speedText.setCharacterSize(30); speedText.setFillColor(sf::Color::Red); } diff --git a/game.h b/game.h index 506f464..5a83dd9 100644 --- a/game.h +++ b/game.h @@ -30,11 +30,11 @@ private: "/ | / \\ _____ __________________ .___.___ / / \n" "| || | / _ \\ / _____/\\_ ___ \\| | | / / \n" "| || | / /_\\ \\ \\_____ \\ / \\ \\/| | | / / \n" - "| || __________________________ | / | \\/ \\ \\___| | | / / \n" + "| || __________________________ | / | \\/ \\\\ \\___| | | / / \n" "| || / \\ | \\____|__ /_______ / \\______ /___|___| / / \n" "| || / | | \\/ \\/ \\/ / / \n" - "| || | | | __________ _____ _________ _____________________ / / \n" - "| || | / / \\______ \\ / _ \\ \\_ ___ \\_ _____/\\______ \\ / / \n" + "| || | | | __________ _____ _________ _____________________ / / \n" + "| || | / / \\______ \\ / _ \\ \\_ ___ \\_ _____/\\______ \\ / / \n" "| || | / / | _/ / /_\\ \\/ \\ \\/ | __)_ | _/ / / \n" "| || | / / | | \\/ | \\ \\____| \\ | | \\ / / \n" "| || | / / |____|_ /\\____|__ /\\______ /_______ / |____|_ / / / \n" diff --git a/racecar.cpp b/racecar.cpp index 8c20f26..79c5f57 100644 --- a/racecar.cpp +++ b/racecar.cpp @@ -26,11 +26,14 @@ void Racecar::accelerate(float dt) { } void Racecar::decelerate(float dt) { - if (speed < 0) { + if (speed < -1) { speed += 3 * acceleration * dt; - } else if (speed > 0) { + } else if (speed > 1) { speed -= 3 * acceleration * dt; } + else { + speed = 0; + } } void Racecar::steer(float dt, float direction) { @@ -39,11 +42,13 @@ void Racecar::steer(float dt, float direction) { } void Racecar::brake(float dt) { - if (speed > 0) { + if (speed < -1) { + speed += 9 * acceleration * dt; + } else if (speed > 1) { speed -= 9 * acceleration * dt; } - if (speed < 0) { - speed += 9 * acceleration * dt; + else { + speed = 0; } } diff --git a/terminal_racer b/terminal_racer index 87573dc07eadee0ede328d52d51b0cf2eb5c8abc..2f2e9ebc0a4dc8926fd389ada09d0457d421bf44 100755 GIT binary patch delta 2160 zcmZ{k4OEP26vv(6M6e4L5YN@7{sc@WKY__wBi1HDJ*w&>c z2a9cuTBP25?b(xQ>u9X6B5CuPk2Ox|LuXek-o0-VYdJgTywC4>pZmY}KKDM)ymeP> z>aN%v7gKxB;iU8DIh^~1CNoZJ7a!RWdEw>|4?CY78|%X_XGJ~T$L+CcRMTtR=21_n zTZDp;h3uMg&DM-juX$c0+AktRqp!5c6_7RN5*-0Le?J-wnf{@@es=HFnijGx_#{|Z zl?598z3H#O26)mhU}!)TEdhPNr!*DH0>WuJ^crhPGng5S_+j`nazff!sYBW{f!eZm z)-gjZY~Vv-0t#`1CKQVzQH+W2wX<{X;Tlr9O>n|BlSY5nlKkxB0F1>2295KSut`E) zwL)oXh#%u5zb<=QO+qWH8c{Qq5Ee`uOi81maGbNpmG<{ynS>Iy_4fYeU5qM79PcDg z{5M7is~Vg1UJU>7Q{95C=8v0eFXQ%)pFrtM?tWmQlY>xOjvDi;%98zIaFjcoj8MoI zXtoA-pebF9*^v&@-bwC6x-(vCcopep-zXJi!jV9q$i8OXDS`VhS9!_cpdXAngT!Y{ajb55Hw>&FCqkl9@qhH;s(J!-L zZ(q*hnCNMgX26V?K#A8A?7qHEIIS|+9TUptg?D;e&>O|2@MnxK(_F(TKL3o;gOE7K z*>CA%o^Q0#=&{?u7R`E-Sa5!GO*ln-$GI2F8KX^5VyoBey6 zu!M=XM$|3P40P((AOB8CB8z{G;9F@~e_f!EqSNVWi#6m2YKJa$1gb3rdgws%SM$5% zMNps%rB3i%H;tOPpxB*Ew^>(Em;krqWi$_-$2a0JDPC&UH;FatE5zkogV$Y2@z=M+ zaC602h+E^#sZ#tHoXFrssz1z3k;0u+7OGZF2ahzj&b6=<77{WXAudhK?M`i#_?UwT z@t9!!IHaE?Bz-&~g+V0!DXy=?rvx8D;JALBTrdX)S|#crSHDTK|Ms-Qcj*K!bc>Wp ztGdAReR~kH;3CgYLJqpb^9zs_NLL9V&B#$mpUXV2MFt>OAazIsa;@-gPsmQ>2J|aN z<{>TE1T%7B70A4^toVOaT2z_f_AVtOE{8X}6il~rP-J^Ct`#sb+lMB=m)X8}S-#6w(qmAB<2k6t z@fT>ru@oG0l+*-6a|Y5@n2Yl_uo}lE*qh_acvZr=90i>Uk8mj&L$0!IqJj;haIij4;FYZ=K;4N+yCR*PCX;fLtYg3{!HI z409e94}Mi(O5m)yWJ8j7w=KI3A8gdm@hcP<_~iE`leARkQiNDQ%-U=5+Ev`VdkcsO+8QTg`Y}#SeUJ{{c{xQAPj& delta 2144 zcmZ{k2~bm46o&785D5spP*GMB5CyGZMA52XgMbnxL$PIvSk^LjYOU2)MJfu4RwIk4 z2U#3+WQxY6BJf1fVK9n=SaHE3rY=)=W3kHOv`V$F=OuCNlo{@Kx#vIU{O{byGn}_F zoVThGQ@fsV#PriMj(d+TW1J;3qMq-|EV_}JbWXc4?3j-AZ@tP@Sak)_N^ZlXKd6U~ zl#qGss%B;Wx=Am1UMbokB1EY2?Ub|B3X+2ZXaE!hs|IcGG->to*vI(0@CGZt z0bRj9bT6ijaKKDqJyHuhd*N zw)A4hcN<_)|QU+b35K$Hmj{5dh^QTYDVOXwk2>blChi+Crp#mHHuZKJg z=8KZv@UXLo=OI`z%VUta%ztNYaOHL=rcpYSyA^uC*;<%0l*cJtW0d*RpW+B}#pn-D zPqXslnM~JYh)(dN!-0+WgsJhLIqe=V40_J-J~mO`ivzEK+ISDz0B7Sppe8|NYsp+@ z%45RDgCyR=#Zr2MrL_KK>FsfzOz${ojPro<1b_P@_+qgMKck7kP0*e&k!}L9dOghn ztvZN#|0=Yoy%_OTFses;e;JF@L&HjqM4QyCjZ{e=)8gaP(v0TucC`u1Q zZepl?>;s&y#vt58AG9T^*v{FeY$Il)xEuWD`Y~RYxR|*g(}<4yJl|!d)ZpZ%8b)2Uc3)RMU2p5Mk+)qJ)rOB^w@6%GpOne=*7%dZ`ze9dfa_m6U5jx3_Gh`@7 zJC7KN)t88jUkP0%|mC+(SbN2?}=&h=~2$+ZOi{OBx}ZYNLe7X*k34!v_+gYUB9`WIr+kx%n*5 zyV?`dh@6Ccf>a~z&hh+mq(8C@`H}Fq9UbF#TUa8cmDuU}l3~ofW(X_sr6KS|i68w2ekhUAY^cSx7}{~&2tBwKfK#cA7C~U?Xxaox zxNn1%xE_UVrG89z3$&Ck#wZP znyN9>A8M;2-K44J=unHO1HXZS$QPV;>Zlry;FkgEH`Jzm6V+%4#{Sg7#`1jymf=irYo?+XnT6%?7KW=YWoRk;ZMUnMi3c z*IsKwg<4nYlBpCXb181~(#@GpmPd=m*F|_VXQ<`mc&RtJNVGfZU?e>Tix2AD?x&iC z0T#WJ%&cDof%Pu55oXp$GS8D?bA1z4!t6sS_)N8j1e