diff --git a/CMakeLists.txt b/CMakeLists.txt index 39812c4..b17d8d6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -24,6 +24,7 @@ find_package(SDL2_mixer REQUIRED) find_package(SDL2_ttf REQUIRED) find_package(SDL2_image REQUIRED) find_package(GLEW REQUIRED) +find_package(OpenGL REQUIRED) if (CMAKE_BUILD_TYPE STREQUAL "Debug") set(CMAKE_C_FLAGS "-O2 -Wno-discarded-qualifiers -Wno-pointer-arith -Wno-unused-variable -Wno-unused-parameter -Wall -Wextra -pedantic -g") @@ -32,7 +33,7 @@ else() set(CMAKE_C_FLAGS "-O2 -Wno-discarded-qualifiers -Wno-pointer-arith -Wno-unused-variable -Wno-unused-parameter -Wall -Wextra -pedantic") endif() -target_link_libraries(${PROJECT_NAME} m SDL2::SDL2 SDL2_mixer::SDL2_mixer SDL2_ttf::SDL2_ttf SDL2_image::SDL2_image GLEW::GLEW) +target_link_libraries(${PROJECT_NAME} m SDL2::SDL2 SDL2_mixer::SDL2_mixer SDL2_ttf::SDL2_ttf SDL2_image::SDL2_image GLEW::GLEW OpenGL::GL) if (WIN32) set(CMAKE_C_FLAGS "-mwindows ${CMAKE_C_FLAGS}") diff --git a/src/game/ecs/c_rotation.c b/src/game/ecs/c_rotation.c index aa469e2..4865a8e 100644 --- a/src/game/ecs/c_rotation.c +++ b/src/game/ecs/c_rotation.c @@ -25,14 +25,16 @@ update_f(struct CRotation* self) if ( keyboard_held(&game.keyboard, KEYBOARD_LEFT) || - keyboard_held(&game.keyboard, KEYBOARD_A) + keyboard_held(&game.keyboard, KEYBOARD_A) || + mouse_held(&game.mouse, MOUSE_LEFT) ) self->velocity += self->speed; if ( keyboard_held(&game.keyboard, KEYBOARD_RIGHT) || - keyboard_held(&game.keyboard, KEYBOARD_D) + keyboard_held(&game.keyboard, KEYBOARD_D) || + mouse_held(&game.mouse, MOUSE_RIGHT) ) self->velocity -= self->speed; diff --git a/src/game/state/s_play.c b/src/game/state/s_play.c index d462f70..32f136b 100644 --- a/src/game/state/s_play.c +++ b/src/game/state/s_play.c @@ -428,10 +428,7 @@ void play_update_f(struct Play* self) { if (keyboard_press(&game.keyboard, KEYBOARD_P)) - { game.isPaused = !game.isPaused; - printf("???\n"); - } if (game.isPaused) return; diff --git a/src/h b/src/h new file mode 100644 index 0000000..6d69c6e --- /dev/null +++ b/src/h @@ -0,0 +1,23 @@ +[?1049h[?1h=]11;?[?2004h[?u[?25h[?25l +~ +~ +~ +~ +~ +~ +~ +~ +~ +~ +~ +~ +~ +~ +~ +~ +~ +~ +~ +~ +~ +(BGAME 0,0-1 All[2 q[2 q[?1002h[?1006h[?25h[?25l[?1004h[?25h \ No newline at end of file