diff options
| author | nathansmithsmith <nathansmith7@mailfence.com> | 2023-08-06 16:50:59 -0600 |
|---|---|---|
| committer | nathansmithsmith <nathansmith7@mailfence.com> | 2023-08-06 16:50:59 -0600 |
| commit | 0e3f2f54c73ea3d473c38159dcb180eeb7988f4b (patch) | |
| tree | b6d903c0fa9bd93fe38e58c00c4419b2488f13f8 /src | |
| parent | 6411d4eabe48104211be728663afb146dbd12711 (diff) | |
About to fix the stupid mouse
Diffstat (limited to 'src')
| -rw-r--r-- | src/entities/antifaShip.c | 11 | ||||
| -rw-r--r-- | src/entities/generale.c | 2 | ||||
| -rw-r--r-- | src/settings.c | 4 |
3 files changed, 7 insertions, 10 deletions
diff --git a/src/entities/antifaShip.c b/src/entities/antifaShip.c index c91f892..f9c9867 100644 --- a/src/entities/antifaShip.c +++ b/src/entities/antifaShip.c @@ -82,7 +82,7 @@ void controlAntifaShipKeyboardAndMouse(Game * game, Entity * entity) { data->forwardSpeed += (speed * game->settings.scrollBarSpeed); - if (data->forwardSpeed < 0.0) + if (data->forwardSpeed < 0.) data->forwardSpeed = 0.0; else if (data->forwardSpeed > ANTIFA_SHIP_MAX_SPEED) data->forwardSpeed = ANTIFA_SHIP_MAX_SPEED; @@ -91,11 +91,8 @@ void controlAntifaShipKeyboardAndMouse(Game * game, Entity * entity) { data->lastMouse = mouse; // Using mouse as a joystick. - Vector3 mouseStick = (Vector3){ - v.y * game->settings.mouseSensitivity, - -v.x * game->settings.mouseSensitivity, - 0.0, - }; + Vector3 mouseStick = (Vector3){v.y, -v.x, 0.0}; + mouseStick = Vector3Scale(mouseStick, game->settings.mouseSensitivity); // Swap axis for more movement with mouse. if (IsMouseButtonDown(MOUSE_BUTTON_MIDDLE)) { @@ -103,7 +100,7 @@ void controlAntifaShipKeyboardAndMouse(Game * game, Entity * entity) { mouseStick.y = 0.0; } - printVector2(mouse); + printVector2(v); entityJoystickControl(entity, mouseStick, data->forwardSpeed); } diff --git a/src/entities/generale.c b/src/entities/generale.c index 4865d4e..dee37ee 100644 --- a/src/entities/generale.c +++ b/src/entities/generale.c @@ -50,5 +50,5 @@ void drawGenerale(Game * game, Entity * entity) { void getTargetGenerale(Game * game, Entity * entity) { Entity * player = getEntityFromWorld(game->world, 0); - Vector3 dis = Vector3Subtract( + //Vector3 dis = Vector3Subtract( } diff --git a/src/settings.c b/src/settings.c index 5b91f65..62d6b72 100644 --- a/src/settings.c +++ b/src/settings.c @@ -2,7 +2,7 @@ void initSettings(Settings * settings) { *settings = (Settings){ - .controlMode = JOYSTICK_CONTROL, + .controlMode = KEYBOARD_AND_MOUSE_CONTROL, .mouseSensitivity = 0.05, .scrollBarSpeed = 10.0, .gamePadNum = 0, @@ -10,7 +10,7 @@ void initSettings(Settings * settings) { .yawStick = 0, .rollStick = 2, .speedStick = 3, - .joystickSensitivity = 0.5, + .joystickSensitivity = 1000.0, .fps = 0, .drawFps = true }; |