[Added] Sprite animation for player, crosshair mouse, [Updated] Collision

This commit is contained in:
Ninjaws
2024-12-12 20:31:56 +01:00
parent 770d3e3c71
commit dbeb15ee60
11 changed files with 220 additions and 52 deletions
+3 -3
View File
@@ -35,7 +35,7 @@ MainScreen::MainScreen()
AudioService::getInstance().playMusic();
}
InputService::getInstance().setKeysToWatch({KEY_ENTER, KEY_W, KEY_S}, {MOUSE_BUTTON_LEFT});
InputService::getInstance().setKeysToWatch({KEY_ENTER, KEY_W, KEY_S}, {});
}
void MainScreen::logic()
@@ -44,7 +44,7 @@ void MainScreen::logic()
// std::cout << mouseD.y <<std::endl;
// if (mouseD.x != 0.0f && mouseD.y != 0.0f)
// {
mouseLogic();
// mouseLogic();
// }
keyboardLogic();
@@ -92,7 +92,7 @@ void MainScreen::keyboardLogic()
void MainScreen::clickLogic()
{
if (InputService::getInstance().isKeyPressed(KEY_ENTER) || InputService::getInstance().isMouseButtonPressed(MOUSE_BUTTON_LEFT))
if (InputService::getInstance().isKeyPressed(KEY_ENTER))
{
std::string selectedButton = buttons[hoveredButton].getText();