mirror of
				https://github.com/lov3b/Pong.git
				synced 2025-11-03 23:00:19 +01:00 
			
		
		
		
	Score
This commit is contained in:
		@@ -9,6 +9,7 @@
 | 
			
		||||
#include <SDL2/SDL2_gfxPrimitives.h>
 | 
			
		||||
#include <iostream>
 | 
			
		||||
#include "optional"
 | 
			
		||||
#include "Score.h"
 | 
			
		||||
 | 
			
		||||
class Ball {
 | 
			
		||||
private:
 | 
			
		||||
@@ -18,15 +19,26 @@ private:
 | 
			
		||||
    Vec2d *vec2d;
 | 
			
		||||
    static const uint32_t color = 0xCD5C5CFF;
 | 
			
		||||
    const PlayerPaddle *leftPaddle, *rightPaddle;
 | 
			
		||||
    Score *score;
 | 
			
		||||
 | 
			
		||||
public:
 | 
			
		||||
    explicit Ball(const SDL_Point *screen, const PlayerPaddle *leftPaddle, const PlayerPaddle *rightPaddle) {
 | 
			
		||||
    explicit Ball(const SDL_Point *screen, const PlayerPaddle *leftPaddle, const PlayerPaddle *rightPaddle,
 | 
			
		||||
                  Score *score) {
 | 
			
		||||
        this->score = score;
 | 
			
		||||
        this->screen = screen;
 | 
			
		||||
        this->x = screen->x / 2;
 | 
			
		||||
        this->y = screen->y / 2;
 | 
			
		||||
        this->vec2d = new Vec2d(2.5);
 | 
			
		||||
        this->leftPaddle = leftPaddle;
 | 
			
		||||
        this->rightPaddle = rightPaddle;
 | 
			
		||||
        this->x = screen->x / 2;
 | 
			
		||||
        this->y = screen->y / 2;
 | 
			
		||||
        vec2d = new Vec2d(4);
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    void resetPosition() {
 | 
			
		||||
        this->x = screen->x / 2;
 | 
			
		||||
        this->y = screen->y / 2;
 | 
			
		||||
 | 
			
		||||
        delete vec2d;
 | 
			
		||||
        vec2d = new Vec2d(4);
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    void draw(SDL_Renderer *renderer) const {
 | 
			
		||||
@@ -34,16 +46,17 @@ public:
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    void update() {
 | 
			
		||||
        std::cout << "Ball x: " << x << ", y: " << y << std::endl;
 | 
			
		||||
        std::optional<Side> paddleSide = collidedPaddle();
 | 
			
		||||
        bool screenEdgeVertical = collidedScreenEdgeVertical();
 | 
			
		||||
        std::optional<Side> scoreSide = collidedScreenEdgeHorizontal();
 | 
			
		||||
 | 
			
		||||
        if (screenEdgeVertical && paddleSide.has_value()) {
 | 
			
		||||
            vec2d->bump(BumpType::BOTH, PaddleDirection::NONE);
 | 
			
		||||
        } else if (screenEdgeVertical) {
 | 
			
		||||
            vec2d->bump(BumpType::WALL, PaddleDirection::NONE);
 | 
			
		||||
        } else if (collidedScreenEdgeHorizontal()) {
 | 
			
		||||
            std::cout << "Player won" << std::endl;
 | 
			
		||||
            exit(1);
 | 
			
		||||
        } else if (scoreSide.has_value()) {
 | 
			
		||||
            score->incrementScore(scoreSide.value());
 | 
			
		||||
            resetPosition();
 | 
			
		||||
        }
 | 
			
		||||
        if (paddleSide.has_value()) {
 | 
			
		||||
            const PlayerPaddle *paddle = paddleSide.value() == Side::LEFT ? leftPaddle : rightPaddle;
 | 
			
		||||
@@ -57,27 +70,30 @@ private:
 | 
			
		||||
        return y - RADIUS <= 0 || y + RADIUS >= screen->y;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    bool collidedScreenEdgeHorizontal() {
 | 
			
		||||
        return x + RADIUS >= screen->x || x - RADIUS <= 0;
 | 
			
		||||
    std::optional<Side> collidedScreenEdgeHorizontal() {
 | 
			
		||||
        if (x + RADIUS >= screen->x)
 | 
			
		||||
            return Side::RIGHT;
 | 
			
		||||
        else if (x - RADIUS <= 0)
 | 
			
		||||
            return Side::LEFT;
 | 
			
		||||
        return std::nullopt;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    std::optional<Side> collidedPaddle() {
 | 
			
		||||
        // Check collision with right paddle
 | 
			
		||||
        // Right paddle
 | 
			
		||||
        if (x + RADIUS >= rightPaddle->x &&
 | 
			
		||||
            y >= rightPaddle->y &&
 | 
			
		||||
            y <= rightPaddle->y + rightPaddle->h) {
 | 
			
		||||
            return Side::RIGHT;
 | 
			
		||||
        }
 | 
			
		||||
            // Check collision with left paddle
 | 
			
		||||
        else if (x - RADIUS <= leftPaddle->x + leftPaddle->w &&
 | 
			
		||||
                 y >= leftPaddle->y &&
 | 
			
		||||
                 y <= leftPaddle->y + leftPaddle->h) {
 | 
			
		||||
        // Left paddle
 | 
			
		||||
        if (x - RADIUS <= leftPaddle->x + leftPaddle->w &&
 | 
			
		||||
            y >= leftPaddle->y &&
 | 
			
		||||
            y <= leftPaddle->y + leftPaddle->h) {
 | 
			
		||||
            return Side::LEFT;
 | 
			
		||||
        }
 | 
			
		||||
        return std::nullopt;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										134
									
								
								VisibleObjects/Score.h
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										134
									
								
								VisibleObjects/Score.h
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,134 @@
 | 
			
		||||
//
 | 
			
		||||
// Created by love on 2024-01-19.
 | 
			
		||||
//
 | 
			
		||||
 | 
			
		||||
#pragma once
 | 
			
		||||
 | 
			
		||||
#include <cstdint>
 | 
			
		||||
#include <SDL_render.h>
 | 
			
		||||
#include <functional>
 | 
			
		||||
#include "Side.h"
 | 
			
		||||
#include "SDL_ttf.h"
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
#include <SDL_ttf.h>
 | 
			
		||||
#include <string>
 | 
			
		||||
#include <iostream>
 | 
			
		||||
 | 
			
		||||
#if defined(_WIN32) || defined(_WIN64)
 | 
			
		||||
// Windows
 | 
			
		||||
    const char* defaultFontPath = "C:\\Windows\\Fonts\\Arial.ttf";
 | 
			
		||||
#elif defined(__linux__)
 | 
			
		||||
const char *defaultFontPath = "/usr/share/fonts/truetype/DejaVuSans-Bold.ttf";
 | 
			
		||||
#else
 | 
			
		||||
// Other platforms
 | 
			
		||||
    const char* defaultFontPath = "path/to/a/default/font.ttf";
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
class Score {
 | 
			
		||||
private:
 | 
			
		||||
    uint8_t leftScore, rightScore;
 | 
			
		||||
    const uint8_t MAX_SCORE;
 | 
			
		||||
    std::function<void(Side)> &whenWon;
 | 
			
		||||
    TTF_Font *font;
 | 
			
		||||
    bool hasIncremented = false;
 | 
			
		||||
 | 
			
		||||
    // Regular
 | 
			
		||||
    SDL_Rect position;
 | 
			
		||||
    SDL_Color color = {243, 156, 18, 255};
 | 
			
		||||
    SDL_Surface *surface = nullptr;
 | 
			
		||||
 | 
			
		||||
    // Shadow
 | 
			
		||||
    const SDL_Color shadowColor = {243, 156, 18, 100}; // Black color for the shadow
 | 
			
		||||
    SDL_Surface *shadowSurface = nullptr;
 | 
			
		||||
    const int shadowOffset = 3;
 | 
			
		||||
 | 
			
		||||
public:
 | 
			
		||||
    explicit Score(uint8_t max_score, SDL_Point *screenSize, std::function<void(Side)> whenWon) : MAX_SCORE(max_score),
 | 
			
		||||
                                                                                                  whenWon(whenWon) {
 | 
			
		||||
        resetScore();
 | 
			
		||||
        this->font = TTF_OpenFont(defaultFontPath, 42);
 | 
			
		||||
        if (font == nullptr) {
 | 
			
		||||
            std::cerr << "Failed to load font: " << TTF_GetError() << std::endl;
 | 
			
		||||
            exit(-1);
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        this->position = SDL_Rect{screenSize->x / 2 - 50, 10, 100, 40};
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    ~Score() {
 | 
			
		||||
        if (font)
 | 
			
		||||
            TTF_CloseFont(font);
 | 
			
		||||
        if (surface)
 | 
			
		||||
            SDL_FreeSurface(surface);
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    void update() {
 | 
			
		||||
        if (!hasIncremented && surface != nullptr && shadowSurface != nullptr) return;
 | 
			
		||||
 | 
			
		||||
        if (surface != nullptr)
 | 
			
		||||
            SDL_FreeSurface(surface);
 | 
			
		||||
        if (shadowSurface != nullptr)
 | 
			
		||||
            SDL_FreeSurface(shadowSurface);
 | 
			
		||||
 | 
			
		||||
        hasIncremented = false;
 | 
			
		||||
        char score_text[8];
 | 
			
		||||
        sprintf(score_text, "%d - %d", leftScore, rightScore);
 | 
			
		||||
 | 
			
		||||
        // Create shadow surface
 | 
			
		||||
        shadowSurface = TTF_RenderText_Solid(font, score_text, shadowColor);
 | 
			
		||||
        if (shadowSurface == nullptr) {
 | 
			
		||||
            std::cerr << "Failed to create shadow text surface: " << TTF_GetError() << std::endl;
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        // Create main text surface
 | 
			
		||||
        surface = TTF_RenderText_Solid(font, score_text, color);
 | 
			
		||||
        if (surface == nullptr) {
 | 
			
		||||
            std::cerr << "Failed to create text surface: " << TTF_GetError() << std::endl;
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    void draw(SDL_Renderer *renderer) {
 | 
			
		||||
        // Draw shadow
 | 
			
		||||
        if (shadowSurface != nullptr) {
 | 
			
		||||
            SDL_Texture *shadowTexture = SDL_CreateTextureFromSurface(renderer, shadowSurface);
 | 
			
		||||
            if (shadowTexture != nullptr) {
 | 
			
		||||
                SDL_Rect shadowPosition = {position.x + shadowOffset, position.y + shadowOffset, position.w,
 | 
			
		||||
                                           position.h};
 | 
			
		||||
                SDL_RenderCopy(renderer, shadowTexture, NULL, &shadowPosition);
 | 
			
		||||
                SDL_DestroyTexture(shadowTexture);
 | 
			
		||||
            }
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        // Draw text
 | 
			
		||||
        if (surface != nullptr) {
 | 
			
		||||
            SDL_Texture *texture = SDL_CreateTextureFromSurface(renderer, surface);
 | 
			
		||||
            if (texture != nullptr) {
 | 
			
		||||
                SDL_RenderCopy(renderer, texture, NULL, &position);
 | 
			
		||||
                SDL_DestroyTexture(texture);
 | 
			
		||||
            }
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    void resetScore() {
 | 
			
		||||
        leftScore = rightScore = 0;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    void incrementScore(Side side) {
 | 
			
		||||
        hasIncremented = true;
 | 
			
		||||
        uint8_t temp;
 | 
			
		||||
        switch (side) {
 | 
			
		||||
            case Side::LEFT:
 | 
			
		||||
                temp = ++leftScore;
 | 
			
		||||
                break;
 | 
			
		||||
            case Side::RIGHT:
 | 
			
		||||
                temp = ++rightScore;
 | 
			
		||||
                break;
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        if (temp > MAX_SCORE)
 | 
			
		||||
            whenWon(side);
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
};
 | 
			
		||||
		Reference in New Issue
	
	Block a user