merge

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "lib/raylib-cpp"]
+	path = lib/raylib-cpp
+	url = https://github.com/RobLoach/raylib-cpp.git

CMakeLists.txt

@@ -9,6 +9,17 @@ project(2huwu)
 
 find_package(raylib 2.0 REQUIRED)
 
+find_package(raylib_cpp QUIET)
+if (NOT raylib_cpp_FOUND)
+    include(FetchContent)
+    FetchContent_Declare(
+        raylib_cpp
+        GIT_REPOSITORY https://github.com/RobLoach/raylib-cpp.git
+        GIT_TAG v4.2.5
+    )
+    FetchContent_MakeAvailable(raylib_cpp)
+endif()
+
 # add the executable
 add_executable(2huwu src/main.cpp src/draw.cpp src/game.cpp)
-target_link_libraries(2huwu raylib)
+target_link_libraries(2huwu PUBLIC raylib raylib_cpp)

compile_commands.json

@@ -0,0 +1,17 @@
+[
+  {
+    "arguments": [
+      "/usr/lib64/ccache/c++",
+      "-I/home/alistair/Documents/programming/hackathon2022/2huwu/build/_deps/raylib_cpp-src/include",
+      "-I/usr/local/include",
+      "-std=gnu++17",
+      "-c",
+      "-o",
+      "CMakeFiles/2huwu.dir/src/main.cpp.o",
+      "/home/alistair/Documents/programming/hackathon2022/2huwu/src/main.cpp"
+    ],
+    "directory": "/home/alistair/Documents/programming/hackathon2022/2huwu/build",
+    "file": "/home/alistair/Documents/programming/hackathon2022/2huwu/src/main.cpp",
+    "output": "/home/alistair/Documents/programming/hackathon2022/2huwu/build/CMakeFiles/2huwu.dir/src/main.cpp.o"
+  }
+]

lib/raylib-cpp

@@ -0,0 +1 @@
+Subproject commit ed54fba5e37d55d6fa12f7afdb20b763737d313c

src/main.cpp

@@ -1,8 +1,9 @@
 
-#include <raylib.h>
+#include "raylib-cpp.hpp"
 #include "game.h"
 #include "draw.h"
 
+
 int main(void)
 {
 
@@ -14,20 +15,32 @@ int main(void)
 
     InitWindow(screenWidth, screenHeight, "raylib [core] example - keyboard input");
 
-    Vector2 ballPosition = { (float)screenWidth/2, (float)screenHeight/2 };
+    raylib::Vector2 ballPosition = { (float)screenWidth/2, (float)screenHeight/2 };
+    raylib::Vector2 vel = { 0.0f, 0.0f };
+    raylib::Vector2 accel = { 1.0f, 1.0f };
+    accel *= 1.5f;
+    float decel = 0.85f;
 
     SetTargetFPS(60);
 
     while (!WindowShouldClose())
     {
-        if (IsKeyDown(KEY_RIGHT)) ballPosition.x += 2.0f;
-        if (IsKeyDown(KEY_LEFT))  ballPosition.x -= 2.0f;
-        if (IsKeyDown(KEY_UP))    ballPosition.y -= 2.0f;
-        if (IsKeyDown(KEY_DOWN)) ballPosition.y += 2.0f;
+        // Update
+        //----------------------------------------------------------------------------------
+        if (IsKeyDown(KEY_RIGHT)) vel.x += accel.x;
+        if (IsKeyDown(KEY_LEFT))  vel.x -= accel.x;
+        if (IsKeyDown(KEY_UP))    vel.y -= accel.y;
+        if (IsKeyDown(KEY_DOWN))  vel.y += accel.y;
+        //----------------------------------------------------------------------------------
+
+	vel *= decel;
+
+	ballPosition += vel;
 
         gs.players[0].pos.x = ballPosition.x;
         gs.players[0].pos.y = ballPosition.y;
 
+
         draw(gs);
     }