mirror of
https://github.com/izzy2lost/perfect_dark.git
synced 2026-10-26 20:45:25 -07:00
izzy2lostandClaude Opus 5
a729e9df81
The right stick was never a second analog stick as far as the game is concerned: bondmove.c reads it as contpad1's rstick, which is PD's own two-controller look mode. That is a different scheme from the one the N64 shipped with, where the analog stick does all movement and the C buttons handle looking and sidestepping. The overlay now matches the hardware: one stick, plus the C buttons in their diamond where the second stick used to be. How the stick divides between walking and turning is the game's Control Style setting, as it should be. The right-stick path is removed rather than left dormant -- touchSetStick and touchGetStick lose their stick index, inputReadController stops writing rstick, and the look-sensitivity slider goes with it, since it only ever scaled the stick that no longer exists. Verified on device: C-up pitches the view, and the stick still drives movement and turning. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
38 lines
1.3 KiB
C
38 lines
1.3 KiB
C
#ifndef _IN_TOUCH_H
|
|
#define _IN_TOUCH_H
|
|
|
|
#include <PR/ultratypes.h>
|
|
|
|
#ifdef ANDROID
|
|
|
|
// State of the on-screen controller overlay.
|
|
//
|
|
// The overlay mirrors a real N64 pad: one analog stick plus buttons. Looking and sidestepping
|
|
// are the C buttons, exactly as on hardware, so there is no second stick here.
|
|
//
|
|
// The overlay itself lives in Java (com.perfectdark.port.TouchControls) and runs on the
|
|
// Android UI thread, while inputReadController() runs on the SDL thread, so everything
|
|
// here is stored atomically. Sticks are kept as fixed point in TOUCH_STICK_RANGE units
|
|
// rather than floats so a partially written value can never be observed.
|
|
|
|
#define TOUCH_STICK_RANGE 1024
|
|
|
|
// called from the Java overlay
|
|
// contMask is a bitmask of CONT_ values, ie the same layout as OSContPad.button
|
|
void touchSetButtons(u32 contMask);
|
|
// The single analog stick, as on the N64 pad. x and y are -1 .. 1 in N64 convention:
|
|
// +x is right, +y is UP. The overlay flips Android's y-down screen coordinates.
|
|
void touchSetStick(f32 x, f32 y);
|
|
void touchSetActive(s32 active);
|
|
|
|
// called from inputReadController()
|
|
u32 touchGetButtons(void);
|
|
void touchGetStick(f32 *outX, f32 *outY);
|
|
|
|
// true while the overlay is visible and driving input
|
|
s32 touchIsActive(void);
|
|
|
|
#endif // ANDROID
|
|
|
|
#endif
|