more tweeks

This commit is contained in:
thatscringebro 2023-10-10 16:28:44 -04:00
parent defc393748
commit e3741047bc
4 changed files with 17 additions and 14 deletions

View File

@ -4,7 +4,7 @@
Game::Game() Game::Game()
:max_x(1000), max_y(800), direction(0), window(sf::VideoMode(max_x, max_y), "SFML Window"), :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")) { if (!font.loadFromFile("cascaydia.otf")) {
std::cerr << "Failed to load font" << std::endl; std::cerr << "Failed to load font" << std::endl;
exit(1); exit(1);
@ -68,17 +68,15 @@ void Game::run() {
speedText.setString(std::to_string(static_cast<int>(racecar.getSpeed())) + " km/h"); speedText.setString(std::to_string(static_cast<int>(racecar.getSpeed())) + " km/h");
speedText.setCharacterSize(24); speedText.setCharacterSize(24);
speedText.setFillColor(sf::Color::Green); speedText.setFillColor(sf::Color::Green);
speedText.setPosition(10, 770); speedText.setPosition(racecar.getX() - 475, racecar.getY() + 350);
if(racecar.getSpeed() < 0){ if(racecar.getSpeed() < 0){
speedText.setFillColor(sf::Color::Blue); speedText.setFillColor(sf::Color::Blue);
} }
if(racecar.getSpeed() >= 150){ if(racecar.getSpeed() >= 250){
speedText.setPosition(10, 767);
speedText.setCharacterSize(27); speedText.setCharacterSize(27);
speedText.setFillColor(sf::Color::Yellow); speedText.setFillColor(sf::Color::Yellow);
} }
if(racecar.getSpeed() >= 260){ if(racecar.getSpeed() >= 360){
speedText.setPosition(10, 764);
speedText.setCharacterSize(30); speedText.setCharacterSize(30);
speedText.setFillColor(sf::Color::Red); speedText.setFillColor(sf::Color::Red);
} }

6
game.h
View File

@ -30,11 +30,11 @@ private:
"/ | / \\ _____ __________________ .___.___ / / \n" "/ | / \\ _____ __________________ .___.___ / / \n"
"| || | / _ \\ / _____/\\_ ___ \\| | | / / \n" "| || | / _ \\ / _____/\\_ ___ \\| | | / / \n"
"| || | / /_\\ \\ \\_____ \\ / \\ \\/| | | / / \n" "| || | / /_\\ \\ \\_____ \\ / \\ \\/| | | / / \n"
"| || __________________________ | / | \\/ \\ \\___| | | / / \n" "| || __________________________ | / | \\/ \\\\ \\___| | | / / \n"
"| || / \\ | \\____|__ /_______ / \\______ /___|___| / / \n" "| || / \\ | \\____|__ /_______ / \\______ /___|___| / / \n"
"| || / | | \\/ \\/ \\/ / / \n" "| || / | | \\/ \\/ \\/ / / \n"
"| || | | | __________ _____ _________ _____________________ / / \n" "| || | | | __________ _____ _________ _____________________ / / \n"
"| || | / / \\______ \\ / _ \\ \\_ ___ \\_ _____/\\______ \\ / / \n" "| || | / / \\______ \\ / _ \\ \\_ ___ \\_ _____/\\______ \\ / / \n"
"| || | / / | _/ / /_\\ \\/ \\ \\/ | __)_ | _/ / / \n" "| || | / / | _/ / /_\\ \\/ \\ \\/ | __)_ | _/ / / \n"
"| || | / / | | \\/ | \\ \\____| \\ | | \\ / / \n" "| || | / / | | \\/ | \\ \\____| \\ | | \\ / / \n"
"| || | / / |____|_ /\\____|__ /\\______ /_______ / |____|_ / / / \n" "| || | / / |____|_ /\\____|__ /\\______ /_______ / |____|_ / / / \n"

View File

@ -26,11 +26,14 @@ void Racecar::accelerate(float dt) {
} }
void Racecar::decelerate(float dt) { void Racecar::decelerate(float dt) {
if (speed < 0) { if (speed < -1) {
speed += 3 * acceleration * dt; speed += 3 * acceleration * dt;
} else if (speed > 0) { } else if (speed > 1) {
speed -= 3 * acceleration * dt; speed -= 3 * acceleration * dt;
} }
else {
speed = 0;
}
} }
void Racecar::steer(float dt, float direction) { void Racecar::steer(float dt, float direction) {
@ -39,11 +42,13 @@ void Racecar::steer(float dt, float direction) {
} }
void Racecar::brake(float dt) { void Racecar::brake(float dt) {
if (speed > 0) { if (speed < -1) {
speed += 9 * acceleration * dt;
} else if (speed > 1) {
speed -= 9 * acceleration * dt; speed -= 9 * acceleration * dt;
} }
if (speed < 0) { else {
speed += 9 * acceleration * dt; speed = 0;
} }
} }

Binary file not shown.