shweet/orbit-plus
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mouse button rotation + minor fixes

Browse Source
This commit is contained in:
shweet 2023-08-08 02:22:51 -04:00
parent d5d5b3530d
commit 8ed66cfba8
4 changed files with 29 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -24,6 +24,7 @@ find_package(SDL2_mixer REQUIRED)
find_package(SDL2_ttf REQUIRED) find_package(SDL2_ttf REQUIRED)
find_package(SDL2_image REQUIRED) find_package(SDL2_image REQUIRED)
find_package(GLEW REQUIRED) find_package(GLEW REQUIRED)
find_package(OpenGL REQUIRED)
if (CMAKE_BUILD_TYPE STREQUAL "Debug") 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") 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") set(CMAKE_C_FLAGS "-O2 -Wno-discarded-qualifiers -Wno-pointer-arith -Wno-unused-variable -Wno-unused-parameter -Wall -Wextra -pedantic")
endif() 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) if (WIN32)
set(CMAKE_C_FLAGS "-mwindows ${CMAKE_C_FLAGS}") set(CMAKE_C_FLAGS "-mwindows ${CMAKE_C_FLAGS}")

6
src/game/ecs/c_rotation.c
View File

@ -25,14 +25,16 @@ update_f(struct CRotation* self)
if if
( (
keyboard_held(&game.keyboard, KEYBOARD_LEFT) || 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; self->velocity += self->speed;
if if
( (
keyboard_held(&game.keyboard, KEYBOARD_RIGHT) || 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; self->velocity -= self->speed;

3
src/game/state/s_play.c
View File

@ -428,10 +428,7 @@ void
play_update_f(struct Play* self) play_update_f(struct Play* self)
{ {
if (keyboard_press(&game.keyboard, KEYBOARD_P)) if (keyboard_press(&game.keyboard, KEYBOARD_P))
{
game.isPaused = !game.isPaused; game.isPaused = !game.isPaused;
printf("???\n");
}
if (game.isPaused) if (game.isPaused)
return; return;

23
src/h Normal file
View File

@ -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