forked from cafeberry/cafeberry
feat: Touchpad support on W64, update 4JLibs & update x360 xzp
This commit is contained in:
Submodule Minecraft.Client/Windows64/4JLibs updated: f2d81a0bc6...f85bdd8a45
@@ -5,8 +5,6 @@ class CConsoleMinecraftApp : public CMinecraftApp
|
||||
public:
|
||||
ImageFileBuffer m_ThumbnailBuffer;
|
||||
|
||||
static void SetFakeGamertag(char* name);
|
||||
|
||||
CConsoleMinecraftApp();
|
||||
|
||||
virtual void SetRichPresenceContext(int iPad, int contextId);
|
||||
|
||||
@@ -108,7 +108,7 @@ static Windows64LaunchArgs ParseLaunchArgs()
|
||||
if (i + 1 < argc)
|
||||
{
|
||||
app.CopyWideArgToAnsi(argv[i + 1], g_Username, sizeof(g_Username));
|
||||
app.SetFakeGamertag(g_Username);
|
||||
ProfileManager.SetFakeGamerTag(g_Username);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -298,7 +298,12 @@ void DefineActions(void)
|
||||
InputManager.SetGameJoypadMaps(MAP_STYLE_2,MINECRAFT_ACTION_DPAD_LEFT, _360_JOY_BUTTON_DPAD_LEFT);
|
||||
InputManager.SetGameJoypadMaps(MAP_STYLE_2,MINECRAFT_ACTION_DPAD_RIGHT, _360_JOY_BUTTON_DPAD_RIGHT);
|
||||
InputManager.SetGameJoypadMaps(MAP_STYLE_2,MINECRAFT_ACTION_DPAD_UP, _360_JOY_BUTTON_DPAD_UP);
|
||||
InputManager.SetGameJoypadMaps(MAP_STYLE_2,MINECRAFT_ACTION_DPAD_DOWN, _360_JOY_BUTTON_DPAD_DOWN);
|
||||
InputManager.SetGameJoypadMaps(MAP_STYLE_2,MINECRAFT_ACTION_DPAD_DOWN, _360_JOY_BUTTON_DPAD_DOWN);
|
||||
|
||||
// Touchpad mapping
|
||||
InputManager.SetGameJoypadMaps(MAP_STYLE_0,ACTION_MENU_TOUCHPAD_PRESS, _PS_JOY_BUTTON_TOUCHPAD);
|
||||
InputManager.SetGameJoypadMaps(MAP_STYLE_1,ACTION_MENU_TOUCHPAD_PRESS, _PS_JOY_BUTTON_TOUCHPAD);
|
||||
InputManager.SetGameJoypadMaps(MAP_STYLE_2,ACTION_MENU_TOUCHPAD_PRESS, _PS_JOY_BUTTON_TOUCHPAD);
|
||||
}
|
||||
|
||||
void MemSect(int sect)
|
||||
@@ -861,14 +866,11 @@ int APIENTRY _tWinMain(_In_ HINSTANCE hInstance,
|
||||
|
||||
app.UpdateTime();
|
||||
PIXBeginNamedEvent(0,"Input manager tick");
|
||||
if (GetFocus())
|
||||
{
|
||||
InputManager.Tick();
|
||||
}
|
||||
if (GetFocus()) InputManager.Tick();
|
||||
PIXEndNamedEvent();
|
||||
/*PIXBeginNamedEvent(0,"Profile manager tick");
|
||||
PIXBeginNamedEvent(0,"Profile manager tick");
|
||||
ProfileManager.Tick();
|
||||
PIXEndNamedEvent();*/
|
||||
PIXEndNamedEvent();
|
||||
PIXBeginNamedEvent(0,"Storage manager tick");
|
||||
StorageManager.Tick();
|
||||
PIXEndNamedEvent();
|
||||
@@ -877,7 +879,7 @@ int APIENTRY _tWinMain(_In_ HINSTANCE hInstance,
|
||||
PIXEndNamedEvent();
|
||||
|
||||
PIXBeginNamedEvent(0,"Network manager do work #1");
|
||||
// g_NetworkManager.DoWork();
|
||||
g_NetworkManager.DoWork();
|
||||
PIXEndNamedEvent();
|
||||
|
||||
// LeaderboardManager::Instance()->Tick();
|
||||
|
||||
Reference in New Issue
Block a user