backups/4jcraft
2
0
Fork 0
mirror of https://github.com/4jcraft/4jcraft.git synced 2026-05-17 17:22:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

feat: reimplement absolute mouse input on SDL

Browse source
This commit is contained in:
Tropical 2026-03-10 21:14:19 -05:00
parent cf3defee35
commit 8ae9e62be3
3 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
4J.Input/4J_Input.cpp
View file

@ -21,6 +21,7 @@ static bool s_prevMenuDisplayed = false;
static bool s_snapTaken = false;
static float s_accumRelX = 0, s_accumRelY = 0;
static float s_snapRelX = 0, s_snapRelY = 0;
static int s_mouseX = 0, s_mouseY = 0;
static int s_scrollTicksForButtonPressed = 0;
static int s_scrollTicksForGetValue = 0;
@ -143,7 +144,7 @@ void C_4JInput::Tick() {
if (sc > 0 && sc < KEY_COUNT) s_keysCurrent[sc] = state[sc] != 0;
}
Uint32 btns = SDL_GetMouseState(NULL, NULL);
Uint32 btns = SDL_GetMouseState(&s_mouseX, &s_mouseY);
s_mouseLeftCurrent = (btns & SDL_BUTTON(SDL_BUTTON_LEFT)) != 0;
s_mouseRightCurrent = (btns & SDL_BUTTON(SDL_BUTTON_RIGHT)) != 0;
@ -300,6 +301,15 @@ float C_4JInput::GetJoypadStick_RY(int, bool) {
unsigned char C_4JInput::GetJoypadLTrigger(int, bool) { return s_mouseRightCurrent ? 255 : 0; }
unsigned char C_4JInput::GetJoypadRTrigger(int, bool) { return s_mouseLeftCurrent ? 255 : 0; }
int C_4JInput::GetMouseX() {
return s_mouseX;
}
int C_4JInput::GetMouseY() {
return s_mouseY;
}
// We detect if a Menu is visible on the player's screen to the mouse being stuck.
void C_4JInput::SetMenuDisplayed(int iPad, bool bVal) {
if (iPad >= 0 && iPad < 4) s_menuDisplayed[iPad] = bVal;

4
4J.Input/4J_Input.h
View file

@ -134,8 +134,8 @@ public:
//bool InputDetected(DWORD dwUserIndex,WCHAR *pwchInput);
float GetMouseX();
float GetMouseY();
int GetMouseX();
int GetMouseY();
};
// Singleton

2
Minecraft.Client/UI/Screen.cpp
View file

@ -121,8 +121,6 @@ void Screen::updateEvents()
bool leftState = InputManager.ButtonDown(0, MINECRAFT_ACTION_ACTION);
bool rightState = InputManager.ButtonDown(0, MINECRAFT_ACTION_USE);
printf("%d, %d\n", leftState, rightState);
if (leftState && !prevLeftState) {
mouseClicked(xMouse, yMouse, 0);
}