dcrubro/letnik3koncni-prap
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

entity destruction, etc.

Browse Source
This commit is contained in:
DcruBro
2026-03-15 19:22:20 +01:00
parent 2983b919cd
commit d522881358
6 changed files with 101 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

116
CMakeLists.txt
View File

@@ -4,59 +4,83 @@ project(Letnik3Zadnja)
set(CMAKE_CXX_STANDARD 23)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
# Include FetchContent to download SDL from source
include(FetchContent)
# Download SDL3 from source
FetchContent_Declare(
SDL3
GIT_REPOSITORY https://github.com/libsdl-org/SDL.git
GIT_TAG release-3.4.2
)
# Download SDL3_image from source
FetchContent_Declare(
SDL3_image
GIT_REPOSITORY https://github.com/libsdl-org/SDL_image.git
GIT_TAG release-3.2.4
)
# Download SDL3_ttf from source
FetchContent_Declare(
SDL3_ttf
GIT_REPOSITORY https://github.com/libsdl-org/SDL_ttf.git
GIT_TAG release-3.2.2
)
# Download SDL3_mixer from source
FetchContent_Declare(
SDL3_mixer
GIT_REPOSITORY https://github.com/libsdl-org/SDL_mixer.git
GIT_TAG release-3.2.0
)
# Work around PipeWire API mismatch on some Linux distributions.
# Disable PipeWire backend in SDL; PulseAudio/ALSA backends remain available.
set(SDL_PIPEWIRE OFF CACHE BOOL "Disable SDL PipeWire backend" FORCE)
set(SDL_PIPEWIRE_SHARED OFF CACHE BOOL "Disable dynamic PipeWire loading in SDL" FORCE)
# Make SDL libraries available
FetchContent_MakeAvailable(SDL3)
FetchContent_MakeAvailable(SDL3_image)
FetchContent_MakeAvailable(SDL3_ttf)
FetchContent_MakeAvailable(SDL3_mixer)
# Compile flags
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Werror -Wno-unused-parameter -O2")
# Collect all source files from src/ and nested directories
file(GLOB_RECURSE SOURCES CONFIGURE_DEPENDS "src/*.cpp")
# Compile flags
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Werror -Wno-unused-parameter -O2")
# Create the executable
add_executable(${PROJECT_NAME} ${SOURCES})
# Include headers from include/
target_include_directories(${PROJECT_NAME} PRIVATE include)
# Link SDL3 and SDL3_image to the executable
target_link_libraries(${PROJECT_NAME} PRIVATE SDL3::SDL3 SDL3_image::SDL3_image SDL3_ttf::SDL3_ttf SDL3_mixer::SDL3_mixer)
# ------------------------------------------------------------
# Platform-specific dependency handling
# ------------------------------------------------------------
if(WIN32)
# Include FetchContent to download SDL libraries
include(FetchContent)
# Download SDL3
FetchContent_Declare(
SDL3
GIT_REPOSITORY https://github.com/libsdl-org/SDL.git
GIT_TAG release-3.4.2
)
# Download SDL3_image
FetchContent_Declare(
SDL3_image
GIT_REPOSITORY https://github.com/libsdl-org/SDL_image.git
GIT_TAG release-3.2.4
)
# Download SDL3_ttf
FetchContent_Declare(
SDL3_ttf
GIT_REPOSITORY https://github.com/libsdl-org/SDL_ttf.git
GIT_TAG release-3.2.2
)
# Download SDL3_mixer
FetchContent_Declare(
SDL3_mixer
GIT_REPOSITORY https://github.com/libsdl-org/SDL_mixer.git
GIT_TAG release-3.2.0
)
# Disable PipeWire backend (Linux-only but harmless here)
set(SDL_PIPEWIRE OFF CACHE BOOL "Disable SDL PipeWire backend" FORCE)
set(SDL_PIPEWIRE_SHARED OFF CACHE BOOL "Disable dynamic PipeWire loading in SDL" FORCE)
# Make SDL libraries available
FetchContent_MakeAvailable(SDL3)
FetchContent_MakeAvailable(SDL3_image)
FetchContent_MakeAvailable(SDL3_ttf)
FetchContent_MakeAvailable(SDL3_mixer)
else()
# macOS / Linux → use system-installed packages
find_package(SDL3 REQUIRED)
find_package(SDL3_image REQUIRED)
find_package(SDL3_ttf REQUIRED)
find_package(SDL3_mixer REQUIRED)
endif()
# ------------------------------------------------------------
# Link SDL libraries
# ------------------------------------------------------------
target_link_libraries(${PROJECT_NAME}
PRIVATE
SDL3::SDL3
SDL3_image::SDL3_image
SDL3_ttf::SDL3_ttf
SDL3_mixer::SDL3_mixer
)

