mirror of
https://git.huckle.dev/Huckles-Minecraft-Archive/4jcraft.git
synced 2026-07-08 04:08:16 +00:00
cleanup: flatten dead branches in common app and ui code
This commit is contained in:
@@ -13,24 +13,7 @@ UIComponent_Tooltips::UIComponent_Tooltips(int iPad, void* initData,
|
||||
// Setup all the Iggy references we need for this scene
|
||||
initialiseMovie();
|
||||
|
||||
#if 0
|
||||
// initialise vita touch controls with ids
|
||||
for (unsigned int i = 0; i < ETouchInput_Count; ++i) {
|
||||
m_TouchController[i].init(i);
|
||||
}
|
||||
#endif
|
||||
|
||||
#if 0 || 0 || 0
|
||||
if (InputManager.IsCircleCrossSwapped()) {
|
||||
IggyDataValue result;
|
||||
IggyDataValue value[1];
|
||||
value[0].type = IGGY_DATATYPE_boolean;
|
||||
value[0].boolval = true;
|
||||
IggyResult out = IggyPlayerCallMethodRS(getMovie(), &result,
|
||||
IggyPlayerRootPath(getMovie()),
|
||||
m_funcSetABSwap, 1, value);
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
std::wstring UIComponent_Tooltips::getMoviePath() {
|
||||
@@ -59,7 +42,6 @@ F64 UIComponent_Tooltips::getSafeZoneHalfWidth() {
|
||||
|
||||
float safeWidth = 0.0f;
|
||||
|
||||
#if 1
|
||||
// 85% safezone for tooltips in either SD mode
|
||||
if (!RenderManager.IsHiDef()) {
|
||||
// 85% safezone
|
||||
@@ -68,7 +50,6 @@ F64 UIComponent_Tooltips::getSafeZoneHalfWidth() {
|
||||
// 90% safezone
|
||||
safeWidth = width * (0.1f / 2);
|
||||
}
|
||||
#endif
|
||||
return safeWidth;
|
||||
}
|
||||
|
||||
@@ -331,105 +312,12 @@ void UIComponent_Tooltips::_Relayout() {
|
||||
IggyPlayerRootPath(getMovie()),
|
||||
m_funcUpdateLayout, 0, NULL);
|
||||
|
||||
#if 0
|
||||
// rebuild touchboxes
|
||||
ui.TouchBoxRebuild(this);
|
||||
#endif
|
||||
}
|
||||
|
||||
#if 0
|
||||
void UIComponent_Tooltips::handleTouchInput(unsigned int iPad, S32 x, S32 y,
|
||||
int iId, bool bPressed,
|
||||
bool bRepeat, bool bReleased) {
|
||||
// app.DebugPrintf("ToolTip Touch ID = %i\n", iId);
|
||||
bool handled = false;
|
||||
|
||||
// 4J - TomK no tooltips no touch!
|
||||
if ((!ui.GetMenuDisplayed(ProfileManager.GetPrimaryPad())) &&
|
||||
(app.GetGameSettings(ProfileManager.GetPrimaryPad(),
|
||||
eGameSetting_Tooltips) == 0))
|
||||
return;
|
||||
|
||||
// perform action on release
|
||||
if (bReleased) {
|
||||
switch (iId) {
|
||||
case ETouchInput_Touch_A:
|
||||
app.DebugPrintf("ToolTip Map Touch to _PSV_JOY_BUTTON_X\n",
|
||||
iId);
|
||||
if (InputManager.IsCircleCrossSwapped())
|
||||
InputManager.MapTouchInput(iPad, _PSV_JOY_BUTTON_O);
|
||||
else
|
||||
InputManager.MapTouchInput(iPad, _PSV_JOY_BUTTON_X);
|
||||
break;
|
||||
case ETouchInput_Touch_B:
|
||||
app.DebugPrintf("ToolTip Map Touch to _PSV_JOY_BUTTON_O\n",
|
||||
iId);
|
||||
if (InputManager.IsCircleCrossSwapped())
|
||||
InputManager.MapTouchInput(iPad, _PSV_JOY_BUTTON_X);
|
||||
else
|
||||
InputManager.MapTouchInput(iPad, _PSV_JOY_BUTTON_O);
|
||||
break;
|
||||
case ETouchInput_Touch_X:
|
||||
app.DebugPrintf("ToolTip Map Touch to _PSV_JOY_BUTTON_SQUARE\n",
|
||||
iId);
|
||||
InputManager.MapTouchInput(iPad, _PSV_JOY_BUTTON_SQUARE);
|
||||
break;
|
||||
case ETouchInput_Touch_Y:
|
||||
app.DebugPrintf(
|
||||
"ToolTip Map Touch to _PSV_JOY_BUTTON_TRIANGLE\n", iId);
|
||||
InputManager.MapTouchInput(iPad, _PSV_JOY_BUTTON_TRIANGLE);
|
||||
break;
|
||||
case ETouchInput_Touch_LT:
|
||||
/* not in use on vita */
|
||||
app.DebugPrintf("ToolTip no action\n", iId);
|
||||
break;
|
||||
case ETouchInput_Touch_RightTrigger:
|
||||
app.DebugPrintf("ToolTip no action\n", iId);
|
||||
/* no action */
|
||||
break;
|
||||
case ETouchInput_Touch_LeftBumper:
|
||||
app.DebugPrintf("ToolTip Map Touch to _PSV_JOY_BUTTON_L1\n",
|
||||
iId);
|
||||
InputManager.MapTouchInput(iPad, _PSV_JOY_BUTTON_L1);
|
||||
break;
|
||||
case ETouchInput_Touch_RightBumper:
|
||||
app.DebugPrintf("ToolTip Map Touch to _PSV_JOY_BUTTON_R1\n",
|
||||
iId);
|
||||
InputManager.MapTouchInput(iPad, _PSV_JOY_BUTTON_R1);
|
||||
break;
|
||||
case ETouchInput_Touch_LeftStick:
|
||||
app.DebugPrintf("ToolTip no action\n", iId);
|
||||
/* no action */
|
||||
break;
|
||||
case ETouchInput_Touch_RightStick:
|
||||
app.DebugPrintf(
|
||||
"ToolTip Map Touch to _PSV_JOY_BUTTON_DPAD_DOWN\n", iId);
|
||||
InputManager.MapTouchInput(iPad, _PSV_JOY_BUTTON_DPAD_DOWN);
|
||||
break;
|
||||
case ETouchInput_Touch_Select:
|
||||
app.DebugPrintf("ToolTip Map Touch to _PSV_JOY_BUTTON_SELECT\n",
|
||||
iId);
|
||||
InputManager.MapTouchInput(iPad, _PSV_JOY_BUTTON_SELECT);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
void UIComponent_Tooltips::handleReload() {
|
||||
app.DebugPrintf("UIComponent_Tooltips::handleReload\n");
|
||||
|
||||
#if 0 || 0 || 0
|
||||
if (InputManager.IsCircleCrossSwapped()) {
|
||||
IggyDataValue result;
|
||||
IggyDataValue value[1];
|
||||
value[0].type = IGGY_DATATYPE_boolean;
|
||||
value[0].boolval = true;
|
||||
IggyResult out = IggyPlayerCallMethodRS(getMovie(), &result,
|
||||
IggyPlayerRootPath(getMovie()),
|
||||
m_funcSetABSwap, 1, value);
|
||||
}
|
||||
#endif
|
||||
|
||||
for (unsigned int i = 0; i < eToolTipNumButtons; ++i) {
|
||||
_SetTooltip(i, m_tooltipValues[i].iString, m_tooltipValues[i].show,
|
||||
|
||||
Reference in New Issue
Block a user