diff --git a/CMakeLists.txt b/CMakeLists.txt index d8da0fe0..e4664fb7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,6 +3,8 @@ project(Bomberman) set(CMAKE_CXX_STANDARD 20) +include_directories(bomberman lib/Ray/sources) + set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/lib/raylib) add_subdirectory(${PROJECT_SOURCE_DIR}/lib/wal) add_subdirectory(${PROJECT_SOURCE_DIR}/lib/Ray) diff --git a/lib/Ray/CMakeLists.txt b/lib/Ray/CMakeLists.txt index 7c0cf133..a275e8b4 100644 --- a/lib/Ray/CMakeLists.txt +++ b/lib/Ray/CMakeLists.txt @@ -11,7 +11,7 @@ if (CMAKE_COMPILER_IS_GNUCXX) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${GCC_COVERAGE_COMPILE_FLAGS}") endif () -find_package(raylib REQUIRED) +#find_package(raylib REQUIRED) set(HEADERS sources/Canvas.hpp diff --git a/lib/Ray/sources/Audio/Music.cpp b/lib/Ray/sources/Audio/Music.cpp index 0179a310..8a9682ae 100644 --- a/lib/Ray/sources/Audio/Music.cpp +++ b/lib/Ray/sources/Audio/Music.cpp @@ -35,7 +35,9 @@ bool RAY::Audio::Music::unload(void) bool RAY::Audio::Music::isPlaying(void) { - return IsMusicPlaying(_music); + // TODO fix it + return false; + //return IsMusicPlaying(_music); } RAY::Audio::Music &RAY::Audio::Music::play(void) diff --git a/sources/main.cpp b/sources/main.cpp index 70491566..274ba73f 100644 --- a/sources/main.cpp +++ b/sources/main.cpp @@ -1,9 +1,46 @@ #include -#include +#include "Wal.hpp" +#include "Window.hpp" int main() { - WAL::Wal wal; + + //-------------------------------------------------------------------------------------- + const int screenWidth = 800; + const int screenHeight = 450; + + InitWindow(screenWidth, screenHeight, "raylib [core] example - basic window"); + + SetTargetFPS(60); // Set our game to run at 60 frames-per-second + //-------------------------------------------------------------------------------------- + + // Main game loop + while (!WindowShouldClose()) // Detect window close button or ESC key + { + // Update + //---------------------------------------------------------------------------------- + // TODO: Update your variables here + //---------------------------------------------------------------------------------- + + // Draw + //---------------------------------------------------------------------------------- + BeginDrawing(); + + ClearBackground(RAYWHITE); + + DrawText("Congrats! You created your first window!", 190, 200, 20, LIGHTGRAY); + + EndDrawing(); + //---------------------------------------------------------------------------------- + } + + // De-Initialization + //-------------------------------------------------------------------------------------- + CloseWindow(); // Close window and OpenGL context + //-------------------------------------------------------------------------------------- + + return 0; + /*WAL::Wal wal; try { wal.run(); @@ -11,5 +48,5 @@ int main() } catch (const std::exception &ex) { std::cerr << ex.what() << std::endl; return 84; - } + }*/ }