diff --git a/targets/app/common/Game.cpp b/targets/app/common/Game.cpp index 5b0cb2de6..7dd456d9f 100644 --- a/targets/app/common/Game.cpp +++ b/targets/app/common/Game.cpp @@ -2,7 +2,6 @@ #include "app/common/Game.h" #include "platform/PlatformTypes.h" -#include "platform/input/InputActions.h" #include "platform/profile/profile.h" #include "platform/sdl2/Render.h" #include "platform/sdl2/Storage.h" diff --git a/targets/app/common/LocalizationManager.cpp b/targets/app/common/LocalizationManager.cpp index cb5244516..7c17e7e83 100644 --- a/targets/app/common/LocalizationManager.cpp +++ b/targets/app/common/LocalizationManager.cpp @@ -16,7 +16,6 @@ #include "minecraft/client/Minecraft.h" #include "minecraft/client/skins/TexturePack.h" #include "minecraft/client/skins/TexturePackRepository.h" -#include "platform/input/InputActions.h" #include "platform/input/input.h" #include "platform/sdl2/Render.h" #include "platform/XboxStubs.h" diff --git a/targets/app/common/Tutorial/Constraints/InputConstraint.cpp b/targets/app/common/Tutorial/Constraints/InputConstraint.cpp index fd63b22d7..92790a289 100644 --- a/targets/app/common/Tutorial/Constraints/InputConstraint.cpp +++ b/targets/app/common/Tutorial/Constraints/InputConstraint.cpp @@ -1,6 +1,5 @@ #include "InputConstraint.h" -#include "platform/input/InputActions.h" #include "platform/input/input.h" bool InputConstraint::isMappingConstrained(int iPad, int mapping) { diff --git a/targets/app/common/Tutorial/FullTutorial.cpp b/targets/app/common/Tutorial/FullTutorial.cpp index 4d6fbe1e9..9d357652c 100644 --- a/targets/app/common/Tutorial/FullTutorial.cpp +++ b/targets/app/common/Tutorial/FullTutorial.cpp @@ -3,7 +3,6 @@ #include #include -#include "platform/input/InputActions.h" #include "app/common/GameRules/LevelRules/RuleDefinitions/LevelRuleset.h" #include "app/common/Tutorial/Constraints/AreaConstraint.h" #include "app/common/Tutorial/Constraints/ChangeStateConstraint.h" diff --git a/targets/app/common/Tutorial/Tutorial.cpp b/targets/app/common/Tutorial/Tutorial.cpp index af24d08ea..e477c1ae4 100644 --- a/targets/app/common/Tutorial/Tutorial.cpp +++ b/targets/app/common/Tutorial/Tutorial.cpp @@ -6,7 +6,6 @@ #include #include -#include "platform/input/InputActions.h" #include "platform/profile/profile.h" #include "minecraft/GameEnums.h" #include "app/common/App_structs.h" diff --git a/targets/app/common/UI/All Platforms/IUIScene_AbstractContainerMenu.cpp b/targets/app/common/UI/All Platforms/IUIScene_AbstractContainerMenu.cpp index b58e60814..068e0206f 100644 --- a/targets/app/common/UI/All Platforms/IUIScene_AbstractContainerMenu.cpp +++ b/targets/app/common/UI/All Platforms/IUIScene_AbstractContainerMenu.cpp @@ -7,7 +7,6 @@ #include #include -#include "platform/input/InputActions.h" #include "platform/input/input.h" #include "platform/sdl2/Render.h" #include "minecraft/GameEnums.h" diff --git a/targets/app/common/UI/All Platforms/IUIScene_CraftingMenu.cpp b/targets/app/common/UI/All Platforms/IUIScene_CraftingMenu.cpp index d3ef721d0..d489b96c4 100644 --- a/targets/app/common/UI/All Platforms/IUIScene_CraftingMenu.cpp +++ b/targets/app/common/UI/All Platforms/IUIScene_CraftingMenu.cpp @@ -7,7 +7,6 @@ #include #include -#include "platform/input/InputActions.h" #include "platform/profile/profile.h" #include "platform/sdl2/Render.h" #include "minecraft/GameEnums.h" diff --git a/targets/app/common/UI/All Platforms/IUIScene_CreativeMenu.cpp b/targets/app/common/UI/All Platforms/IUIScene_CreativeMenu.cpp index a446a4a46..920582a1f 100644 --- a/targets/app/common/UI/All Platforms/IUIScene_CreativeMenu.cpp +++ b/targets/app/common/UI/All Platforms/IUIScene_CreativeMenu.cpp @@ -6,7 +6,6 @@ #include #include -#include "platform/input/InputActions.h" #include "app/common/UI/All Platforms/IUIScene_AbstractContainerMenu.h" #include "app/linux/LinuxGame.h" #include "app/linux/Linux_UIController.h" diff --git a/targets/app/common/UI/All Platforms/IUIScene_TradingMenu.cpp b/targets/app/common/UI/All Platforms/IUIScene_TradingMenu.cpp index c67cc7e70..31cebcfc9 100644 --- a/targets/app/common/UI/All Platforms/IUIScene_TradingMenu.cpp +++ b/targets/app/common/UI/All Platforms/IUIScene_TradingMenu.cpp @@ -4,7 +4,6 @@ #include -#include "platform/input/InputActions.h" #include "app/common/Tutorial/Tutorial.h" #include "app/common/UI/All Platforms/UIEnums.h" #include "app/linux/LinuxGame.h" diff --git a/targets/app/common/UI/Components/UIComponent_Tooltips.h b/targets/app/common/UI/Components/UIComponent_Tooltips.h index b0d59aa8c..c9ec16229 100644 --- a/targets/app/common/UI/Components/UIComponent_Tooltips.h +++ b/targets/app/common/UI/Components/UIComponent_Tooltips.h @@ -3,7 +3,6 @@ #include #include "platform/PlatformTypes.h" -#include "platform/input/InputActions.h" #include "platform/sdl2/Render.h" #include "minecraft/GameEnums.h" #include "app/common/UI/All Platforms/UIEnums.h" diff --git a/targets/app/common/UI/Scenes/Debug/UIScene_DebugCreateSchematic.cpp b/targets/app/common/UI/Scenes/Debug/UIScene_DebugCreateSchematic.cpp index 6172541a8..21bfdb274 100644 --- a/targets/app/common/UI/Scenes/Debug/UIScene_DebugCreateSchematic.cpp +++ b/targets/app/common/UI/Scenes/Debug/UIScene_DebugCreateSchematic.cpp @@ -3,7 +3,6 @@ #include -#include "platform/input/InputActions.h" #include "platform/input/input.h" #include "platform/profile/profile.h" #include "minecraft/GameEnums.h" diff --git a/targets/app/common/UI/Scenes/Debug/UIScene_DebugOptions.cpp b/targets/app/common/UI/Scenes/Debug/UIScene_DebugOptions.cpp index 7a102e0ae..d42483a53 100644 --- a/targets/app/common/UI/Scenes/Debug/UIScene_DebugOptions.cpp +++ b/targets/app/common/UI/Scenes/Debug/UIScene_DebugOptions.cpp @@ -1,6 +1,5 @@ #include "UIScene_DebugOptions.h" -#include "platform/input/InputActions.h" #include "app/common/Console_Debug_enum.h" #include "app/common/UI/Controls/UIControl_CheckBox.h" #include "app/common/UI/UIScene.h" diff --git a/targets/app/common/UI/Scenes/Debug/UIScene_DebugOverlay.cpp b/targets/app/common/UI/Scenes/Debug/UIScene_DebugOverlay.cpp index f9ddf23d8..a169bbf51 100644 --- a/targets/app/common/UI/Scenes/Debug/UIScene_DebugOverlay.cpp +++ b/targets/app/common/UI/Scenes/Debug/UIScene_DebugOverlay.cpp @@ -5,7 +5,6 @@ #include -#include "platform/input/InputActions.h" #include "platform/profile/profile.h" #include "minecraft/GameEnums.h" #include "app/common/Tutorial/Tutorial.h" diff --git a/targets/app/common/UI/Scenes/Debug/UIScene_DebugSetCamera.cpp b/targets/app/common/UI/Scenes/Debug/UIScene_DebugSetCamera.cpp index 855d9fa3d..5d77ae589 100644 --- a/targets/app/common/UI/Scenes/Debug/UIScene_DebugSetCamera.cpp +++ b/targets/app/common/UI/Scenes/Debug/UIScene_DebugSetCamera.cpp @@ -5,7 +5,6 @@ #include -#include "platform/input/InputActions.h" #include "platform/input/input.h" #include "platform/profile/profile.h" #include "minecraft/GameEnums.h" diff --git a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.cpp b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.cpp index 7f900f8b7..50beae266 100644 --- a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.cpp +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.cpp @@ -7,7 +7,6 @@ #include #include "platform/PlatformTypes.h" -#include "platform/input/InputActions.h" #include "platform/input/input.h" #include "platform/profile/profile.h" #include "app/common/App_Defines.h" diff --git a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_DLCMainMenu.cpp b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_DLCMainMenu.cpp index 62cce0128..21f38703c 100644 --- a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_DLCMainMenu.cpp +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_DLCMainMenu.cpp @@ -1,7 +1,6 @@ #include "UIScene_DLCMainMenu.h" -#include "platform/input/InputActions.h" #include "minecraft/GameEnums.h" #include "app/common/UI/All Platforms/UIStructs.h" #include "app/common/UI/Controls/UIControl_ButtonList.h" diff --git a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_DLCOffersMenu.cpp b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_DLCOffersMenu.cpp index 61d7a1b25..b137ded49 100644 --- a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_DLCOffersMenu.cpp +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_DLCOffersMenu.cpp @@ -4,7 +4,6 @@ #include #include "platform/PlatformTypes.h" -#include "platform/input/InputActions.h" #include "platform/sdl2/Render.h" #include "app/common/UI/All Platforms/UIStructs.h" #include "app/common/UI/Controls/UIControl_DLCList.h" diff --git a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_EULA.cpp b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_EULA.cpp index e9b9a972e..85cdd36cd 100644 --- a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_EULA.cpp +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_EULA.cpp @@ -4,7 +4,6 @@ #include #include "platform/PlatformTypes.h" -#include "platform/input/InputActions.h" #include "platform/input/input.h" #include "platform/profile/profile.h" #include "app/common/App_Defines.h" diff --git a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_Intro.cpp b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_Intro.cpp index 138ef39bb..08a72f7fa 100644 --- a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_Intro.cpp +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_Intro.cpp @@ -1,6 +1,5 @@ #include "UIScene_Intro.h" -#include "platform/input/InputActions.h" #include "app/common/UI/All Platforms/UIEnums.h" #include "app/common/UI/UIScene.h" #include "app/linux/Iggy/include/iggy.h" diff --git a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.cpp b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.cpp index 196f1bde0..96af029b0 100644 --- a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.cpp +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.cpp @@ -5,7 +5,6 @@ #include #include "platform/PlatformTypes.h" -#include "platform/input/InputActions.h" #include "platform/profile/profile.h" #include "app/common/App_Defines.h" #include "minecraft/GameEnums.h" diff --git a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.cpp b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.cpp index 4109cae26..a92076a31 100644 --- a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.cpp +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.cpp @@ -4,7 +4,6 @@ #include -#include "platform/input/InputActions.h" #include "platform/input/input.h" #include "platform/profile/profile.h" #include "platform/sdl2/Render.h" diff --git a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.cpp b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.cpp index 672f68b84..719b34536 100644 --- a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.cpp +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.cpp @@ -8,7 +8,6 @@ #include -#include "platform/input/InputActions.h" #include "platform/profile/profile.h" #include "app/common/Console_Debug_enum.h" #include "app/common/Leaderboards/LeaderboardInterface.h" diff --git a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.cpp b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.cpp index e9206060b..3530b084b 100644 --- a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.cpp +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.cpp @@ -5,7 +5,6 @@ #include #include "platform/PlatformTypes.h" -#include "platform/input/InputActions.h" #include "platform/profile/profile.h" #include "platform/sdl2/Render.h" #include "app/common/App_Defines.h" diff --git a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.cpp b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.cpp index 88e565f95..d78366689 100644 --- a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.cpp +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.cpp @@ -6,7 +6,6 @@ #include -#include "platform/input/InputActions.h" #include "platform/input/input.h" #include "platform/profile/profile.h" #include "app/common/App_Defines.h" diff --git a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.cpp b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.cpp index 4db7251e5..896d14489 100644 --- a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.cpp +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.cpp @@ -7,7 +7,6 @@ #include #include "platform/PlatformTypes.h" -#include "platform/input/InputActions.h" #include "platform/profile/profile.h" #include "platform/sdl2/Render.h" #include "app/common/App_Defines.h" diff --git a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_NewUpdateMessage.cpp b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_NewUpdateMessage.cpp index bc11fc542..1129f0402 100644 --- a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_NewUpdateMessage.cpp +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_NewUpdateMessage.cpp @@ -3,7 +3,6 @@ #include -#include "platform/input/InputActions.h" #include "app/common/App_Defines.h" #include "minecraft/GameEnums.h" #include "app/common/UI/Controls/UIControl_Button.h" diff --git a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_SaveMessage.cpp b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_SaveMessage.cpp index f30704895..d28a3ecf7 100644 --- a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_SaveMessage.cpp +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_SaveMessage.cpp @@ -2,7 +2,6 @@ #include "UIScene_SaveMessage.h" #include "platform/PlatformTypes.h" -#include "platform/input/InputActions.h" #include "platform/input/input.h" #include "platform/profile/profile.h" #include "app/common/App_Defines.h" diff --git a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_TrialExitUpsell.cpp b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_TrialExitUpsell.cpp index 656f849d0..aebbdef45 100644 --- a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_TrialExitUpsell.cpp +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_TrialExitUpsell.cpp @@ -1,7 +1,6 @@ #include "UIScene_TrialExitUpsell.h" -#include "platform/input/InputActions.h" #include "platform/profile/profile.h" #include "app/common/App_Defines.h" #include "app/common/UI/UIScene.h" diff --git a/targets/app/common/UI/Scenes/Help & Options/UIScene_ControlsMenu.cpp b/targets/app/common/UI/Scenes/Help & Options/UIScene_ControlsMenu.cpp index f348711ae..ec2a5d1f3 100644 --- a/targets/app/common/UI/Scenes/Help & Options/UIScene_ControlsMenu.cpp +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_ControlsMenu.cpp @@ -4,7 +4,6 @@ #include -#include "platform/input/InputActions.h" #include "platform/input/input.h" #include "minecraft/GameEnums.h" #include "app/common/BuildVer/BuildVer.h" diff --git a/targets/app/common/UI/Scenes/Help & Options/UIScene_Credits.cpp b/targets/app/common/UI/Scenes/Help & Options/UIScene_Credits.cpp index 8d60b0a33..6691f4bde 100644 --- a/targets/app/common/UI/Scenes/Help & Options/UIScene_Credits.cpp +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_Credits.cpp @@ -4,7 +4,6 @@ #include #include -#include "platform/input/InputActions.h" #include "app/common/UI/UILayer.h" #include "app/common/UI/UIScene.h" #include "app/linux/LinuxGame.h" diff --git a/targets/app/common/UI/Scenes/Help & Options/UIScene_HelpAndOptionsMenu.cpp b/targets/app/common/UI/Scenes/Help & Options/UIScene_HelpAndOptionsMenu.cpp index 009710a2b..5dabd1970 100644 --- a/targets/app/common/UI/Scenes/Help & Options/UIScene_HelpAndOptionsMenu.cpp +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_HelpAndOptionsMenu.cpp @@ -1,7 +1,6 @@ #include "UIScene_HelpAndOptionsMenu.h" -#include "platform/input/InputActions.h" #include "platform/profile/profile.h" #include "app/common/UI/Controls/UIControl_Button.h" #include "app/common/UI/UILayer.h" diff --git a/targets/app/common/UI/Scenes/Help & Options/UIScene_HowToPlay.cpp b/targets/app/common/UI/Scenes/Help & Options/UIScene_HowToPlay.cpp index f8030cd5d..132fc8dca 100644 --- a/targets/app/common/UI/Scenes/Help & Options/UIScene_HowToPlay.cpp +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_HowToPlay.cpp @@ -6,7 +6,6 @@ #include -#include "platform/input/InputActions.h" #include "minecraft/GameEnums.h" #include "app/common/UI/Controls/UIControl_Label.h" #include "app/common/UI/UIScene.h" diff --git a/targets/app/common/UI/Scenes/Help & Options/UIScene_HowToPlayMenu.cpp b/targets/app/common/UI/Scenes/Help & Options/UIScene_HowToPlayMenu.cpp index 0b06c417a..d85e378e0 100644 --- a/targets/app/common/UI/Scenes/Help & Options/UIScene_HowToPlayMenu.cpp +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_HowToPlayMenu.cpp @@ -3,7 +3,6 @@ #include -#include "platform/input/InputActions.h" #include "app/common/UI/Controls/UIControl_ButtonList.h" #include "app/common/UI/UILayer.h" #include "app/common/UI/UIScene.h" diff --git a/targets/app/common/UI/Scenes/Help & Options/UIScene_LanguageSelector.cpp b/targets/app/common/UI/Scenes/Help & Options/UIScene_LanguageSelector.cpp index 9f4a3cc83..04eefddb5 100644 --- a/targets/app/common/UI/Scenes/Help & Options/UIScene_LanguageSelector.cpp +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_LanguageSelector.cpp @@ -1,6 +1,5 @@ #include "UIScene_LanguageSelector.h" -#include "platform/input/InputActions.h" #include "app/common/UI/Controls/UIControl_ButtonList.h" #include "app/common/UI/UILayer.h" #include "app/common/UI/UIScene.h" diff --git a/targets/app/common/UI/Scenes/Help & Options/UIScene_ReinstallMenu.cpp b/targets/app/common/UI/Scenes/Help & Options/UIScene_ReinstallMenu.cpp index 173ddd7d9..dd5744486 100644 --- a/targets/app/common/UI/Scenes/Help & Options/UIScene_ReinstallMenu.cpp +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_ReinstallMenu.cpp @@ -1,7 +1,6 @@ #include "UIScene_ReinstallMenu.h" -#include "platform/input/InputActions.h" #include "app/common/UI/UILayer.h" #include "app/common/UI/UIScene.h" #include "app/linux/LinuxGame.h" diff --git a/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsAudioMenu.cpp b/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsAudioMenu.cpp index d4a7a677c..26985f984 100644 --- a/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsAudioMenu.cpp +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsAudioMenu.cpp @@ -3,7 +3,6 @@ #include -#include "platform/input/InputActions.h" #include "minecraft/GameEnums.h" #include "app/common/UI/Controls/UIControl_Slider.h" #include "app/common/UI/UILayer.h" diff --git a/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsControlMenu.cpp b/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsControlMenu.cpp index 2b00fb243..6253885c7 100644 --- a/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsControlMenu.cpp +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsControlMenu.cpp @@ -2,7 +2,6 @@ #include -#include "platform/input/InputActions.h" #include "minecraft/GameEnums.h" #include "app/common/UI/Controls/UIControl_Slider.h" #include "app/common/UI/UILayer.h" diff --git a/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsGraphicsMenu.cpp b/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsGraphicsMenu.cpp index afececfb9..06cf9378a 100644 --- a/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsGraphicsMenu.cpp +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsGraphicsMenu.cpp @@ -2,7 +2,6 @@ #include -#include "platform/input/InputActions.h" #include "platform/profile/profile.h" #include "minecraft/GameEnums.h" #include "app/common/Network/GameNetworkManager.h" diff --git a/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsMenu.cpp b/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsMenu.cpp index 931d26cdb..d69287aca 100644 --- a/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsMenu.cpp +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsMenu.cpp @@ -1,7 +1,6 @@ #include "UIScene_SettingsMenu.h" -#include "platform/input/InputActions.h" #include "platform/profile/profile.h" #include "app/common/UI/Controls/UIControl_Button.h" #include "app/common/UI/UILayer.h" diff --git a/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsOptionsMenu.cpp b/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsOptionsMenu.cpp index 442fa90d1..c41edec49 100644 --- a/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsOptionsMenu.cpp +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsOptionsMenu.cpp @@ -3,7 +3,6 @@ #include -#include "platform/input/InputActions.h" #include "platform/profile/profile.h" #include "platform/sdl2/Render.h" #include "minecraft/GameEnums.h" diff --git a/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsUIMenu.cpp b/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsUIMenu.cpp index c5ef9709b..75a502653 100644 --- a/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsUIMenu.cpp +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsUIMenu.cpp @@ -3,7 +3,6 @@ #include -#include "platform/input/InputActions.h" #include "platform/profile/profile.h" #include "minecraft/GameEnums.h" #include "app/common/UI/Controls/UIControl_CheckBox.h" diff --git a/targets/app/common/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.cpp b/targets/app/common/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.cpp index 2b6b36740..9bbedf0eb 100644 --- a/targets/app/common/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.cpp +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.cpp @@ -5,7 +5,6 @@ #include -#include "platform/input/InputActions.h" #include "platform/profile/profile.h" #include "platform/sdl2/Render.h" #include "app/common/App_Defines.h" diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.cpp b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.cpp index 32ec0ad59..21fce9209 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.cpp +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.cpp @@ -4,7 +4,6 @@ #include #include -#include "platform/input/InputActions.h" #include "app/common/Tutorial/Tutorial.h" #include "app/common/Tutorial/TutorialMode.h" #include "app/common/UI/All Platforms/UIStructs.h" diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.cpp b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.cpp index 3cbc49aea..13c05ad46 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.cpp +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.cpp @@ -5,7 +5,6 @@ #include #include -#include "platform/input/InputActions.h" #include "platform/profile/profile.h" #include "app/common/Tutorial/Tutorial.h" #include "app/common/Tutorial/TutorialEnum.h" diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.cpp b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.cpp index 27dd4b07a..f62f84c53 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.cpp +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.cpp @@ -1,7 +1,6 @@ #include "UIScene_CraftingMenu.h" -#include "platform/input/InputActions.h" #include "platform/profile/profile.h" #include "app/common/Tutorial/Tutorial.h" #include "app/common/Tutorial/TutorialEnum.h" diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_DeathMenu.cpp b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_DeathMenu.cpp index 03a42c411..2e2ce00ad 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_DeathMenu.cpp +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_DeathMenu.cpp @@ -3,7 +3,6 @@ #include -#include "platform/input/InputActions.h" #include "platform/profile/profile.h" #include "platform/sdl2/Storage.h" #include "minecraft/GameEnums.h" diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.cpp b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.cpp index cfc1b8f36..3a134ac1c 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.cpp +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.cpp @@ -7,7 +7,6 @@ #include #include "platform/PlatformTypes.h" -#include "platform/input/InputActions.h" #include "platform/profile/profile.h" #include "minecraft/GameEnums.h" #include "app/common/Tutorial/Tutorial.h" diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGameHostOptionsMenu.cpp b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGameHostOptionsMenu.cpp index 394246c94..3f98e1319 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGameHostOptionsMenu.cpp +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGameHostOptionsMenu.cpp @@ -3,7 +3,6 @@ #include -#include "platform/input/InputActions.h" #include "minecraft/GameEnums.h" #include "app/common/Network/GameNetworkManager.h" #include "app/common/Network/NetworkPlayerInterface.h" diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.cpp b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.cpp index 814e015d0..8e2a3358b 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.cpp +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.cpp @@ -3,7 +3,6 @@ #include #include "platform/PlatformTypes.h" -#include "platform/input/InputActions.h" #include "platform/profile/profile.h" #include "minecraft/GameEnums.h" #include "app/common/Console_Debug_enum.h" diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGamePlayerOptionsMenu.cpp b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGamePlayerOptionsMenu.cpp index 05fa69ef0..f22a2fe04 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGamePlayerOptionsMenu.cpp +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGamePlayerOptionsMenu.cpp @@ -3,7 +3,6 @@ #include -#include "platform/input/InputActions.h" #include "minecraft/GameEnums.h" #include "app/common/Network/GameNetworkManager.h" #include "app/common/Network/NetworkPlayerInterface.h" diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.cpp b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.cpp index 9e1199570..f3d26fe92 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.cpp +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.cpp @@ -5,7 +5,6 @@ #include -#include "platform/input/InputActions.h" #include "platform/profile/profile.h" #include "minecraft/GameEnums.h" #include "app/common/DLC/DLCManager.h" diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.cpp b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.cpp index bb7f91a6c..75bfb83f2 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.cpp +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.cpp @@ -1,7 +1,6 @@ #include "UIScene_SignEntryMenu.h" -#include "platform/input/InputActions.h" #include "platform/input/input.h" #include "app/common/UI/All Platforms/UIStructs.h" #include "app/common/UI/Controls/UIControl_Button.h" diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.cpp b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.cpp index 9b5a14269..33a08b6dd 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.cpp +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.cpp @@ -3,7 +3,6 @@ #include -#include "platform/input/InputActions.h" #include "app/common/Console_Debug_enum.h" #include "app/common/Network/GameNetworkManager.h" #include "app/common/Network/NetworkPlayerInterface.h" diff --git a/targets/app/common/UI/Scenes/UIScene_ConnectingProgress.cpp b/targets/app/common/UI/Scenes/UIScene_ConnectingProgress.cpp index 1645893d6..fa5325bb7 100644 --- a/targets/app/common/UI/Scenes/UIScene_ConnectingProgress.cpp +++ b/targets/app/common/UI/Scenes/UIScene_ConnectingProgress.cpp @@ -1,7 +1,6 @@ #include "UIScene_ConnectingProgress.h" -#include "platform/input/InputActions.h" #include "platform/profile/profile.h" #include "minecraft/GameEnums.h" #include "app/common/Network/GameNetworkManager.h" diff --git a/targets/app/common/UI/Scenes/UIScene_FullscreenProgress.cpp b/targets/app/common/UI/Scenes/UIScene_FullscreenProgress.cpp index ee69a4b49..83033654c 100644 --- a/targets/app/common/UI/Scenes/UIScene_FullscreenProgress.cpp +++ b/targets/app/common/UI/Scenes/UIScene_FullscreenProgress.cpp @@ -5,7 +5,6 @@ #include #include "platform/PlatformTypes.h" -#include "platform/input/InputActions.h" #include "platform/profile/profile.h" #include "minecraft/GameEnums.h" #include "app/common/Network/GameNetworkManager.h" diff --git a/targets/app/common/UI/Scenes/UIScene_Keyboard.cpp b/targets/app/common/UI/Scenes/UIScene_Keyboard.cpp index c93d5be06..db1538ee4 100644 --- a/targets/app/common/UI/Scenes/UIScene_Keyboard.cpp +++ b/targets/app/common/UI/Scenes/UIScene_Keyboard.cpp @@ -1,6 +1,5 @@ #include "UIScene_Keyboard.h" -#include "platform/input/InputActions.h" #include "app/common/App_Defines.h" #include "app/common/UI/Controls/UIControl_Button.h" #include "app/common/UI/Controls/UIControl_Label.h" diff --git a/targets/app/common/UI/Scenes/UIScene_MessageBox.cpp b/targets/app/common/UI/Scenes/UIScene_MessageBox.cpp index 3b17861cd..7068b8c65 100644 --- a/targets/app/common/UI/Scenes/UIScene_MessageBox.cpp +++ b/targets/app/common/UI/Scenes/UIScene_MessageBox.cpp @@ -2,7 +2,6 @@ #include "UIScene_MessageBox.h" #include "platform/PlatformTypes.h" -#include "platform/input/InputActions.h" #include "platform/profile/profile.h" #include "app/common/UI/All Platforms/UIStructs.h" #include "app/common/UI/Controls/UIControl_Button.h" diff --git a/targets/app/common/UI/Scenes/UIScene_QuadrantSignin.cpp b/targets/app/common/UI/Scenes/UIScene_QuadrantSignin.cpp index ff9dc3e1e..cc96f8117 100644 --- a/targets/app/common/UI/Scenes/UIScene_QuadrantSignin.cpp +++ b/targets/app/common/UI/Scenes/UIScene_QuadrantSignin.cpp @@ -4,7 +4,6 @@ #include #include "platform/PlatformTypes.h" -#include "platform/input/InputActions.h" #include "platform/input/input.h" #include "platform/profile/profile.h" #include "app/common/UI/Controls/UIControl_BitmapIcon.h" diff --git a/targets/app/common/UI/UIController.h b/targets/app/common/UI/UIController.h index cf808ed11..04dc7f98f 100644 --- a/targets/app/common/UI/UIController.h +++ b/targets/app/common/UI/UIController.h @@ -21,7 +21,7 @@ #endif #include "platform/PlatformTypes.h" -#include "platform/input/InputActions.h" +#include "platform/input/input.h" #include "platform/sdl2/Render.h" #include "platform/sdl2/Storage.h" #include "app/common/UI/All Platforms/IUIController.h" diff --git a/targets/app/common/UI/UIScene.cpp b/targets/app/common/UI/UIScene.cpp index efb0da2f0..71e857a65 100644 --- a/targets/app/common/UI/UIScene.cpp +++ b/targets/app/common/UI/UIScene.cpp @@ -5,7 +5,6 @@ #include #include "platform/PlatformTypes.h" -#include "platform/input/InputActions.h" #include "platform/sdl2/Render.h" #include "app/common/UI/All Platforms/UIEnums.h" #include "app/common/UI/All Platforms/UIStructs.h" diff --git a/targets/app/linux/Linux_Minecraft.cpp b/targets/app/linux/Linux_Minecraft.cpp index e25e79b58..84a6669a7 100644 --- a/targets/app/linux/Linux_Minecraft.cpp +++ b/targets/app/linux/Linux_Minecraft.cpp @@ -54,7 +54,6 @@ static void sigsegv_handler(int sig) { // #include "../Common/XUI/XUI_Scene_Container.h" // #include "NetworkManager.h" #include "platform/PlatformTypes.h" -#include "platform/input/InputActions.h" #include "platform/input/input.h" #include "platform/profile/profile.h" #include "platform/sdl2/Render.h" diff --git a/targets/app/linux/Linux_UIController.h b/targets/app/linux/Linux_UIController.h index 09f5dfc30..ca59ed540 100644 --- a/targets/app/linux/Linux_UIController.h +++ b/targets/app/linux/Linux_UIController.h @@ -4,6 +4,7 @@ #include "app/common/UI/UIController.h" #include "app/linux/Iggy/include/iggy.h" #include "app/linux/Iggy/include/rrCore.h" +#include "platform/profile/profile.h" class ConsoleUIController : public UIController { public: diff --git a/targets/minecraft/client/Minecraft.cpp b/targets/minecraft/client/Minecraft.cpp index e71d92634..9be44bec7 100644 --- a/targets/minecraft/client/Minecraft.cpp +++ b/targets/minecraft/client/Minecraft.cpp @@ -13,7 +13,6 @@ #include #include -#include "platform/input/InputActions.h" #include "platform/profile/profile.h" #include "platform/sdl2/Render.h" #include "platform/sdl2/Storage.h" diff --git a/targets/minecraft/client/gui/Screen.cpp b/targets/minecraft/client/gui/Screen.cpp index 7d2bcd549..0363f767a 100644 --- a/targets/minecraft/client/gui/Screen.cpp +++ b/targets/minecraft/client/gui/Screen.cpp @@ -1,7 +1,6 @@ #include "minecraft/IGameServices.h" #include "Screen.h" -#include "platform/input/InputActions.h" #include "platform/input/input.h" #include "platform/profile/profile.h" #include "Button.h" diff --git a/targets/minecraft/client/gui/inventory/CreativeInventoryScreen.cpp b/targets/minecraft/client/gui/inventory/CreativeInventoryScreen.cpp index cf90fe3b4..ee0cb7559 100644 --- a/targets/minecraft/client/gui/inventory/CreativeInventoryScreen.cpp +++ b/targets/minecraft/client/gui/inventory/CreativeInventoryScreen.cpp @@ -6,7 +6,6 @@ #include #include -#include "platform/input/InputActions.h" #include "platform/input/input.h" #include "platform/sdl2/Render.h" #include "AbstractContainerScreen.h" diff --git a/targets/minecraft/client/player/Input.cpp b/targets/minecraft/client/player/Input.cpp index c9973d902..3dded71b6 100644 --- a/targets/minecraft/client/player/Input.cpp +++ b/targets/minecraft/client/player/Input.cpp @@ -3,7 +3,6 @@ #include -#include "platform/input/InputActions.h" #include "platform/input/input.h" #include "LocalPlayer.h" #include "minecraft/GameEnums.h" diff --git a/targets/minecraft/client/player/LocalPlayer.cpp b/targets/minecraft/client/player/LocalPlayer.cpp index 8d71a91ff..7f5610f03 100644 --- a/targets/minecraft/client/player/LocalPlayer.cpp +++ b/targets/minecraft/client/player/LocalPlayer.cpp @@ -28,7 +28,6 @@ #include "minecraft/world/item/Item.h" #include "minecraft/world/level/tile/Tile.h" // 4J Stu - Added for tutorial callbacks -#include "platform/input/InputActions.h" #include "platform/input/input.h" #include "platform/profile/profile.h" #include "platform/sdl2/Render.h" diff --git a/targets/platform/PlatformServices.cpp b/targets/platform/PlatformServices.cpp index cde97296c..0963a3e75 100644 --- a/targets/platform/PlatformServices.cpp +++ b/targets/platform/PlatformServices.cpp @@ -1,13 +1,11 @@ #include "PlatformServices.h" #include "StdFileIO.h" -#include "sdl2/Profile.h" #include "sdl2/Render.h" #include "sdl2/Storage.h" static StdFileIO s_stdFileIO; IPlatformFileIO& PlatformFileIO = s_stdFileIO; -IPlatformProfile& PlatformProfile = PlatformProfile; IPlatformRenderer& PlatformRender = RenderManager; IPlatformStorage& PlatformStorage = StorageManager; diff --git a/targets/platform/input/IPlatformInput.h b/targets/platform/input/IPlatformInput.h index 8b20b0c15..4fe09aa4e 100644 --- a/targets/platform/input/IPlatformInput.h +++ b/targets/platform/input/IPlatformInput.h @@ -3,51 +3,7 @@ #include #include "PlatformTypes.h" - -#define MAP_STYLE_0 0 -#define MAP_STYLE_1 1 -#define MAP_STYLE_2 2 - -#define _360_JOY_BUTTON_A 0x00000001 -#define _360_JOY_BUTTON_B 0x00000002 -#define _360_JOY_BUTTON_X 0x00000004 -#define _360_JOY_BUTTON_Y 0x00000008 - -#define _360_JOY_BUTTON_START 0x00000010 -#define _360_JOY_BUTTON_BACK 0x00000020 -#define _360_JOY_BUTTON_RB 0x00000040 -#define _360_JOY_BUTTON_LB 0x00000080 - -#define _360_JOY_BUTTON_RTHUMB 0x00000100 -#define _360_JOY_BUTTON_LTHUMB 0x00000200 -#define _360_JOY_BUTTON_DPAD_UP 0x00000400 -#define _360_JOY_BUTTON_DPAD_DOWN 0x00000800 - -#define _360_JOY_BUTTON_DPAD_LEFT 0x00001000 -#define _360_JOY_BUTTON_DPAD_RIGHT 0x00002000 -// fake digital versions of analog values -#define _360_JOY_BUTTON_LSTICK_RIGHT 0x00004000 -#define _360_JOY_BUTTON_LSTICK_LEFT 0x00008000 - -#define _360_JOY_BUTTON_RSTICK_DOWN 0x00010000 -#define _360_JOY_BUTTON_RSTICK_UP 0x00020000 -#define _360_JOY_BUTTON_RSTICK_RIGHT 0x00040000 -#define _360_JOY_BUTTON_RSTICK_LEFT 0x00080000 - -#define _360_JOY_BUTTON_LSTICK_DOWN 0x00100000 -#define _360_JOY_BUTTON_LSTICK_UP 0x00200000 -#define _360_JOY_BUTTON_RT 0x00400000 -#define _360_JOY_BUTTON_LT 0x00800000 - -// Stick axis maps - to allow changes for SouthPaw in-game axis mapping -#define AXIS_MAP_LX 0 -#define AXIS_MAP_LY 1 -#define AXIS_MAP_RX 2 -#define AXIS_MAP_RY 3 - -// Trigger map - to allow for swap triggers in-game -#define TRIGGER_MAP_0 0 -#define TRIGGER_MAP_1 1 +#include "InputConstants.h" class IPlatformInput { public: diff --git a/targets/platform/input/InputActions.h b/targets/platform/input/InputConstants.h similarity index 53% rename from targets/platform/input/InputActions.h rename to targets/platform/input/InputConstants.h index af4adf768..dabd6b6a9 100644 --- a/targets/platform/input/InputActions.h +++ b/targets/platform/input/InputConstants.h @@ -1,5 +1,50 @@ #pragma once +#define MAP_STYLE_0 0 +#define MAP_STYLE_1 1 +#define MAP_STYLE_2 2 + +#define _360_JOY_BUTTON_A 0x00000001 +#define _360_JOY_BUTTON_B 0x00000002 +#define _360_JOY_BUTTON_X 0x00000004 +#define _360_JOY_BUTTON_Y 0x00000008 + +#define _360_JOY_BUTTON_START 0x00000010 +#define _360_JOY_BUTTON_BACK 0x00000020 +#define _360_JOY_BUTTON_RB 0x00000040 +#define _360_JOY_BUTTON_LB 0x00000080 + +#define _360_JOY_BUTTON_RTHUMB 0x00000100 +#define _360_JOY_BUTTON_LTHUMB 0x00000200 +#define _360_JOY_BUTTON_DPAD_UP 0x00000400 +#define _360_JOY_BUTTON_DPAD_DOWN 0x00000800 + +#define _360_JOY_BUTTON_DPAD_LEFT 0x00001000 +#define _360_JOY_BUTTON_DPAD_RIGHT 0x00002000 +// fake digital versions of analog values +#define _360_JOY_BUTTON_LSTICK_RIGHT 0x00004000 +#define _360_JOY_BUTTON_LSTICK_LEFT 0x00008000 + +#define _360_JOY_BUTTON_RSTICK_DOWN 0x00010000 +#define _360_JOY_BUTTON_RSTICK_UP 0x00020000 +#define _360_JOY_BUTTON_RSTICK_RIGHT 0x00040000 +#define _360_JOY_BUTTON_RSTICK_LEFT 0x00080000 + +#define _360_JOY_BUTTON_LSTICK_DOWN 0x00100000 +#define _360_JOY_BUTTON_LSTICK_UP 0x00200000 +#define _360_JOY_BUTTON_RT 0x00400000 +#define _360_JOY_BUTTON_LT 0x00800000 + +// Stick axis maps - to allow changes for SouthPaw in-game axis mapping +#define AXIS_MAP_LX 0 +#define AXIS_MAP_LY 1 +#define AXIS_MAP_RX 2 +#define AXIS_MAP_RY 3 + +// Trigger map - to allow for swap triggers in-game +#define TRIGGER_MAP_0 0 +#define TRIGGER_MAP_1 1 + enum EControllerActions { ACTION_MENU_A, ACTION_MENU_B, diff --git a/targets/platform/input/sdl2/SDL2Input.cpp b/targets/platform/input/sdl2/SDL2Input.cpp index 4ec3a48dc..54d1b1ba4 100644 --- a/targets/platform/input/sdl2/SDL2Input.cpp +++ b/targets/platform/input/sdl2/SDL2Input.cpp @@ -17,7 +17,7 @@ #include #include -#include "../InputActions.h" +#include "../InputConstants.h" #include "../PlatformTypes.h" SDL2Input sdl2_input_instance; diff --git a/targets/platform/profile/IPlatformProfile.h b/targets/platform/profile/IPlatformProfile.h index 65f35bc3d..dd7d428f6 100644 --- a/targets/platform/profile/IPlatformProfile.h +++ b/targets/platform/profile/IPlatformProfile.h @@ -8,31 +8,6 @@ class CXuiStringTable; -#define TITLEID_MINECRAFT 0x584111F7 - -#define CONTEXT_GAME_STATE 0 -#define CONTEXT_GAME_STATE_BLANK 0 -#define CONTEXT_GAME_STATE_RIDING_PIG 1 -#define CONTEXT_GAME_STATE_RIDING_MINECART 2 -#define CONTEXT_GAME_STATE_BOATING 3 -#define CONTEXT_GAME_STATE_FISHING 4 -#define CONTEXT_GAME_STATE_CRAFTING 5 -#define CONTEXT_GAME_STATE_FORGING 6 -#define CONTEXT_GAME_STATE_NETHER 7 -#define CONTEXT_GAME_STATE_CD 8 -#define CONTEXT_GAME_STATE_MAP 9 -#define CONTEXT_GAME_STATE_ENCHANTING 5 -#define CONTEXT_GAME_STATE_BREWING 5 -#define CONTEXT_GAME_STATE_ANVIL 6 -#define CONTEXT_GAME_STATE_TRADING 0 - -#define CONTEXT_PRESENCE_IDLE 0 -#define CONTEXT_PRESENCE_MENUS 1 -#define CONTEXT_PRESENCE_MULTIPLAYER 2 -#define CONTEXT_PRESENCE_MULTIPLAYEROFFLINE 3 -#define CONTEXT_PRESENCE_MULTIPLAYER_1P 4 -#define CONTEXT_PRESENCE_MULTIPLAYER_1POFFLINE 5 - class IPlatformProfile { public: struct PROFILESETTINGS { diff --git a/targets/platform/profile/ProfileConstants.h b/targets/platform/profile/ProfileConstants.h index 8bdb8ae40..6ae5cec98 100644 --- a/targets/platform/profile/ProfileConstants.h +++ b/targets/platform/profile/ProfileConstants.h @@ -1,26 +1,26 @@ #pragma once -#include +#define TITLEID_MINECRAFT 0x584111F7 -inline constexpr int TUTORIAL_PROFILE_STORAGE_BITS = 512; -inline constexpr int TUTORIAL_PROFILE_STORAGE_BYTES = - TUTORIAL_PROFILE_STORAGE_BITS / 8; +#define CONTEXT_GAME_STATE 0 +#define CONTEXT_GAME_STATE_BLANK 0 +#define CONTEXT_GAME_STATE_RIDING_PIG 1 +#define CONTEXT_GAME_STATE_RIDING_MINECART 2 +#define CONTEXT_GAME_STATE_BOATING 3 +#define CONTEXT_GAME_STATE_FISHING 4 +#define CONTEXT_GAME_STATE_CRAFTING 5 +#define CONTEXT_GAME_STATE_FORGING 6 +#define CONTEXT_GAME_STATE_NETHER 7 +#define CONTEXT_GAME_STATE_CD 8 +#define CONTEXT_GAME_STATE_MAP 9 +#define CONTEXT_GAME_STATE_ENCHANTING 5 +#define CONTEXT_GAME_STATE_BREWING 5 +#define CONTEXT_GAME_STATE_ANVIL 6 +#define CONTEXT_GAME_STATE_TRADING 0 -inline constexpr int MAX_FAVORITE_SKINS = 10; - -inline constexpr std::uint32_t GAMESETTING_CLOUDS = 0x00000001; -inline constexpr std::uint32_t GAMESETTING_ONLINE = 0x00000002; -inline constexpr std::uint32_t GAMESETTING_FRIENDSOFFRIENDS = 0x00000008; -inline constexpr std::uint32_t GAMESETTING_DISPLAYUPDATEMSG = 0x00000030; -inline constexpr std::uint32_t GAMESETTING_BEDROCKFOG = 0x00000040; -inline constexpr std::uint32_t GAMESETTING_DISPLAYHUD = 0x00000080; -inline constexpr std::uint32_t GAMESETTING_DISPLAYHAND = 0x00000100; -inline constexpr std::uint32_t GAMESETTING_CUSTOMSKINANIM = 0x00000200; -inline constexpr std::uint32_t GAMESETTING_DEATHMESSAGES = 0x00000400; -inline constexpr std::uint32_t GAMESETTING_UISIZE = 0x00001800; -inline constexpr std::uint32_t GAMESETTING_UISIZE_SPLITSCREEN = 0x00006000; -inline constexpr std::uint32_t GAMESETTING_ANIMATEDCHARACTER = 0x00008000; -inline constexpr std::uint32_t GAMESETTING_PS3EULAREAD = 0x00010000; -inline constexpr std::uint32_t GAMESETTING_PSVITANETWORKMODEADHOC = 0x00020000; - -inline constexpr unsigned char MINECRAFT_LANGUAGE_DEFAULT = 0x00; +#define CONTEXT_PRESENCE_IDLE 0 +#define CONTEXT_PRESENCE_MENUS 1 +#define CONTEXT_PRESENCE_MULTIPLAYER 2 +#define CONTEXT_PRESENCE_MULTIPLAYEROFFLINE 3 +#define CONTEXT_PRESENCE_MULTIPLAYER_1P 4 +#define CONTEXT_PRESENCE_MULTIPLAYER_1POFFLINE 5 diff --git a/targets/platform/profile/profile.h b/targets/platform/profile/profile.h index 1b8c70631..7b23288c8 100644 --- a/targets/platform/profile/profile.h +++ b/targets/platform/profile/profile.h @@ -1,3 +1,4 @@ #include "IPlatformProfile.h" +#include "ProfileConstants.h" extern IPlatformProfile& PlatformProfile; diff --git a/targets/platform/profile/stub/StubProfile.cpp b/targets/platform/profile/stub/StubProfile.cpp index a851a7f1b..1bc200e75 100644 --- a/targets/platform/profile/stub/StubProfile.cpp +++ b/targets/platform/profile/stub/StubProfile.cpp @@ -6,6 +6,8 @@ #include "../ProfileConstants.h" #include "input/input.h" +#include "../../../app/common/Tutorial/TutorialEnum.h" // 4jcraft TODO +#include "../../../app/common/App_Defines.h" // 4jcraft TODO StubProfile stub_profile_instance; IPlatformProfile& PlatformProfile = stub_profile_instance;