win32 cocos header update

This commit is contained in:
Chloe 2024-05-13 23:22:47 -07:00
parent 4baef33172
commit fcd1a331a0
No known key found for this signature in database
GPG key ID: F5F9309DDCDD57D8
3 changed files with 11 additions and 12 deletions
loader/include/Geode/cocos/platform/win32

View file

@ -5,7 +5,7 @@
#include "CCStdC.h"
#include "../CCCommon.h"
#include "../CCApplicationProtocol.h"
#include "CCControllerHandler.h"
#include "CXBOXController.h"
#include <string>
NS_CC_BEGIN
@ -51,7 +51,7 @@ public:
RT_ADD(
void setupVerticalSync();
void updateVerticalSync();
void updateControllerKeys();
void updateControllerKeys(CXBOXController* controller, int userIndex);
int getTimeElapsed();
void resetForceTimer();
@ -96,8 +96,8 @@ public:
LARGE_INTEGER m_nVsyncInterval;
gd::string m_resourceRootPath;
gd::string m_startupScriptFilename;
CCControllerHandler* m_pControllerHandler;
void* m_unk; //might be swapped with m_pControllerHandler
CXBOXController* m_pControllerHandler;
CXBOXController* m_pController2Handler; //might be swapped with m_pControllerHandler
bool m_bUpdateController;
CC_SYNTHESIZE_NV(bool, m_bShutdownCalled, ShutdownCalled);
INPUT m_iInput;
@ -114,6 +114,7 @@ public:
CC_SYNTHESIZE_NV(bool, m_bFullscreen, Fullscreen);
CC_SYNTHESIZE_NV(bool, m_bBorderless, Borderless);
protected:
static CCApplication * sm_pSharedApplication;
};

View file

@ -208,7 +208,9 @@ public:
float m_fMouseX;
float m_fMouseY;
bool m_bIsFullscreen;
bool m_bIsBorderless;
bool m_bShouldHideCursor;
bool m_bCursorLocked;
bool m_bShouldCallGLFinish;
)

View file

@ -1,14 +1,12 @@
#ifndef __CC_CONTROLLER_HANDLER_WIN32_H__
#define __CC_CONTROLLER_HANDLER_WIN32_H__
#ifndef __CXBOXCONTROLLER_WIN32_H__
#define __CXBOXCONTROLLER_WIN32_H__
#include "../../include/ccMacros.h"
#include "CCStdC.h"
#include "CCControllerState.h"
#include <Xinput.h>
NS_CC_BEGIN
class CC_DLL CCControllerHandler
class CC_DLL CXBOXController
{
GEODE_FRIEND_MODIFY
public:
@ -35,6 +33,4 @@ public:
bool m_buttonY;
};
NS_CC_END
#endif
#endif