CLIENT-GAME: Add raylib encapsulation

MINOR
X-R-G-B · Sep 27, 2023 · b4ca35b · b4ca35b
1 parent 5df5008
commit b4ca35b
Show file tree

Hide file tree

Showing 6 changed files with 145 additions and 83 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -55,25 +55,7 @@ install(TARGETS ${PROJECT_NAME_SERVER}
 
 add_subdirectory(deps)
 
-# Clang-Tidy
-
-find_program(CLANG_TIDY_EXE NAMES "clang-tidy")
-
-if(CLANG_TIDY_EXE)
-    if (MSVC)
-        set_target_properties(${PROJECT_NAME_CLIENT} PROPERTIES
-            VS_GLOBAL_RunCodeAnalysis true
-            VS_GLOBAL_EnableClangTidyCodeAnalysis true
-        )
-        set_target_properties(${PROJECT_NAME_SERVER} PROPERTIES
-            VS_GLOBAL_RunCodeAnalysis true
-            VS_GLOBAL_EnableClangTidyCodeAnalysis true
-        )
-    else()
-        set(CLANG_TIDY_COMMAND "${CLANG_TIDY_EXE}" "--fix" "--fix-notes" "--fix-errors")
-        set(CMAKE_CXX_CLANG_TIDY "${CLANG_TIDY_COMMAND}")
-    endif()
-endif()
+
 
 if(MSVC)
     target_compile_options(

diff --git a/src/Client/Raylib/Graphics/Graphics.cpp b/src/Client/Raylib/Graphics/Graphics.cpp
@@ -130,6 +130,11 @@ namespace Raylib {
         return GetMonitorRefreshRate(monitor);
     }
 
+    int getCurrentMonitor()
+    {
+        return GetCurrentMonitor();
+    }
+
     void setClipboardText(std::string text)
     {
         SetClipboardText(text.c_str());
@@ -611,4 +616,73 @@ namespace Raylib {
         return MeasureText(text.c_str(), fontSize);
     }
 
+    Text::Text(std::string text, Vector2 position, float fontSize, Color color)
+        : _text(text), _position(position), _fontSize(fontSize), _color(color), _pixelPosition(position)
+    {
+    }
+
+    void Text::draw()
+    {
+        DrawText(
+            _text.c_str(),
+            static_cast<int>(_pixelPosition.X()),
+            static_cast<int>(_pixelPosition.Y()),
+            static_cast<int>(_fontSize),
+            {_color.R(), _color.G(), _color.B(), _color.A()});
+    }
+
+    void Text::drawEx(float spacing)
+    {
+        DrawTextEx(
+            GetFontDefault(),
+            _text.c_str(),
+            {_pixelPosition.X(), _pixelPosition.Y()},
+            _fontSize,
+            spacing,
+            {_color.R(), _color.G(), _color.B(), _color.A()});
+    }
+
+    void Text::drawPro(Vector2 origin, float rotation, float spacing)
+    {
+        DrawTextPro(
+            GetFontDefault(),
+            _text.c_str(),
+            {_pixelPosition.X(), _pixelPosition.Y()},
+            {origin.X(), origin.Y()},
+            rotation,
+            _fontSize,
+            spacing,
+            {_color.R(), _color.G(), _color.B(), _color.A()});
+    }
+
+    float Text::x() const
+    {
+        return _position.X();
+    }
+
+    float Text::y() const
+    {
+        return _position.Y();
+    }
+
+    float Text::getFontSize() const
+    {
+        return _fontSize;
+    }
+
+    void Text::setFontSize(float fontSize)
+    {
+        _fontSize = fontSize;
+    }
+
+    Vector2 Text::getPosition() const
+    {
+        return _position;
+    }
+
+    void Text::setPixelPosition(Vector2 position)
+    {
+        _pixelPosition = position;
+    }
+
 } // namespace Raylib
diff --git a/src/Client/Raylib/Graphics/Graphics.hpp b/src/Client/Raylib/Graphics/Graphics.hpp
@@ -33,6 +33,7 @@ namespace Raylib {
     int getMonitorWidth(int monitor);
     int getMonitorHeight(int monitor);
     int getMonitorRefreshRate(int monitor);
+    int getCurrentMonitor();
     void setClipboardText(std::string);
     std::string getClipboardText();
     void setWindowIcon(Image image);
@@ -96,12 +97,6 @@ namespace Raylib {
     Color colorFromNormalized(Vector4 normalized);
     Color getColor(unsigned int hexValue);
 
-    // Text functions
-    void drawFPS(int posX, int posY);
-    void
-    drawText(std::string text, int posX, int posY, int fontSize, Color color);
-    int measureText(const std::string text, int fontSize);
-
     // Graphic classes
 
     class Image {
@@ -156,4 +151,31 @@ namespace Raylib {
             float _height;
     };
 
+    // Text functions and classes
+
+    class Text {
+        public:
+            Text(std::string text, Vector2 position = {0, 0}, float fontSize = 5.0F, Color color = BLACK);
+            void draw();
+            void drawEx(float spacing);
+            void drawPro(Vector2 origin, float rotation, float spacing);
+
+            float x() const;
+            float y() const;
+            float getFontSize() const;
+            void setFontSize(float fontSize);
+            Vector2 getPosition() const;
+            void setPixelPosition(Vector2 position);
+
+        private:
+            std::string _text;
+            float _fontSize;
+            Color _color;
+            Vector2 _position;
+            Vector2 _pixelPosition;
+    };
+
+    void drawFPS(int posX, int posY);
+
+
 } // namespace Raylib
diff --git a/src/Client/Systems/ClientSystems.cpp b/src/Client/Systems/ClientSystems.cpp
@@ -204,42 +204,32 @@ namespace Systems {
         }
     }
 
-    static void drawTextResponsive(Types::Position &position, Types::Text &text)
+    static void drawTextResponsive(Raylib::Text &text)
     {
         const float denominator = 100.0;
 
         float x =
-            (position.x * static_cast<float>(GetScreenWidth())) / denominator;
+            (text.x() * static_cast<float>(GetScreenWidth())) / denominator;
         float y =
-            (position.y * static_cast<float>(GetScreenHeight())) / denominator;
+            (text.y() * static_cast<float>(GetScreenHeight())) / denominator;
 
-        float fsz = (text.fontSize * static_cast<float>(GetScreenWidth()))
-            / denominator;
-
-        DrawTextEx(
-            text.font,
-            text.text.data(),
-            Vector2(x, y),
-            fsz,
-            0,
-            text.color);
+
+        text.setPixelPosition({x, y});
+        text.draw();
+        std::cout << "text drawn at " << x << " " << y << std::endl;
     }
 
     void GraphicSystems::textRenderer(std::size_t /*unused*/)
     {
-        Registry::components<Types::Text> arrText =
-            Registry::getInstance().getComponents<Types::Text>();
-        Registry::components<Types::Position> arrPosition =
-            Registry::getInstance().getComponents<Types::Position>();
+        Registry::components<Raylib::Text> arrText =
+            Registry::getInstance().getComponents<Raylib::Text>();
 
-        auto positionIt = arrPosition.begin();
-        auto textIt     = arrText.begin();
+        auto textIt = arrText.begin();
 
-        while (positionIt != arrPosition.end() && textIt != arrText.end()) {
-            if (textIt->has_value() && positionIt->has_value()) {
-                drawTextResponsive(positionIt->value(), textIt->value());
+        while (textIt != arrText.end()) {
+            if (textIt->has_value()) {
+                drawTextResponsive(textIt->value());
             }
-            positionIt++;
             textIt++;
         }
     }

diff --git a/src/Client/Systems/CustomTypes.hpp b/src/Client/Systems/CustomTypes.hpp
@@ -8,7 +8,6 @@
 #pragma once
 
 #include <string>
-#include "raylib.h"
 
 namespace Types {
 
@@ -38,11 +37,4 @@ namespace Types {
             bool isMine;
     };
 
-    struct Text {
-            std::string text;
-            Color color;
-            Font font;
-            float fontSize;
-    };
-
 } // namespace Types
diff --git a/src/main_client.cpp b/src/main_client.cpp
@@ -13,17 +13,17 @@ void init()
     const int initialEntityPositionY = 0;
     const int collisionRectWidth     = 10;
     const int collisionRectHeight    = 20;
-    const std::string spriteImagePath      = "./assets/R-TypeSheet/r-typesheet18r.gif";
-    const int spriteWidth            = 10;
-    const int spriteHeight           = 20;
-    const float rectX                = 2.0F;
-    const float rectY                = 5.0F;
-    const float rectWidth            = 30.5F;
-    const float rectHeight           = 25.2F;
-    const int textPositionX          = 40;
-    const int textPositionY          = 40;
-    const std::string fontPath        = "assets/Fonts/soliden/SolidenTrial-Black.otf";
-    const float textFontSize    = 5.5F;
+    const std::string spriteImagePath =
+        "./assets/R-TypeSheet/r-typesheet18.gif";
+    const int spriteWidth      = 10;
+    const int spriteHeight     = 20;
+    const float rectX          = 2.0F;
+    const float rectY          = 5.0F;
+    const float rectWidth      = 30.5F;
+    const float rectHeight     = 25.2F;
+    const Raylib::Vector2 textPosition = {50, 50};
+    const float fontSize = 5.0F;
+    const std::string fontPath = "assets/Fonts/soliden/SolidenTrial-Black.otf";
     const std::string soundEffectPath = "assets/Audio/Sounds/yes.ogg";
     const std::string musicStreamPath = "assets/Audio/Musics/Title.mp3";
 
@@ -49,11 +49,11 @@ void init()
         collisionRectWidth,
         collisionRectHeight};
     registry.addEntity();
-    registry.getComponents<Types::Position>().back() = {
-        textPositionX,
-        textPositionY};
-    registry.getComponents<Types::Text>()
-        .back() = {"Player", BLACK, LoadFont(fontPath.c_str()), textFontSize};
+    registry.getComponents<Raylib::Text>().back() = {
+        std::string("Hello World!"),
+        textPosition,
+        fontSize,
+        Raylib::Purple};
     registry.addEntity();
     registry.getComponents<Raylib::Sound>().back() =
         Raylib::Sound(soundEffectPath);
@@ -66,7 +66,8 @@ int main()
 {
     const int screenWidth  = 800;
     const int screenHeight = 600;
-    const int fps          = 60;
+    int monitor            = 0;
+    int fps                = 0;
 
     Raylib::setConfigFlags(FLAG_WINDOW_RESIZABLE);
 
@@ -76,22 +77,23 @@ int main()
     director.addSystemManager(Systems::GraphicSystems::graphicSystems);
     std::vector<std::size_t> managersIds = {1, 0, 2};
 
-    InitWindow(
+    Raylib::initWindow(
         screenWidth,
         screenHeight,
-        "raylib [textures] examples - texture source and destination "
-        "rectangles");
-    SetTargetFPS(fps);
-    InitAudioDevice();
+        "R-Type");
+    monitor = Raylib::getCurrentMonitor();
+    fps = Raylib::getMonitorRefreshRate(monitor);
+    Raylib::setTargetFPS(fps);
+    Raylib::initAudioDevice();
     init();
     while (!WindowShouldClose()) {
-        BeginDrawing();
-        ClearBackground(RAYWHITE);
+        Raylib::beginDrawing();
+        Raylib::clearBackground(Raylib::Green);
         for (auto id : managersIds) {
             director.getSystemManager(id).updateSystems();
         }
-        EndDrawing();
+        Raylib::endDrawing();
     }
-    CloseAudioDevice();
-    CloseWindow();
+    Raylib::closeAudioDevice();
+    Raylib::closeWindow();
 }