LegacyConsole/4jcraft
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/4jcraft.git synced 2026-06-27 08:38:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: replace XuiActionPayload polling with server-owned typed action queue

Browse Source
This commit is contained in:
MatthewBeshay
2026-04-09 14:56:35 +10:00
parent 45c85fcf79
commit e051527607
25 changed files with 438 additions and 503 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
targets/app/common/UI/Scenes/Debug/UIScene_DebugSetCamera.cpp
View File

@@ -5,7 +5,6 @@
#include <memory>
#include "app/common/UI/All Platforms/UIStructs.h"
#include "app/common/UI/Controls/UIControl_Button.h"
#include "app/common/UI/Controls/UIControl_CheckBox.h"
#include "app/common/UI/Controls/UIControl_Label.h"
@@ -23,6 +22,8 @@ class UILayer;
#ifdef _DEBUG_MENUS_ENABLED
#include "minecraft/client/Minecraft.h"
#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
#include "minecraft/server/MinecraftServer.h"
#include "minecraft/server/ServerAction.h"
#include "util/StringHelpers.h"
UIScene_DebugSetCamera::UIScene_DebugSetCamera(int iPad, void* initData,
@@ -32,38 +33,38 @@ UIScene_DebugSetCamera::UIScene_DebugSetCamera(int iPad, void* initData,
initialiseMovie();
int playerNo = 0;
currentPosition = new DebugSetCameraPosition();
currentPosition->player = playerNo;
currentPosition = {};
currentPosition.player = playerNo;
Minecraft* pMinecraft = Minecraft::GetInstance();
if (pMinecraft != nullptr) {
Vec3 vec = pMinecraft->localplayers[playerNo]->getPos(1.0);
currentPosition->m_camX = vec.x;
currentPosition->m_camY =
currentPosition.m_camX = vec.x;
currentPosition.m_camY =
vec.y -
1.62; // pMinecraft->localplayers[playerNo]->getHeadHeight();
currentPosition->m_camZ = vec.z;
currentPosition.m_camZ = vec.z;
currentPosition->m_yRot = pMinecraft->localplayers[playerNo]->yRot;
currentPosition->m_elev = pMinecraft->localplayers[playerNo]->xRot;
currentPosition.m_yRot = pMinecraft->localplayers[playerNo]->yRot;
currentPosition.m_elev = pMinecraft->localplayers[playerNo]->xRot;
}
char TempString[256];
snprintf(TempString, 256, "%f", currentPosition->m_camX);
snprintf(TempString, 256, "%f", currentPosition.m_camX);
m_textInputX.init(TempString, eControl_CamX);
snprintf(TempString, 256, "%f", currentPosition->m_camY);
snprintf(TempString, 256, "%f", currentPosition.m_camY);
m_textInputY.init(TempString, eControl_CamY);
snprintf(TempString, 256, "%f", currentPosition->m_camZ);
snprintf(TempString, 256, "%f", currentPosition.m_camZ);
m_textInputZ.init(TempString, eControl_CamZ);
snprintf(TempString, 256, "%f", currentPosition->m_yRot);
snprintf(TempString, 256, "%f", currentPosition.m_yRot);
m_textInputYRot.init(TempString, eControl_YRot);
snprintf(TempString, 256, "%f", currentPosition->m_elev);
snprintf(TempString, 256, "%f", currentPosition.m_elev);
m_textInputElevation.init(TempString, eControl_Elevation);
m_checkboxLockPlayer.init("Lock Player", eControl_LockPlayer,
@@ -106,12 +107,11 @@ void UIScene_DebugSetCamera::handleInput(int iPad, int key, bool repeat,
void UIScene_DebugSetCamera::handlePress(F64 controlId, F64 childId) {
switch ((int)controlId) {
case eControl_Teleport: {
std::unique_ptr<minecraft::XuiActionOwnedPayload> payload(
currentPosition);
currentPosition = nullptr; // ownership transferred
app.SetXuiServerAction(PlatformProfile.GetPrimaryPad(),
eXuiServerAction_SetCameraLocation,
std::move(payload));
MinecraftServer::getInstance()->queueServerAction(
minecraft::server::SetCameraLocation{
currentPosition.player, currentPosition.m_camX,
currentPosition.m_camY, currentPosition.m_camZ,
currentPosition.m_yRot, currentPosition.m_elev});
} break;
case eControl_CamX:
case eControl_CamY:
@@ -147,23 +147,23 @@ int UIScene_DebugSetCamera::handleKeyboardComplete(bool bRes) {
switch (m_keyboardCallbackControl) {
case eControl_CamX:
m_textInputX.setLabel(value);
currentPosition->m_camX = val;
currentPosition.m_camX = val;
break;
case eControl_CamY:
m_textInputY.setLabel(value);
currentPosition->m_camY = val;
currentPosition.m_camY = val;
break;
case eControl_CamZ:
m_textInputZ.setLabel(value);
currentPosition->m_camZ = val;
currentPosition.m_camZ = val;
break;
case eControl_YRot:
m_textInputYRot.setLabel(value);
currentPosition->m_yRot = val;
currentPosition.m_yRot = val;
break;
case eControl_Elevation:
m_textInputElevation.setLabel(value);
currentPosition->m_elev = val;
currentPosition.m_elev = val;
break;
default:
break;