Skip to content

Gamemodes octagon input #140

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DarioSamo merged 2 commits into from
Jan 28, 2026
Merged

Gamemodes octagon input #140

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f45aa39
Map controller input to N64 octagon more accurately.
DarioSamo Jan 27, 2026
e83b25b
Don't pass by reference.
DarioSamo Jan 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 25 additions & 2 deletions ultramodern/src/input.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#include <cassert>
#include <cmath>

#include "ultramodern/input.hpp"
#include "ultramodern/ultra64.h"
Expand Down Expand Up @@ -127,6 +128,28 @@ extern "C" void osContGetQuery(RDRAM_ARG PTR(OSContStatus) data_) {
__osContGetInitData(&pattern, data);
}

void convert_to_n64_range(float x, float y, int8_t& stick_x, int8_t& stick_y) {
constexpr float PI = 3.14159265358979323846f;
float magnitude = sqrtf(x * x + y * y);
if (magnitude > 1.0f) {
magnitude = 1.0f;
}

float angle = atan2f(y, x);
float angle_modulo = fmodf(angle + 2.0f * PI, PI / 2.0f);
if (angle_modulo > PI / 4.0f) {
angle_modulo = PI / 2.0f - angle_modulo;
}

constexpr float r0 = 82.0f;
constexpr float alpha = 1.39414574f;
float square_radius = 1.0f;
float n64_radius = r0 * sin(alpha) / (sin(PI - angle_modulo - alpha));
float output_magnitude = magnitude * n64_radius / square_radius;
stick_x = (int8_t)(cosf(angle) * output_magnitude);
stick_y = (int8_t)(sinf(angle) * output_magnitude);
}

extern "C" void osContGetReadData(OSContPad *data) {
for (int controller = 0; controller < max_controllers; controller++) {
uint16_t buttons = 0;
Expand All @@ -139,9 +162,9 @@ extern "C" void osContGetReadData(OSContPad *data) {
}

if (got_response) {
convert_to_n64_range(x, y, data[controller].stick_x, data[controller].stick_y);

data[controller].button = buttons;
data[controller].stick_x = (int8_t)(127 * x);
data[controller].stick_y = (int8_t)(127 * y);
data[controller].err_no = 0;
} else {
data[controller].err_no = CONT_NO_RESPONSE_ERROR; // CHNL_ERR_NORESP >> 4
Expand Down
Loading