mirror of
https://github.com/tangerineturtle1/NX2navi.git
synced 2026-11-15 19:19:58 -04:00
919aa7b2a8
With the mouse camera in stick mode and a camera speed above 1, the mouse could never turn faster than a full stick does at camera speed 1, however high the mouse sensitivity was set. The mouse's counts were limited to full tilt first and divided by the camera speed afterwards, so at camera speed 1.5 the most the mouse could send was two thirds of full tilt, which the game's own factor brought back to the old top speed. The division now comes before the limit (runtime/input_map.c input_mouse_stick): a slow movement turns as far as before, and a fast flick reaches full tilt, which is the game's top speed with the camera speed in it. Direct mouse mode, the default, does not use this code. A camera speed of 1 or less behaves as before. From pull request #424. tests/mouse_stick_check.py is new here: it builds input_map.c alone and checks the deflection at each camera speed without the game. Co-Authored-By: Claude Fable 5.2 <noreply@anthropic.com>
62 lines
3.7 KiB
C
62 lines
3.7 KiB
C
// The mouse camera in stick mode (runtime/input_map.c input_mouse_stick): raw counts to a right-stick deflection with
|
|
// the camera speed taken out of it. The game multiplies the right stick's turn rates by the camera speed, so the
|
|
// deflection is divided by it, and the division comes before the limit to full tilt: a slow movement turns as far as
|
|
// at camera speed 1, and a fast flick reaches full tilt, which the game turns into its top speed with the factor in
|
|
// it. No game files. tests/mouse_stick_check.py builds and runs this with runtime/input_map.c.
|
|
#include <math.h>
|
|
#include <stdint.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include "input_map.h"
|
|
|
|
// what input_map.c needs from the rest of the runtime; none of it is reached from input_mouse_stick
|
|
const char *cfg_get(const char *key) { (void)key; return NULL; }
|
|
double cfg_double(const char *key) { (void)key; return 0; }
|
|
void rt_log(const char *fmt, ...) { (void)fmt; }
|
|
|
|
#define FULL 32767
|
|
|
|
static int fails;
|
|
#define CHECK(cond, ...) do { if (!(cond)) { printf("FAIL: " __VA_ARGS__); putchar('\n'); fails++; } } while (0)
|
|
|
|
int main(void) {
|
|
static const float cams[] = {0.1f, 0.5f, 1.0f, 1.5f, 2.0f, 3.0f};
|
|
int32_t st[2], one[2];
|
|
for (unsigned i = 0; i < sizeof cams / sizeof *cams; i++) {
|
|
float cam = cams[i];
|
|
// a slow movement: the deflection is the one at camera speed 1 divided by the factor (while that is below full
|
|
// tilt), so the game's multiplication gives the same turn
|
|
for (int counts = 1; counts <= 40; counts += 3) {
|
|
input_mouse_stick(counts, 0, 1.0 / 60, 1, 1, one);
|
|
input_mouse_stick(counts, 0, 1.0 / 60, 1, cam, st);
|
|
double at_one = FULL * (counts * 60.0) / 3000.0; // full tilt at 3000 counts a second
|
|
double want = at_one / cam > FULL ? FULL : at_one / cam;
|
|
CHECK(fabs(one[0] - at_one) <= 0.5, "camera speed 1, %d counts: %d, expected %.1f", counts, one[0], at_one);
|
|
CHECK(fabs(st[0] - want) <= 0.5 && st[1] == 0, "camera speed %.1f, %d counts: %d, expected %.1f", cam, counts,
|
|
st[0], want);
|
|
}
|
|
// a fast flick reaches full tilt at every camera speed, in each direction
|
|
input_mouse_stick(5000, 0, 1.0 / 60, 1, cam, st);
|
|
CHECK(st[0] == FULL && st[1] == 0, "camera speed %.1f: a flick right gives %d %d", cam, st[0], st[1]);
|
|
input_mouse_stick(0, 5000, 1.0 / 60, 1, cam, st);
|
|
CHECK(st[0] == 0 && st[1] == -FULL, "camera speed %.1f: a flick down gives %d %d", cam, st[0], st[1]);
|
|
input_mouse_stick(-5000, -5000, 1.0 / 60, 1, cam, st);
|
|
double len = sqrt((double)st[0] * st[0] + (double)st[1] * st[1]);
|
|
CHECK(st[0] < 0 && st[1] > 0 && st[0] == -st[1] && len <= FULL + 1.0 && len >= FULL - 2.0,
|
|
"camera speed %.1f: a diagonal flick gives %d %d", cam, st[0], st[1]);
|
|
}
|
|
// the case that was wrong: at camera speed 1.5 a flick stopped at two thirds of full tilt, the top speed of camera
|
|
// speed 1
|
|
input_mouse_stick(80, 0, 1.0 / 60, 1, 1.5f, st);
|
|
CHECK(st[0] == FULL, "camera speed 1.5, 80 counts in 1/60 s: %d, expected full tilt", st[0]);
|
|
input_mouse_stick(30, 0, 1.0 / 60, 1, 1.5f, st);
|
|
CHECK(st[0] == 13107, "camera speed 1.5, 30 counts in 1/60 s: %d, expected 13107", st[0]);
|
|
// nothing to divide by: no deflection
|
|
input_mouse_stick(30, 0, 1.0 / 60, 1, 0, st);
|
|
CHECK(st[0] == 0 && st[1] == 0, "camera speed 0 gives %d %d", st[0], st[1]);
|
|
input_mouse_stick(30, 0, 1.0 / 60, 1, -1, st);
|
|
CHECK(st[0] == 0 && st[1] == 0, "a negative camera speed gives %d %d", st[0], st[1]);
|
|
if (!fails) puts("mouse stick: the camera speed divides the deflection before the limit to full tilt");
|
|
return fails != 0;
|
|
}
|