diff --git a/CMakeLists.txt b/CMakeLists.txt index 241eb737..75052c49 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -26,12 +26,14 @@ set(SOURCES sources/System/Renderer/Renderer3DSystem.hpp sources/System/Renderer/Renderer2DSystem.hpp sources/Util/Utils.cpp + sources/System/Renderer/RenderScreenSystem.hpp + sources/Util/Utils.hpp ) add_executable(bomberman sources/main.cpp ${SOURCES} - sources/System/Renderer/RenderScreenSystem.hpp sources/Util/Utils.hpp) + ) target_include_directories(bomberman PUBLIC sources) target_link_libraries(bomberman PUBLIC wal ray) diff --git a/lib/Ray/sources/Drawables/IDrawable.hpp b/lib/Ray/sources/Drawables/IDrawable.hpp index 377adee6..7063dd06 100644 --- a/lib/Ray/sources/Drawables/IDrawable.hpp +++ b/lib/Ray/sources/Drawables/IDrawable.hpp @@ -19,10 +19,10 @@ namespace RAY public: virtual ~IDrawable() = default; - virtual void drawOn(Window &) = 0; + virtual void drawOn(RAY::Window &) = 0; protected: private: - }; + };p } } diff --git a/sources/Util/Utils.hpp b/sources/Util/Utils.hpp index d2678a7c..8dd71fe0 100644 --- a/sources/Util/Utils.hpp +++ b/sources/Util/Utils.hpp @@ -11,8 +11,9 @@ namespace BBM { struct Utils { + //! @brief Convert BBM Vector3f to RAY Vector3 static RAY::Vector3 toRAY(const BBM::Vector3f &wal); - +p //! @brief default ctor Utils() = default; //! @brief Default copy ctor