n64: clamp to octagon edge instead of scale

ares-emulator · Aug 1, 2023 · c4a5fce · c4a5fce
1 parent ef3d784
commit c4a5fce
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/ares/n64/controller/gamepad/gamepad.cpp b/ares/n64/controller/gamepad/gamepad.cpp
@@ -234,9 +234,12 @@ auto Gamepad::read() -> n32 {
     auto edgey = copysign(min(abs(edgex * slope), cardinalMax / (1.0 / abs(slope) + (cardinalMax - diagonalMax) / diagonalMax)), ay);
     edgex = edgey / slope;
 
-    auto scale = sqrt(edgex * edgex + edgey * edgey) / outerDeadzoneRadiusMax;
-    ax *= scale;
-    ay *= scale;
+    length = sqrt(ax * ax + ay * ay);
+    auto distanceToEdge = sqrt(edgex * edgex + edgey * edgey);
+    if(length > distanceToEdge) {
+      ax = edgex;
+      ay = edgey;
+    }
   }
 
   //keep cardinal input within positive and negative bounds of cardinalMax