From 7551c98ee239963ad65123132419c3c0a9cfccb3 Mon Sep 17 00:00:00 2001 From: WBoerenkamps Date: Tue, 3 Dec 2024 11:56:29 +0100 Subject: world units for click --- src/CMakeLists.txt | 2 - src/crepe/api/CMakeLists.txt | 3 -- src/crepe/api/Font.cpp | 45 --------------------- src/crepe/api/Font.h | 60 ---------------------------- src/crepe/api/Text.h | 42 -------------------- src/crepe/facade/SDLContext.cpp | 70 ++++++++++++++++++++++++++++++++- src/crepe/system/InputSystem.cpp | 79 +++++++++++++++++++++---------------- src/crepe/system/InputSystem.h | 84 ++++++++++++++++++++++------------------ src/test/InputTest.cpp | 7 +++- 9 files changed, 167 insertions(+), 225 deletions(-) delete mode 100644 src/crepe/api/Font.cpp delete mode 100644 src/crepe/api/Font.h delete mode 100644 src/crepe/api/Text.h diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index b0b034f..c3f29da 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -9,7 +9,6 @@ project(crepe C CXX) find_package(SDL2 REQUIRED) find_package(SDL2_image REQUIRED) -find_package(SDL2_ttf REQUIRED) find_package(SoLoud REQUIRED) find_package(GTest REQUIRED) find_package(whereami REQUIRED) @@ -25,7 +24,6 @@ target_include_directories(crepe target_link_libraries(crepe PRIVATE soloud PUBLIC SDL2 - PUBLIC SDL_ttf PUBLIC SDL2_image PUBLIC ${BERKELEY_DB} PUBLIC whereami diff --git a/src/crepe/api/CMakeLists.txt b/src/crepe/api/CMakeLists.txt index 2d86968..aeb451d 100644 --- a/src/crepe/api/CMakeLists.txt +++ b/src/crepe/api/CMakeLists.txt @@ -25,7 +25,6 @@ target_sources(crepe PUBLIC Script.cpp Button.cpp UiObject.cpp - Font.cpp ) target_sources(crepe PUBLIC FILE_SET HEADERS FILES @@ -63,6 +62,4 @@ target_sources(crepe PUBLIC FILE_SET HEADERS FILES Asset.h Button.h UiObject.h - Font.h - Text.h ) diff --git a/src/crepe/api/Font.cpp b/src/crepe/api/Font.cpp deleted file mode 100644 index 8db4b23..0000000 --- a/src/crepe/api/Font.cpp +++ /dev/null @@ -1,45 +0,0 @@ -#include - -#include "facade/SDLContext.h" -#include "util/Log.h" - -#include "Asset.h" -#include "Font.h" - -using namespace crepe; -using namespace std; - -Font::Font(const Asset &src, int size) : font_size(size) { - dbg_trace(); - this->load(src, size); -} - -Font::~Font() { - dbg_trace(); - this->font.reset(); -} - -void Font::load(const Asset &res, int size) { - SDLContext &ctx = SDLContext::get_instance(); - // Open the font using SDL's TTF_OpenFontRW, which supports loading from memory - SDL_RWops *rw_ops = SDL_RWFromFile(res.get_path().c_str(), "rb"); - if (!rw_ops) { - // dbg_log("Failed to create RWops for font: %s", SDL_GetError()); - return; - } - - TTF_Font *loaded_font = TTF_OpenFontRW(rw_ops, 1, size); // 1 indicates SDL should free the RWops - if (!loaded_font) { - // dbg_log("Failed to load font from asset: %s", TTF_GetError()); - return; - } - - // Wrap the TTF_Font with a unique_ptr for automatic cleanup - this->font = unique_ptr>(loaded_font, [](TTF_Font *f) { - if (f) TTF_CloseFont(f); - }); -} - -int Font::get_size() const { - return this->font_size; -} diff --git a/src/crepe/api/Font.h b/src/crepe/api/Font.h deleted file mode 100644 index 012c271..0000000 --- a/src/crepe/api/Font.h +++ /dev/null @@ -1,60 +0,0 @@ -#pragma once - -#include -#include -#include - -#include "Asset.h" - -namespace crepe { - -class SDLContext; - -/** - * \class Font - * \brief Manages font loading and text rendering properties. - * - * The Font class is responsible for loading font resources and providing a way to render text - * with different styles and sizes. It can be used for text rendering in the game engine. - */ -class Font { - -public: - /** - * \brief Constructs a Font from an Asset resource. - * \param src Asset with font data to load. - * \param size The point size to render the font at. - */ - Font(const Asset &src, int size); - - /** - * \brief Destroys the Font instance, freeing associated resources. - */ - ~Font(); - - /** - * \brief Gets the size of the font. - * \return The point size of the font. - */ - int get_size() const; - -private: - /** - * \brief Loads the font from an Asset resource. - * \param res The Asset resource containing the font data. - * \param size The point size to render the font at. - */ - void load(const Asset &res, int size); - -private: - //! The font resource from the SDL_ttf library. - std::unique_ptr> font; - - //! The size of the font in points. - int font_size; - - //! Grants SDLContext access to private members. - friend class SDLContext; -}; - -} // namespace crepe diff --git a/src/crepe/api/Text.h b/src/crepe/api/Text.h deleted file mode 100644 index 6bb011c..0000000 --- a/src/crepe/api/Text.h +++ /dev/null @@ -1,42 +0,0 @@ -#pragma once - -#include - -#include "Color.h" -#include "UiObject.h" -#include "" -namespace crepe { - -/** - * \class Button - * \brief Represents a clickable UI button, derived from the UiObject class. - * - * This class provides functionality for a button in the UI, including toggle state, - * click handling, and mouse hover detection. A callback function can be provided to - * handle button clicks. - */ -class Text : public UiObject { -public: - /** - * \brief Constructs a Button with the specified game object ID and dimensions. - * - * \param id The unique ID of the game object associated with this button. - * \param width The width of the button. - * \param height The height of the button. - */ - Text(game_object_id_t id, int width, int height); - - Color color = Color{0,0,0,0}; - std::string text = ""; - int size = 0; - const std::shared_ptr sprite_image; -public: - /** - * \brief Retrieves the maximum number of instances allowed for this button type. - * - * \return Always returns 1, as only a single instance of this type is allowed. - */ - virtual int get_instances_max() const override { return 10; } -}; - -} // namespace crepe diff --git a/src/crepe/facade/SDLContext.cpp b/src/crepe/facade/SDLContext.cpp index 9b4595e..03b0cdc 100644 --- a/src/crepe/facade/SDLContext.cpp +++ b/src/crepe/facade/SDLContext.cpp @@ -16,6 +16,8 @@ #include #include "../api/Camera.h" +#include "../api/EventManager.h" +#include "../api/Config.h" #include "../api/Sprite.h" #include "../api/Texture.h" #include "../util/Log.h" @@ -213,7 +215,10 @@ MouseButton SDLContext::sdl_to_mousebutton(Uint8 sdl_button) { return MOUSE_BUTTON_LOOKUP_TABLE[sdl_button]; } -void SDLContext::clear_screen() { SDL_RenderClear(this->game_renderer.get()); } +void SDLContext::clear_screen() { + SDL_SetRenderDrawColor(this->game_renderer.get(), 0, 0, 0, 255); + SDL_RenderClear(this->game_renderer.get()); +} void SDLContext::present_screen() { SDL_RenderPresent(this->game_renderer.get()); } SDL_Rect SDLContext::get_src_rect(const Sprite & sprite) const { @@ -336,3 +341,66 @@ ivec2 SDLContext::get_size(const Texture & ctx) { } void SDLContext::delay(int ms) const { SDL_Delay(ms); } + +std::vector SDLContext::get_events() { + std::vector event_list; + SDL_Event event; + while (SDL_PollEvent(&event)) { + switch (event.type) { + case SDL_QUIT: + event_list.push_back(EventData{ + .event_type = SDLContext::EventType::SHUTDOWN, + }); + break; + case SDL_KEYDOWN: + event_list.push_back(EventData{ + .event_type = SDLContext::EventType::KEYDOWN, + .key = sdl_to_keycode(event.key.keysym.scancode), + .key_repeat = (event.key.repeat != 0), + }); + break; + case SDL_KEYUP: + event_list.push_back(EventData{ + .event_type = SDLContext::EventType::KEYUP, + .key = sdl_to_keycode(event.key.keysym.scancode), + }); + break; + case SDL_MOUSEBUTTONDOWN: + event_list.push_back(EventData{ + .event_type = SDLContext::EventType::MOUSEDOWN, + .mouse_button = sdl_to_mousebutton(event.button.button), + .mouse_position = {event.button.x, event.button.y}, + }); + break; + case SDL_MOUSEBUTTONUP: { + int x, y; + SDL_GetMouseState(&x, &y); + event_list.push_back(EventData{ + .event_type = SDLContext::EventType::MOUSEUP, + .mouse_button = sdl_to_mousebutton(event.button.button), + .mouse_position = {event.button.x, event.button.y}, + }); + } break; + + case SDL_MOUSEMOTION: { + event_list.push_back( + EventData{.event_type = SDLContext::EventType::MOUSEMOVE, + .mouse_position = {event.motion.x, event.motion.y}, + .rel_mouse_move = {event.motion.xrel, event.motion.yrel}}); + } break; + + case SDL_MOUSEWHEEL: { + event_list.push_back(EventData{ + .event_type = SDLContext::EventType::MOUSEWHEEL, + .mouse_position = {event.motion.x, event.motion.y}, + .wheel_delta = event.wheel.y, + }); + } break; + } + } + return event_list; +} +void SDLContext::set_color_texture(const Texture & texture, const Color & color) { + SDL_SetTextureColorMod(texture.texture.get(), color.r, color.g, color.b); + SDL_SetTextureAlphaMod(texture.texture.get(), color.a); +} diff --git a/src/crepe/system/InputSystem.cpp b/src/crepe/system/InputSystem.cpp index beeef87..5b220eb 100644 --- a/src/crepe/system/InputSystem.cpp +++ b/src/crepe/system/InputSystem.cpp @@ -1,16 +1,35 @@ -#include "ComponentManager.h" -#include "api/Button.h" -#include "api/EventManager.h" +#include "../ComponentManager.h" +#include "../api/Button.h" +#include "../api/EventManager.h" #include "InputSystem.h" using namespace crepe; + void InputSystem::update() { + ComponentManager & mgr = this->component_manager; EventManager & event_mgr = EventManager::get_instance(); std::vector event_list = SDLContext::get_instance().get_events(); + RefVector