3
include/object/entity.hpp
View File

@@ -23,13 +23,14 @@ namespace Game::Object {
Entity& operator=(const Entity&);
Entity(Entity&&) noexcept;
Entity& operator=(Entity&&) noexcept;
virtual ~Entity() = 0;
virtual ~Entity() = 0; // Destructor
// Start is called when the entity is spawned
virtual void start() = 0;
// Update is called every update cycle; deltaTime is the time (in seconds) since the last update call
virtual void update(float deltaTime) = 0;
virtual void onWindowResized(int newWidth, int newHeight) {} // Called when the window is resized, with the new width and height in pixels
virtual void destroyed() {}; // Pre-destruction call
void render(Game::Renderer::Renderer* renderer, Game::Renderer::RendererConfig config);
// Setters and getters

2
include/state/gamestate.hpp
View File

@@ -20,6 +20,7 @@ namespace Game::State {
}
void sort(); // Sort entities by zIndex for correct rendering order
void wipe();
Object::Entity* getEntityByName(const std::string& name); // Get an entity by name, returns nullptr if no entity with the name exists
std::vector<Object::Entity*> getEntitiesSnapshot(bool sortByZIndex = false); // Get a stable snapshot of entity pointers for iteration outside the lock
@@ -27,6 +28,7 @@ namespace Game::State {
Object::Entity* getAtIndex(size_t at);
// Add an entity to the gamestate.
void addEntity(std::unique_ptr<Object::Entity> entity);
bool removeEntity(const std::string& name);
private:
mutable std::mutex mMutex; // Shared mutex for thread safety

3
src/game/agame/camcontroller.cpp
View File

@@ -37,5 +37,8 @@ namespace Game::AGame {
} else if (playerY > bottomBound) {
Object::Camera::getInstance().move(0.f, mSpeed * deltaTime);
}
const bool* state = SDL_GetKeyboardState(nullptr);
mSpeed = state[SDL_SCANCODE_LSHIFT] ? 400.f : 200.f;
}
}

1
src/game/agame/player.cpp
View File

@@ -33,5 +33,6 @@ namespace Game::AGame {
if (state[SDL_SCANCODE_S]) mTransform.y += mSpeed * deltaTime;
if (state[SDL_SCANCODE_A]) mTransform.x -= mSpeed * deltaTime;
if (state[SDL_SCANCODE_D]) mTransform.x += mSpeed * deltaTime;
mSpeed = state[SDL_SCANCODE_LSHIFT] ? 400.f : 200.f;
}
}

23
src/state/gamestate.cpp
View File

@@ -24,6 +24,19 @@ namespace Game::State {
LOG("Added entity '" << addedEntity->getName() << "' to GameState");
}
bool GameState::removeEntity(const std::string& name) {
std::lock_guard<std::mutex> lock(mMutex); // Lock the mutex for thread safety
for (size_t i = 0; i < mEntities.size(); i++) {
if (mEntities[i]->getName() == name) {
mEntities[i]->destroyed();
mEntities.erase(mEntities.begin() + i);
return true;
}
}
return false;
}
void GameState::sort() {
std::lock_guard<std::mutex> lock(mMutex); // Lock the mutex for thread safety
std::sort(mEntities.begin(), mEntities.end(), [](const std::unique_ptr<Object::Entity>& a, const std::unique_ptr<Object::Entity>& b) {
@@ -31,6 +44,16 @@ namespace Game::State {
});
}
void GameState::wipe() {
std::lock_guard<std::mutex> lock(mMutex);
for (const auto& entity : mEntities) {
if (entity) {
entity->destroyed();
}
}
mEntities.clear();
}
Object::Entity* GameState::getEntityByName(const std::string& name) {
std::lock_guard<std::mutex> lock(mMutex); // Lock the mutex for thread safety
for (const auto& entity : mEntities) {