mirror of
https://github.com/4jcraft/4jcraft.git
synced 2026-05-17 14:32:54 +00:00
Merge pull request #38 from create-juicey-app/dev
Add 4JLib from Pyogenics:4jlibs and make the project finally compilable :)
This commit is contained in:
DecalOverdose
GitHub
commit
8eb67ba48a
22
.gitignore
vendored
22
.gitignore
vendored
|
|
@ -1,4 +1,24 @@
|
|||
build/
|
||||
.cache/
|
||||
.idea/
|
||||
cmake-build-debug/cd
|
||||
cmake-build-debug/
|
||||
|
||||
# CMake generated
|
||||
CMakeCache.txt
|
||||
CMakeFiles/
|
||||
cmake_install.cmake
|
||||
Makefile
|
||||
compile_commands.json
|
||||
|
||||
# IDE / editor
|
||||
*.swp
|
||||
*.swo
|
||||
*~
|
||||
.vscode/
|
||||
*.code-workspace
|
||||
|
||||
# Compiled objects / binaries
|
||||
*.o
|
||||
*.a
|
||||
*.so
|
||||
*.out
|
||||
|
|
|
|||
34
4J.Input/4J_Input.cpp
Normal file
34
4J.Input/4J_Input.cpp
Normal file
|
|
@ -0,0 +1,34 @@
|
|||
#include "4J_Input.h"
|
||||
|
||||
C_4JInput InputManager;
|
||||
|
||||
void C_4JInput::Initialise(int iInputStateC, unsigned char ucMapC, unsigned char ucActionC, unsigned char ucMenuActionC) {}
|
||||
void C_4JInput::Tick(void) {}
|
||||
void C_4JInput::SetDeadzoneAndMovementRange(unsigned int uiDeadzone, unsigned int uiMovementRangeMax) {}
|
||||
void C_4JInput::SetGameJoypadMaps(unsigned char ucMap, unsigned char ucAction, unsigned int uiActionVal) {}
|
||||
unsigned int C_4JInput::GetGameJoypadMaps(unsigned char ucMap, unsigned char ucAction) { return 0; }
|
||||
void C_4JInput::SetJoypadMapVal(int iPad, unsigned char ucMap) {}
|
||||
unsigned char C_4JInput::GetJoypadMapVal(int iPad) { return 0; }
|
||||
void C_4JInput::SetJoypadSensitivity(int iPad, float fSensitivity) {}
|
||||
unsigned int C_4JInput::GetValue(int iPad, unsigned char ucAction, bool bRepeat) { return 0; }
|
||||
bool C_4JInput::ButtonPressed(int iPad, unsigned char ucAction) { return false; }
|
||||
bool C_4JInput::ButtonReleased(int iPad, unsigned char ucAction) { return false; }
|
||||
bool C_4JInput::ButtonDown(int iPad, unsigned char ucAction) { return false; }
|
||||
void C_4JInput::SetJoypadStickAxisMap(int iPad, unsigned int uiFrom, unsigned int uiTo) {}
|
||||
void C_4JInput::SetJoypadStickTriggerMap(int iPad, unsigned int uiFrom, unsigned int uiTo) {}
|
||||
void C_4JInput::SetKeyRepeatRate(float fRepeatDelaySecs, float fRepeatRateSecs) {}
|
||||
void C_4JInput::SetDebugSequence(const char *chSequenceA, int(*Func)(LPVOID), LPVOID lpParam) {}
|
||||
FLOAT C_4JInput::GetIdleSeconds(int iPad) { return 0.0f; }
|
||||
bool C_4JInput::IsPadConnected(int iPad) { return iPad == 0; }
|
||||
float C_4JInput::GetJoypadStick_LX(int iPad, bool bCheckMenuDisplay) { return 0.0f; }
|
||||
float C_4JInput::GetJoypadStick_LY(int iPad, bool bCheckMenuDisplay) { return 0.0f; }
|
||||
float C_4JInput::GetJoypadStick_RX(int iPad, bool bCheckMenuDisplay) { return 0.0f; }
|
||||
float C_4JInput::GetJoypadStick_RY(int iPad, bool bCheckMenuDisplay) { return 0.0f; }
|
||||
unsigned char C_4JInput::GetJoypadLTrigger(int iPad, bool bCheckMenuDisplay) { return 0; }
|
||||
unsigned char C_4JInput::GetJoypadRTrigger(int iPad, bool bCheckMenuDisplay) { return 0; }
|
||||
void C_4JInput::SetMenuDisplayed(int iPad, bool bVal) {}
|
||||
EKeyboardResult C_4JInput::RequestKeyboard(LPCWSTR Title, LPCWSTR Text, DWORD dwPad, UINT uiMaxChars, int(*Func)(LPVOID, const bool), LPVOID lpParam, C_4JInput::EKeyboardMode eMode) { return EKeyboard_Cancelled; }
|
||||
void C_4JInput::GetText(uint16_t *UTF16String) { if (UTF16String) UTF16String[0] = 0; }
|
||||
bool C_4JInput::VerifyStrings(WCHAR **pwStringA, int iStringC, int(*Func)(LPVOID, STRING_VERIFY_RESPONSE *), LPVOID lpParam) { return true; }
|
||||
void C_4JInput::CancelQueuedVerifyStrings(int(*Func)(LPVOID, STRING_VERIFY_RESPONSE *), LPVOID lpParam) {}
|
||||
void C_4JInput::CancelAllVerifyInProgress(void) {}
|
||||
137
4J.Input/4J_Input.h
Normal file
137
4J.Input/4J_Input.h
Normal file
|
|
@ -0,0 +1,137 @@
|
|||
#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 EKeyboardResult
|
||||
{
|
||||
EKeyboard_Pending,
|
||||
EKeyboard_Cancelled,
|
||||
EKeyboard_ResultAccept,
|
||||
EKeyboard_ResultDecline,
|
||||
};
|
||||
|
||||
typedef struct _STRING_VERIFY_RESPONSE
|
||||
{
|
||||
WORD wNumStrings;
|
||||
HRESULT *pStringResult;
|
||||
}
|
||||
STRING_VERIFY_RESPONSE;
|
||||
|
||||
class C_4JInput
|
||||
{
|
||||
public:
|
||||
|
||||
|
||||
enum EKeyboardMode
|
||||
{
|
||||
EKeyboardMode_Default,
|
||||
EKeyboardMode_Numeric,
|
||||
EKeyboardMode_Password,
|
||||
EKeyboardMode_Alphabet,
|
||||
EKeyboardMode_Full,
|
||||
EKeyboardMode_Alphabet_Extended,
|
||||
EKeyboardMode_IP_Address,
|
||||
EKeyboardMode_Phone
|
||||
};
|
||||
|
||||
void Initialise( int iInputStateC, unsigned char ucMapC,unsigned char ucActionC, unsigned char ucMenuActionC );
|
||||
void Tick(void);
|
||||
void SetDeadzoneAndMovementRange(unsigned int uiDeadzone, unsigned int uiMovementRangeMax );
|
||||
void SetGameJoypadMaps(unsigned char ucMap,unsigned char ucAction,unsigned int uiActionVal);
|
||||
unsigned int GetGameJoypadMaps(unsigned char ucMap,unsigned char ucAction);
|
||||
void SetJoypadMapVal(int iPad,unsigned char ucMap);
|
||||
unsigned char GetJoypadMapVal(int iPad);
|
||||
void SetJoypadSensitivity(int iPad, float fSensitivity);
|
||||
unsigned int GetValue(int iPad,unsigned char ucAction, bool bRepeat=false);
|
||||
bool ButtonPressed(int iPad,unsigned char ucAction=255); // toggled
|
||||
bool ButtonReleased(int iPad,unsigned char ucAction); //toggled
|
||||
bool ButtonDown(int iPad,unsigned char ucAction=255); // button held down
|
||||
// Functions to remap the axis and triggers for in-game (not menus) - SouthPaw, etc
|
||||
void SetJoypadStickAxisMap(int iPad,unsigned int uiFrom, unsigned int uiTo);
|
||||
void SetJoypadStickTriggerMap(int iPad,unsigned int uiFrom, unsigned int uiTo);
|
||||
void SetKeyRepeatRate(float fRepeatDelaySecs,float fRepeatRateSecs);
|
||||
void SetDebugSequence( const char *chSequenceA,int( *Func)(LPVOID),LPVOID lpParam );
|
||||
FLOAT GetIdleSeconds(int iPad);
|
||||
bool IsPadConnected(int iPad);
|
||||
|
||||
// In-Game values which may have been remapped due to Southpaw, swap triggers, etc
|
||||
float GetJoypadStick_LX(int iPad, bool bCheckMenuDisplay=true);
|
||||
float GetJoypadStick_LY(int iPad, bool bCheckMenuDisplay=true);
|
||||
float GetJoypadStick_RX(int iPad, bool bCheckMenuDisplay=true);
|
||||
float GetJoypadStick_RY(int iPad, bool bCheckMenuDisplay=true);
|
||||
unsigned char GetJoypadLTrigger(int iPad, bool bCheckMenuDisplay=true);
|
||||
unsigned char GetJoypadRTrigger(int iPad, bool bCheckMenuDisplay=true);
|
||||
|
||||
void SetMenuDisplayed(int iPad, bool bVal);
|
||||
|
||||
// EKeyboardResult RequestKeyboard(UINT uiTitle, UINT uiText, UINT uiDesc, DWORD dwPad, WCHAR *pwchResult, UINT uiResultSize,int( *Func)(LPVOID,const bool),LPVOID lpParam,EKeyboardMode eMode,C4JStringTable *pStringTable=NULL);
|
||||
// EKeyboardResult RequestKeyboard(UINT uiTitle, LPCWSTR pwchDefault, UINT uiDesc, DWORD dwPad, WCHAR *pwchResult, UINT uiResultSize,int( *Func)(LPVOID,const bool),LPVOID lpParam, EKeyboardMode eMode,C4JStringTable *pStringTable=NULL);
|
||||
EKeyboardResult RequestKeyboard(LPCWSTR Title, LPCWSTR Text, DWORD dwPad, UINT uiMaxChars, int( *Func)(LPVOID,const bool),LPVOID lpParam,C_4JInput::EKeyboardMode eMode);
|
||||
void GetText(uint16_t *UTF16String);
|
||||
|
||||
// Online check strings against offensive list - TCR 92
|
||||
// TCR # 092 CMTV Player Text String Verification
|
||||
// Requirement Any player-entered text visible to another player on Xbox LIVE must be verified using the Xbox LIVE service before being transmitted. Text that is rejected by the Xbox LIVE service must not be displayed.
|
||||
//
|
||||
// Remarks
|
||||
// This requirement applies to any player-entered string that can be exposed to other players on Xbox LIVE. It includes session names, content descriptions, text messages, tags, team names, mottos, comments, and so on.
|
||||
//
|
||||
// Games may decide to not send the text, blank it out, or use generic text if the text was rejected by the Xbox LIVE service.
|
||||
//
|
||||
// Games verify the text by calling the XStringVerify function.
|
||||
//
|
||||
// Exemption It is not required to use the Xbox LIVE service to verify real-time text communication. An example of real-time text communication is in-game text chat.
|
||||
//
|
||||
// Intent Protect players from inappropriate language.
|
||||
bool VerifyStrings(WCHAR **pwStringA,int iStringC,int( *Func)(LPVOID,STRING_VERIFY_RESPONSE *),LPVOID lpParam);
|
||||
void CancelQueuedVerifyStrings(int( *Func)(LPVOID,STRING_VERIFY_RESPONSE *),LPVOID lpParam);
|
||||
void CancelAllVerifyInProgress(void);
|
||||
|
||||
//bool InputDetected(DWORD dwUserIndex,WCHAR *pwchInput);
|
||||
};
|
||||
|
||||
// Singleton
|
||||
extern C_4JInput InputManager;
|
||||
23
4J.Input/CMakeLists.txt
Normal file
23
4J.Input/CMakeLists.txt
Normal file
|
|
@ -0,0 +1,23 @@
|
|||
cmake_minimum_required(VERSION 3.16.0 FATAL_ERROR)
|
||||
project(4J_Input CXX)
|
||||
|
||||
add_library(${PROJECT_NAME})
|
||||
target_sources(${PROJECT_NAME}
|
||||
PRIVATE
|
||||
4J_Input.cpp
|
||||
INP_ForceFeedback.cpp
|
||||
INP_Keyboard.cpp
|
||||
INP_Main.cpp
|
||||
INP_StringCheck.cpp
|
||||
stdafx.cpp
|
||||
../Minecraft.Client/Platform/Linux/Stubs/LinuxStubs.h
|
||||
)
|
||||
target_include_directories(${PROJECT_NAME}
|
||||
PRIVATE
|
||||
${CMAKE_CURRENT_SOURCE_DIR}
|
||||
)
|
||||
|
||||
# Mimic cmake converter behaviour
|
||||
target_precompile_headers(${PROJECT_NAME} PRIVATE
|
||||
"$<$<COMPILE_LANGUAGE:CXX>:${CMAKE_CURRENT_SOURCE_DIR}/stdafx.h>"
|
||||
)
|
||||
0
4J.Input/INP_ForceFeedback.cpp
Normal file
0
4J.Input/INP_ForceFeedback.cpp
Normal file
0
4J.Input/INP_Keyboard.cpp
Normal file
0
4J.Input/INP_Keyboard.cpp
Normal file
0
4J.Input/INP_Main.cpp
Normal file
0
4J.Input/INP_Main.cpp
Normal file
0
4J.Input/INP_StringCheck.cpp
Normal file
0
4J.Input/INP_StringCheck.cpp
Normal file
1
4J.Input/stdafx.cpp
Normal file
1
4J.Input/stdafx.cpp
Normal file
|
|
@ -0,0 +1 @@
|
|||
#include "stdafx.h"
|
||||
8
4J.Input/stdafx.h
Normal file
8
4J.Input/stdafx.h
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
#ifndef _4J_INPUT_STADAFX_H
|
||||
#define _4J_INPUT_STADAFX_H
|
||||
|
||||
#ifdef __linux__
|
||||
#include "../Minecraft.Client/Platform/Linux/Stubs/LinuxStubs.h"
|
||||
#endif
|
||||
|
||||
#endif //_4J_INPUT_STADAFX_H
|
||||
86
4J.Profile/4J_Profile.cpp
Normal file
86
4J.Profile/4J_Profile.cpp
Normal file
|
|
@ -0,0 +1,86 @@
|
|||
#include "4J_Profile.h"
|
||||
#include <cstring>
|
||||
|
||||
C_4JProfile ProfileManager;
|
||||
|
||||
static void *s_profileData[4] = {};
|
||||
|
||||
void C_4JProfile::Initialise(DWORD dwTitleID, DWORD dwOfferID, unsigned short usProfileVersion,
|
||||
UINT uiProfileValuesC, UINT uiProfileSettingsC, DWORD *pdwProfileSettingsA,
|
||||
int iGameDefinedDataSizeX4, unsigned int *puiGameDefinedDataChangedBitmask)
|
||||
{
|
||||
for (int i = 0; i < 4; i++)
|
||||
{
|
||||
s_profileData[i] = new unsigned char[iGameDefinedDataSizeX4 / 4];
|
||||
memset(s_profileData[i], 0, iGameDefinedDataSizeX4 / 4);
|
||||
}
|
||||
}
|
||||
void C_4JProfile::SetTrialTextStringTable(CXuiStringTable *pStringTable, int iAccept, int iReject) {}
|
||||
void C_4JProfile::SetTrialAwardText(eAwardType AwardType, int iTitle, int iText) {}
|
||||
int C_4JProfile::GetLockedProfile() { return -1; }
|
||||
void C_4JProfile::SetLockedProfile(int iProf) {}
|
||||
bool C_4JProfile::IsSignedIn(int iQuadrant) { return iQuadrant == 0; }
|
||||
bool C_4JProfile::IsSignedInLive(int iProf) { return false; }
|
||||
bool C_4JProfile::IsGuest(int iQuadrant) { return false; }
|
||||
UINT C_4JProfile::RequestSignInUI(bool bFromInvite, bool bLocalGame, bool bNoGuestsAllowed, bool bMultiplayerSignIn, bool bAddUser, int(*Func)(LPVOID, const bool, const int iPad), LPVOID lpParam, int iQuadrant) { return 0; }
|
||||
UINT C_4JProfile::DisplayOfflineProfile(int(*Func)(LPVOID, const bool, const int iPad), LPVOID lpParam, int iQuadrant) { return 0; }
|
||||
UINT C_4JProfile::RequestConvertOfflineToGuestUI(int(*Func)(LPVOID, const bool, const int iPad), LPVOID lpParam, int iQuadrant) { return 0; }
|
||||
void C_4JProfile::SetPrimaryPlayerChanged(bool bVal) {}
|
||||
bool C_4JProfile::QuerySigninStatus(void) { return true; }
|
||||
void C_4JProfile::GetXUID(int iPad, PlayerUID *pXuid, bool bOnlineXuid) { if (pXuid) *pXuid = 0; }
|
||||
BOOL C_4JProfile::AreXUIDSEqual(PlayerUID xuid1, PlayerUID xuid2) { return xuid1 == xuid2; }
|
||||
BOOL C_4JProfile::XUIDIsGuest(PlayerUID xuid) { return FALSE; }
|
||||
bool C_4JProfile::AllowedToPlayMultiplayer(int iProf) { return true; }
|
||||
bool C_4JProfile::GetChatAndContentRestrictions(int iPad, bool *pbChatRestricted, bool *pbContentRestricted, int *piAge) {
|
||||
if (pbChatRestricted) *pbChatRestricted = false;
|
||||
if (pbContentRestricted) *pbContentRestricted = false;
|
||||
if (piAge) *piAge = 18;
|
||||
return true;
|
||||
}
|
||||
void C_4JProfile::StartTrialGame() {}
|
||||
void C_4JProfile::AllowedPlayerCreatedContent(int iPad, bool thisQuadrantOnly, BOOL *allAllowed, BOOL *friendsAllowed) {
|
||||
if (allAllowed) *allAllowed = TRUE;
|
||||
if (friendsAllowed) *friendsAllowed = TRUE;
|
||||
}
|
||||
BOOL C_4JProfile::CanViewPlayerCreatedContent(int iPad, bool thisQuadrantOnly, PPlayerUID pXuids, DWORD dwXuidCount) { return TRUE; }
|
||||
void C_4JProfile::ShowProfileCard(int iPad, PlayerUID targetUid) {}
|
||||
bool C_4JProfile::GetProfileAvatar(int iPad, int(*Func)(LPVOID lpParam, PBYTE pbThumbnail, DWORD dwThumbnailBytes), LPVOID lpParam) { return false; }
|
||||
void C_4JProfile::CancelProfileAvatarRequest() {}
|
||||
int C_4JProfile::GetPrimaryPad() { return 0; }
|
||||
void C_4JProfile::SetPrimaryPad(int iPad) {}
|
||||
|
||||
static char s_gamertag[64] = "Player";
|
||||
char* C_4JProfile::GetGamertag(int iPad) { return s_gamertag; }
|
||||
wstring C_4JProfile::GetDisplayName(int iPad) { return L"Player"; }
|
||||
bool C_4JProfile::IsFullVersion() { return true; }
|
||||
void C_4JProfile::SetSignInChangeCallback(void(*Func)(LPVOID, bool, unsigned int), LPVOID lpParam) {}
|
||||
void C_4JProfile::SetNotificationsCallback(void(*Func)(LPVOID, DWORD, unsigned int), LPVOID lpParam) {}
|
||||
bool C_4JProfile::RegionIsNorthAmerica(void) { return true; }
|
||||
bool C_4JProfile::LocaleIsUSorCanada(void) { return true; }
|
||||
HRESULT C_4JProfile::GetLiveConnectionStatus() { return S_OK; }
|
||||
bool C_4JProfile::IsSystemUIDisplayed() { return false; }
|
||||
void C_4JProfile::SetProfileReadErrorCallback(void(*Func)(LPVOID), LPVOID lpParam) {}
|
||||
int C_4JProfile::SetDefaultOptionsCallback(int(*Func)(LPVOID, PROFILESETTINGS *, const int iPad), LPVOID lpParam) { return 0; }
|
||||
int C_4JProfile::SetOldProfileVersionCallback(int(*Func)(LPVOID, unsigned char *, const unsigned short, const int), LPVOID lpParam) { return 0; }
|
||||
|
||||
static C_4JProfile::PROFILESETTINGS s_defaultSettings = {};
|
||||
C_4JProfile::PROFILESETTINGS* C_4JProfile::GetDashboardProfileSettings(int iPad) { return &s_defaultSettings; }
|
||||
void C_4JProfile::WriteToProfile(int iQuadrant, bool bGameDefinedDataChanged, bool bOverride5MinuteLimitOnProfileWrites) {}
|
||||
void C_4JProfile::ForceQueuedProfileWrites(int iPad) {}
|
||||
void* C_4JProfile::GetGameDefinedProfileData(int iQuadrant) { return s_profileData[iQuadrant]; }
|
||||
void C_4JProfile::ResetProfileProcessState() {}
|
||||
void C_4JProfile::Tick(void) {}
|
||||
void C_4JProfile::RegisterAward(int iAwardNumber, int iGamerconfigID, eAwardType eType, bool bLeaderboardAffected,
|
||||
CXuiStringTable *pStringTable, int iTitleStr, int iTextStr, int iAcceptStr, char *pszThemeName, unsigned int uiThemeSize) {}
|
||||
int C_4JProfile::GetAwardId(int iAwardNumber) { return 0; }
|
||||
eAwardType C_4JProfile::GetAwardType(int iAwardNumber) { return eAwardType_Achievement; }
|
||||
bool C_4JProfile::CanBeAwarded(int iQuadrant, int iAwardNumber) { return false; }
|
||||
void C_4JProfile::Award(int iQuadrant, int iAwardNumber, bool bForce) {}
|
||||
bool C_4JProfile::IsAwardsFlagSet(int iQuadrant, int iAward) { return false; }
|
||||
void C_4JProfile::RichPresenceInit(int iPresenceCount, int iContextCount) {}
|
||||
void C_4JProfile::RegisterRichPresenceContext(int iGameConfigContextID) {}
|
||||
void C_4JProfile::SetRichPresenceContextValue(int iPad, int iContextID, int iVal) {}
|
||||
void C_4JProfile::SetCurrentGameActivity(int iPad, int iNewPresence, bool bSetOthersToIdle) {}
|
||||
void C_4JProfile::DisplayFullVersionPurchase(bool bRequired, int iQuadrant, int iUpsellParam) {}
|
||||
void C_4JProfile::SetUpsellCallback(void(*Func)(LPVOID lpParam, eUpsellType type, eUpsellResponse response, int iUserData), LPVOID lpParam) {}
|
||||
void C_4JProfile::SetDebugFullOverride(bool bVal) {}
|
||||
128
4J.Profile/4J_Profile.h
Normal file
128
4J.Profile/4J_Profile.h
Normal file
|
|
@ -0,0 +1,128 @@
|
|||
#pragma once
|
||||
|
||||
enum eAwardType
|
||||
{
|
||||
eAwardType_Achievement = 0,
|
||||
eAwardType_GamerPic,
|
||||
eAwardType_Theme,
|
||||
eAwardType_AvatarItem,
|
||||
};
|
||||
|
||||
enum eUpsellType
|
||||
{
|
||||
eUpsellType_Custom = 0, // This is the default, and means that the upsell dialog was initiated in the app code
|
||||
eUpsellType_Achievement,
|
||||
eUpsellType_GamerPic,
|
||||
eUpsellType_Theme,
|
||||
eUpsellType_AvatarItem,
|
||||
};
|
||||
|
||||
enum eUpsellResponse
|
||||
{
|
||||
eUpsellResponse_Declined,
|
||||
eUpsellResponse_Accepted_NoPurchase,
|
||||
eUpsellResponse_Accepted_Purchase,
|
||||
};
|
||||
|
||||
|
||||
|
||||
class C_4JProfile
|
||||
{
|
||||
public:
|
||||
struct PROFILESETTINGS
|
||||
{
|
||||
int iYAxisInversion;
|
||||
int iControllerSensitivity;
|
||||
int iVibration;
|
||||
bool bSwapSticks;
|
||||
};
|
||||
|
||||
|
||||
// 4 players have game defined data, puiGameDefinedDataChangedBitmask needs to be checked by the game side to see if there's an update needed - it'll have the bits set for players to be updated
|
||||
void Initialise( DWORD dwTitleID,
|
||||
DWORD dwOfferID,
|
||||
unsigned short usProfileVersion,
|
||||
UINT uiProfileValuesC,
|
||||
UINT uiProfileSettingsC,
|
||||
DWORD *pdwProfileSettingsA,
|
||||
int iGameDefinedDataSizeX4,
|
||||
unsigned int *puiGameDefinedDataChangedBitmask);
|
||||
void SetTrialTextStringTable(CXuiStringTable *pStringTable,int iAccept,int iReject);
|
||||
void SetTrialAwardText(eAwardType AwardType,int iTitle,int iText); // achievement popup in the trial game
|
||||
int GetLockedProfile();
|
||||
void SetLockedProfile(int iProf);
|
||||
bool IsSignedIn(int iQuadrant);
|
||||
bool IsSignedInLive(int iProf);
|
||||
bool IsGuest(int iQuadrant);
|
||||
UINT RequestSignInUI(bool bFromInvite,bool bLocalGame,bool bNoGuestsAllowed,bool bMultiplayerSignIn,bool bAddUser, int( *Func)(LPVOID,const bool, const int iPad),LPVOID lpParam,int iQuadrant=XUSER_INDEX_ANY);
|
||||
UINT DisplayOfflineProfile(int( *Func)(LPVOID,const bool, const int iPad),LPVOID lpParam,int iQuadrant=XUSER_INDEX_ANY);
|
||||
UINT RequestConvertOfflineToGuestUI(int( *Func)(LPVOID,const bool, const int iPad),LPVOID lpParam,int iQuadrant=XUSER_INDEX_ANY);
|
||||
void SetPrimaryPlayerChanged(bool bVal);
|
||||
bool QuerySigninStatus(void);
|
||||
void GetXUID(int iPad, PlayerUID *pXuid,bool bOnlineXuid);
|
||||
BOOL AreXUIDSEqual(PlayerUID xuid1,PlayerUID xuid2);
|
||||
BOOL XUIDIsGuest(PlayerUID xuid);
|
||||
bool AllowedToPlayMultiplayer(int iProf);
|
||||
bool GetChatAndContentRestrictions(int iPad,bool *pbChatRestricted,bool *pbContentRestricted,int *piAge);
|
||||
void StartTrialGame(); // disables saves and leaderboard, and change state to readyforgame from pregame
|
||||
void AllowedPlayerCreatedContent(int iPad, bool thisQuadrantOnly, BOOL *allAllowed, BOOL *friendsAllowed);
|
||||
BOOL CanViewPlayerCreatedContent(int iPad, bool thisQuadrantOnly, PPlayerUID pXuids, DWORD dwXuidCount );
|
||||
void ShowProfileCard(int iPad, PlayerUID targetUid);
|
||||
bool GetProfileAvatar(int iPad,int( *Func)(LPVOID lpParam,PBYTE pbThumbnail,DWORD dwThumbnailBytes), LPVOID lpParam);
|
||||
void CancelProfileAvatarRequest();
|
||||
|
||||
|
||||
// SYS
|
||||
int GetPrimaryPad();
|
||||
void SetPrimaryPad(int iPad);
|
||||
char* GetGamertag(int iPad);
|
||||
wstring GetDisplayName(int iPad);
|
||||
bool IsFullVersion();
|
||||
void SetSignInChangeCallback(void ( *Func)(LPVOID, bool, unsigned int),LPVOID lpParam);
|
||||
void SetNotificationsCallback(void ( *Func)(LPVOID, DWORD, unsigned int),LPVOID lpParam);
|
||||
bool RegionIsNorthAmerica(void);
|
||||
bool LocaleIsUSorCanada(void);
|
||||
HRESULT GetLiveConnectionStatus();
|
||||
bool IsSystemUIDisplayed();
|
||||
void SetProfileReadErrorCallback(void ( *Func)(LPVOID), LPVOID lpParam);
|
||||
|
||||
|
||||
// PROFILE DATA
|
||||
int SetDefaultOptionsCallback(int( *Func)(LPVOID,PROFILESETTINGS *, const int iPad),LPVOID lpParam);
|
||||
int SetOldProfileVersionCallback(int( *Func)(LPVOID,unsigned char *, const unsigned short,const int),LPVOID lpParam);
|
||||
PROFILESETTINGS * GetDashboardProfileSettings(int iPad);
|
||||
void WriteToProfile(int iQuadrant, bool bGameDefinedDataChanged=false, bool bOverride5MinuteLimitOnProfileWrites=false);
|
||||
void ForceQueuedProfileWrites(int iPad=XUSER_INDEX_ANY);
|
||||
void *GetGameDefinedProfileData(int iQuadrant);
|
||||
void ResetProfileProcessState(); // after a sign out from the primary player, call this
|
||||
void Tick( void );
|
||||
|
||||
// ACHIEVEMENTS & AWARDS
|
||||
|
||||
void RegisterAward(int iAwardNumber,int iGamerconfigID, eAwardType eType, bool bLeaderboardAffected=false,
|
||||
CXuiStringTable*pStringTable=NULL, int iTitleStr=-1, int iTextStr=-1, int iAcceptStr=-1, char *pszThemeName=NULL, unsigned int uiThemeSize=0L);
|
||||
int GetAwardId(int iAwardNumber);
|
||||
eAwardType GetAwardType(int iAwardNumber);
|
||||
bool CanBeAwarded(int iQuadrant, int iAwardNumber);
|
||||
void Award(int iQuadrant, int iAwardNumber, bool bForce=false);
|
||||
bool IsAwardsFlagSet(int iQuadrant, int iAward);
|
||||
|
||||
// RICH PRESENCE
|
||||
|
||||
void RichPresenceInit(int iPresenceCount, int iContextCount);
|
||||
void RegisterRichPresenceContext(int iGameConfigContextID);
|
||||
void SetRichPresenceContextValue(int iPad,int iContextID, int iVal);
|
||||
void SetCurrentGameActivity(int iPad,int iNewPresence, bool bSetOthersToIdle=false);
|
||||
|
||||
// PURCHASE
|
||||
void DisplayFullVersionPurchase(bool bRequired, int iQuadrant, int iUpsellParam = -1);
|
||||
void SetUpsellCallback(void ( *Func)(LPVOID lpParam, eUpsellType type, eUpsellResponse response, int iUserData),LPVOID lpParam);
|
||||
|
||||
// Debug
|
||||
void SetDebugFullOverride(bool bVal); // To override the license version (trail/full). Only in debug/release, not ContentPackage
|
||||
|
||||
};
|
||||
|
||||
// Singleton
|
||||
extern C_4JProfile ProfileManager;
|
||||
|
||||
23
4J.Profile/CMakeLists.txt
Normal file
23
4J.Profile/CMakeLists.txt
Normal file
|
|
@ -0,0 +1,23 @@
|
|||
cmake_minimum_required(VERSION 3.16.0 FATAL_ERROR)
|
||||
project(4J_Profile CXX)
|
||||
|
||||
add_library(${PROJECT_NAME})
|
||||
target_sources(${PROJECT_NAME}
|
||||
PRIVATE
|
||||
4J_Profile.cpp
|
||||
PRO_AwardManager.cpp
|
||||
PRO_Data.cpp
|
||||
PRO_Main.cpp
|
||||
PRO_RichPresence.cpp
|
||||
PRO_Sys.cpp
|
||||
stdafx.cpp
|
||||
)
|
||||
target_include_directories(${PROJECT_NAME}
|
||||
PRIVATE
|
||||
${CMAKE_CURRENT_SOURCE_DIR}
|
||||
)
|
||||
|
||||
# Mimic cmake converter behaviour
|
||||
target_precompile_headers(${PROJECT_NAME} PRIVATE
|
||||
"$<$<COMPILE_LANGUAGE:CXX>:${CMAKE_CURRENT_SOURCE_DIR}/stdafx.h>"
|
||||
)
|
||||
0
4J.Profile/PRO_AwardManager.cpp
Normal file
0
4J.Profile/PRO_AwardManager.cpp
Normal file
0
4J.Profile/PRO_Data.cpp
Normal file
0
4J.Profile/PRO_Data.cpp
Normal file
0
4J.Profile/PRO_Main.cpp
Normal file
0
4J.Profile/PRO_Main.cpp
Normal file
0
4J.Profile/PRO_RichPresence.cpp
Normal file
0
4J.Profile/PRO_RichPresence.cpp
Normal file
0
4J.Profile/PRO_Sys.cpp
Normal file
0
4J.Profile/PRO_Sys.cpp
Normal file
1
4J.Profile/stdafx.cpp
Normal file
1
4J.Profile/stdafx.cpp
Normal file
|
|
@ -0,0 +1 @@
|
|||
#include "stdafx.h"
|
||||
11
4J.Profile/stdafx.h
Normal file
11
4J.Profile/stdafx.h
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
#ifndef _4J_PROFILE_STADAFX_H
|
||||
#define _4J_PROFILE_STADAFX_H
|
||||
|
||||
|
||||
#ifdef __linux__
|
||||
#include "../Minecraft.Client/Platform/Linux/Stubs/LinuxStubs.h"
|
||||
#endif
|
||||
|
||||
#include "../Minecraft.World/Build/x64headers/extraX64.h"
|
||||
|
||||
#endif //_4J_PROFILE_STADAFX_H
|
||||
199
4J.Render/4J_Render.cpp
Normal file
199
4J.Render/4J_Render.cpp
Normal file
|
|
@ -0,0 +1,199 @@
|
|||
#include "4J_Render.h"
|
||||
#include <cstring>
|
||||
|
||||
C4JRender RenderManager;
|
||||
|
||||
static float s_identityMatrix[16] = {1,0,0,0, 0,1,0,0, 0,0,1,0, 0,0,0,1};
|
||||
|
||||
void C4JRender::Tick() {}
|
||||
void C4JRender::UpdateGamma(unsigned short usGamma) {}
|
||||
void C4JRender::MatrixMode(int type) {}
|
||||
void C4JRender::MatrixSetIdentity() {}
|
||||
void C4JRender::MatrixTranslate(float x, float y, float z) {}
|
||||
void C4JRender::MatrixRotate(float angle, float x, float y, float z) {}
|
||||
void C4JRender::MatrixScale(float x, float y, float z) {}
|
||||
void C4JRender::MatrixPerspective(float fovy, float aspect, float zNear, float zFar) {}
|
||||
void C4JRender::MatrixOrthogonal(float left, float right, float bottom, float top, float zNear, float zFar) {}
|
||||
void C4JRender::MatrixPop() {}
|
||||
void C4JRender::MatrixPush() {}
|
||||
void C4JRender::MatrixMult(float *mat) {}
|
||||
const float* C4JRender::MatrixGet(int type) { return s_identityMatrix; }
|
||||
void C4JRender::Set_matrixDirty() {}
|
||||
void C4JRender::Initialise() {}
|
||||
void C4JRender::InitialiseContext() {}
|
||||
void C4JRender::StartFrame() {}
|
||||
void C4JRender::DoScreenGrabOnNextPresent() {}
|
||||
void C4JRender::Present() {}
|
||||
void C4JRender::Clear(int flags) {}
|
||||
void C4JRender::SetClearColour(const float colourRGBA[4]) {}
|
||||
bool C4JRender::IsWidescreen() { return true; }
|
||||
bool C4JRender::IsHiDef() { return true; }
|
||||
void C4JRender::CaptureThumbnail(ImageFileBuffer *pngOut) {}
|
||||
void C4JRender::CaptureScreen(ImageFileBuffer *jpgOut, XSOCIAL_PREVIEWIMAGE *previewOut) {}
|
||||
void C4JRender::BeginConditionalSurvey(int identifier) {}
|
||||
void C4JRender::EndConditionalSurvey() {}
|
||||
void C4JRender::BeginConditionalRendering(int identifier) {}
|
||||
void C4JRender::EndConditionalRendering() {}
|
||||
void C4JRender::DrawVertices(ePrimitiveType PrimitiveType, int count, void *dataIn, eVertexType vType, C4JRender::ePixelShaderType psType) {}
|
||||
void C4JRender::CBuffLockStaticCreations() {}
|
||||
int C4JRender::CBuffCreate(int count) { return 0; }
|
||||
void C4JRender::CBuffDelete(int first, int count) {}
|
||||
void C4JRender::CBuffStart(int index, bool full) {}
|
||||
void C4JRender::CBuffClear(int index) {}
|
||||
int C4JRender::CBuffSize(int index) { return 0; }
|
||||
void C4JRender::CBuffEnd() {}
|
||||
bool C4JRender::CBuffCall(int index, bool full) { return false; }
|
||||
void C4JRender::CBuffTick() {}
|
||||
void C4JRender::CBuffDeferredModeStart() {}
|
||||
void C4JRender::CBuffDeferredModeEnd() {}
|
||||
int C4JRender::TextureCreate() { return 0; }
|
||||
void C4JRender::TextureFree(int idx) {}
|
||||
void C4JRender::TextureBind(int idx) {}
|
||||
void C4JRender::TextureBindVertex(int idx) {}
|
||||
void C4JRender::TextureSetTextureLevels(int levels) {}
|
||||
int C4JRender::TextureGetTextureLevels() { return 1; }
|
||||
void C4JRender::TextureData(int width, int height, void *data, int level, eTextureFormat format) {}
|
||||
void C4JRender::TextureDataUpdate(int xoffset, int yoffset, int width, int height, void *data, int level) {}
|
||||
void C4JRender::TextureSetParam(int param, int value) {}
|
||||
void C4JRender::TextureDynamicUpdateStart() {}
|
||||
void C4JRender::TextureDynamicUpdateEnd() {}
|
||||
// really don't know if this is nessesary but didn't find any other functions to load images properly as a png..
|
||||
// im sorry.
|
||||
#ifdef __linux__
|
||||
#include <png.h>
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
|
||||
static HRESULT LoadPNGFromRows(png_structp png, png_infop info, D3DXIMAGE_INFO *pSrcInfo, int **ppDataOut)
|
||||
{
|
||||
int width = png_get_image_width(png, info);
|
||||
int height = png_get_image_height(png, info);
|
||||
png_byte color_type = png_get_color_type(png, info);
|
||||
png_byte bit_depth = png_get_bit_depth(png, info);
|
||||
|
||||
if (bit_depth == 16) png_set_strip_16(png);
|
||||
if (color_type == PNG_COLOR_TYPE_PALETTE) png_set_palette_to_rgb(png);
|
||||
if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) png_set_expand_gray_1_2_4_to_8(png);
|
||||
if (png_get_valid(png, info, PNG_INFO_tRNS)) png_set_tRNS_to_alpha(png);
|
||||
if (color_type == PNG_COLOR_TYPE_RGB || color_type == PNG_COLOR_TYPE_GRAY || color_type == PNG_COLOR_TYPE_PALETTE)
|
||||
png_set_filler(png, 0xFF, PNG_FILLER_AFTER);
|
||||
if (color_type == PNG_COLOR_TYPE_GRAY || color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
|
||||
png_set_gray_to_rgb(png);
|
||||
|
||||
png_read_update_info(png, info);
|
||||
|
||||
unsigned char *buf = new unsigned char[width * height * 4];
|
||||
png_bytep *rows = new png_bytep[height];
|
||||
for (int y = 0; y < height; y++)
|
||||
rows[y] = buf + y * width * 4;
|
||||
png_read_image(png, rows);
|
||||
delete[] rows;
|
||||
// considering i worked on previous projects with raw pngs,,,,,
|
||||
int *pixels = new int[width * height];
|
||||
for (int i = 0; i < width * height; i++)
|
||||
{
|
||||
unsigned char r = buf[i * 4 + 0];
|
||||
unsigned char g = buf[i * 4 + 1];
|
||||
unsigned char b = buf[i * 4 + 2];
|
||||
unsigned char a = buf[i * 4 + 3];
|
||||
pixels[i] = (a << 24) | (r << 16) | (g << 8) | b;
|
||||
}
|
||||
delete[] buf;
|
||||
|
||||
pSrcInfo->Width = width;
|
||||
pSrcInfo->Height = height;
|
||||
*ppDataOut = pixels;
|
||||
return S_OK;
|
||||
}
|
||||
|
||||
HRESULT C4JRender::LoadTextureData(const char *szFilename, D3DXIMAGE_INFO *pSrcInfo, int **ppDataOut)
|
||||
{
|
||||
FILE *fp = fopen(szFilename, "rb");
|
||||
if (!fp) return E_FAIL;
|
||||
|
||||
png_structp png = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
|
||||
if (!png) { fclose(fp); return E_FAIL; }
|
||||
png_infop info = png_create_info_struct(png);
|
||||
if (!info) { png_destroy_read_struct(&png, NULL, NULL); fclose(fp); return E_FAIL; }
|
||||
if (setjmp(png_jmpbuf(png))) { png_destroy_read_struct(&png, &info, NULL); fclose(fp); return E_FAIL; }
|
||||
|
||||
png_init_io(png, fp);
|
||||
png_read_info(png, info);
|
||||
|
||||
HRESULT hr = LoadPNGFromRows(png, info, pSrcInfo, ppDataOut);
|
||||
png_destroy_read_struct(&png, &info, NULL);
|
||||
fclose(fp);
|
||||
return hr;
|
||||
}
|
||||
|
||||
struct PNGMemReader { const unsigned char *data; png_size_t pos; png_size_t size; };
|
||||
|
||||
static void png_mem_read(png_structp png, png_bytep out, png_size_t len)
|
||||
{
|
||||
PNGMemReader *r = (PNGMemReader *)png_get_io_ptr(png);
|
||||
if (r->pos + len > r->size) len = r->size - r->pos;
|
||||
memcpy(out, r->data + r->pos, len);
|
||||
r->pos += len;
|
||||
}
|
||||
|
||||
HRESULT C4JRender::LoadTextureData(BYTE *pbData, DWORD dwBytes, D3DXIMAGE_INFO *pSrcInfo, int **ppDataOut)
|
||||
{
|
||||
png_structp png = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
|
||||
if (!png) return E_FAIL;
|
||||
png_infop info = png_create_info_struct(png);
|
||||
if (!info) { png_destroy_read_struct(&png, NULL, NULL); return E_FAIL; }
|
||||
if (setjmp(png_jmpbuf(png))) { png_destroy_read_struct(&png, &info, NULL); return E_FAIL; }
|
||||
|
||||
PNGMemReader reader = { pbData, 0, dwBytes };
|
||||
png_set_read_fn(png, &reader, png_mem_read);
|
||||
png_read_info(png, info);
|
||||
|
||||
HRESULT hr = LoadPNGFromRows(png, info, pSrcInfo, ppDataOut);
|
||||
png_destroy_read_struct(&png, &info, NULL);
|
||||
return hr;
|
||||
}
|
||||
|
||||
#else
|
||||
HRESULT C4JRender::LoadTextureData(const char *szFilename, D3DXIMAGE_INFO *pSrcInfo, int **ppDataOut) { return S_OK; }
|
||||
HRESULT C4JRender::LoadTextureData(BYTE *pbData, DWORD dwBytes, D3DXIMAGE_INFO *pSrcInfo, int **ppDataOut) { return S_OK; }
|
||||
#endif
|
||||
HRESULT C4JRender::SaveTextureData(const char *szFilename, D3DXIMAGE_INFO *pSrcInfo, int *ppDataOut) { return S_OK; }
|
||||
HRESULT C4JRender::SaveTextureDataToMemory(void *pOutput, int outputCapacity, int *outputLength, int width, int height, int *ppDataIn) { return S_OK; }
|
||||
void C4JRender::TextureGetStats() {}
|
||||
void* C4JRender::TextureGetTexture(int idx) { return nullptr; }
|
||||
void C4JRender::StateSetColour(float r, float g, float b, float a) {}
|
||||
void C4JRender::StateSetDepthMask(bool enable) {}
|
||||
void C4JRender::StateSetBlendEnable(bool enable) {}
|
||||
void C4JRender::StateSetBlendFunc(int src, int dst) {}
|
||||
void C4JRender::StateSetBlendFactor(unsigned int colour) {}
|
||||
void C4JRender::StateSetAlphaFunc(int func, float param) {}
|
||||
void C4JRender::StateSetDepthFunc(int func) {}
|
||||
void C4JRender::StateSetFaceCull(bool enable) {}
|
||||
void C4JRender::StateSetFaceCullCW(bool enable) {}
|
||||
void C4JRender::StateSetLineWidth(float width) {}
|
||||
void C4JRender::StateSetWriteEnable(bool red, bool green, bool blue, bool alpha) {}
|
||||
void C4JRender::StateSetDepthTestEnable(bool enable) {}
|
||||
void C4JRender::StateSetAlphaTestEnable(bool enable) {}
|
||||
void C4JRender::StateSetDepthSlopeAndBias(float slope, float bias) {}
|
||||
void C4JRender::StateSetFogEnable(bool enable) {}
|
||||
void C4JRender::StateSetFogMode(int mode) {}
|
||||
void C4JRender::StateSetFogNearDistance(float dist) {}
|
||||
void C4JRender::StateSetFogFarDistance(float dist) {}
|
||||
void C4JRender::StateSetFogDensity(float density) {}
|
||||
void C4JRender::StateSetFogColour(float red, float green, float blue) {}
|
||||
void C4JRender::StateSetLightingEnable(bool enable) {}
|
||||
void C4JRender::StateSetVertexTextureUV(float u, float v) {}
|
||||
void C4JRender::StateSetLightColour(int light, float red, float green, float blue) {}
|
||||
void C4JRender::StateSetLightAmbientColour(float red, float green, float blue) {}
|
||||
void C4JRender::StateSetLightDirection(int light, float x, float y, float z) {}
|
||||
void C4JRender::StateSetLightEnable(int light, bool enable) {}
|
||||
void C4JRender::StateSetViewport(eViewportType viewportType) {}
|
||||
void C4JRender::StateSetEnableViewportClipPlanes(bool enable) {}
|
||||
void C4JRender::StateSetTexGenCol(int col, float x, float y, float z, float w, bool eyeSpace) {}
|
||||
void C4JRender::StateSetStencil(int Function, uint8_t stencil_ref, uint8_t stencil_func_mask, uint8_t stencil_write_mask) {}
|
||||
void C4JRender::StateSetForceLOD(int LOD) {}
|
||||
void C4JRender::BeginEvent(LPCWSTR eventName) {}
|
||||
void C4JRender::EndEvent() {}
|
||||
void C4JRender::Suspend() {}
|
||||
bool C4JRender::Suspended() { return false; }
|
||||
void C4JRender::Resume() {}
|
||||
307
4J.Render/4J_Render.h
Normal file
307
4J.Render/4J_Render.h
Normal file
|
|
@ -0,0 +1,307 @@
|
|||
#pragma once
|
||||
|
||||
#ifdef __linux__
|
||||
#include "../Minecraft.Client/Platform/Linux/Stubs/LinuxStubs.h"
|
||||
#endif
|
||||
|
||||
#include <cstdint>
|
||||
|
||||
class ImageFileBuffer
|
||||
{
|
||||
public:
|
||||
enum EImageType
|
||||
{
|
||||
e_typePNG,
|
||||
e_typeJPG
|
||||
};
|
||||
|
||||
EImageType m_type;
|
||||
void* m_pBuffer;
|
||||
int m_bufferSize;
|
||||
|
||||
int GetType() { return m_type; }
|
||||
void *GetBufferPointer() { return m_pBuffer; }
|
||||
int GetBufferSize() { return m_bufferSize; }
|
||||
void Release() { free(m_pBuffer); m_pBuffer = NULL; }
|
||||
bool Allocated() { return m_pBuffer != NULL; }
|
||||
};
|
||||
|
||||
typedef struct
|
||||
{
|
||||
int Width;
|
||||
int Height;
|
||||
}D3DXIMAGE_INFO;
|
||||
|
||||
typedef struct _XSOCIAL_PREVIEWIMAGE {
|
||||
BYTE *pBytes;
|
||||
DWORD Pitch;
|
||||
DWORD Width;
|
||||
DWORD Height;
|
||||
// D3DFORMAT Format;
|
||||
} XSOCIAL_PREVIEWIMAGE, *PXSOCIAL_PREVIEWIMAGE;
|
||||
|
||||
class C4JRender
|
||||
{
|
||||
public:
|
||||
void Tick();
|
||||
void UpdateGamma(unsigned short usGamma);
|
||||
|
||||
// Matrix stack
|
||||
void MatrixMode(int type);
|
||||
void MatrixSetIdentity();
|
||||
void MatrixTranslate(float x,float y,float z);
|
||||
void MatrixRotate(float angle, float x, float y, float z);
|
||||
void MatrixScale(float x, float y, float z);
|
||||
void MatrixPerspective(float fovy, float aspect, float zNear, float zFar);
|
||||
void MatrixOrthogonal(float left,float right,float bottom,float top,float zNear,float zFar);
|
||||
void MatrixPop();
|
||||
void MatrixPush();
|
||||
void MatrixMult(float *mat);
|
||||
const float *MatrixGet(int type);
|
||||
void Set_matrixDirty();
|
||||
|
||||
// Core
|
||||
void Initialise();
|
||||
void InitialiseContext();
|
||||
void StartFrame();
|
||||
void DoScreenGrabOnNextPresent();
|
||||
void Present();
|
||||
void Clear(int flags);
|
||||
void SetClearColour(const float colourRGBA[4]);
|
||||
bool IsWidescreen();
|
||||
bool IsHiDef();
|
||||
void CaptureThumbnail(ImageFileBuffer *pngOut);
|
||||
void CaptureScreen(ImageFileBuffer *jpgOut, XSOCIAL_PREVIEWIMAGE *previewOut);
|
||||
void BeginConditionalSurvey(int identifier);
|
||||
void EndConditionalSurvey();
|
||||
void BeginConditionalRendering(int identifier);
|
||||
void EndConditionalRendering();
|
||||
|
||||
// Vertex data handling
|
||||
typedef enum
|
||||
{
|
||||
VERTEX_TYPE_PF3_TF2_CB4_NB4_XW1, // Position 3 x float, texture 2 x float, colour 4 x byte, normal 4 x byte, padding 1 DWORD
|
||||
VERTEX_TYPE_COMPRESSED, // Compressed format - see comment at top of VS_PS3_TS2_CS1.hlsl for description of layout
|
||||
VERTEX_TYPE_PF3_TF2_CB4_NB4_XW1_LIT, // as VERTEX_TYPE_PF3_TF2_CB4_NB4_XW1 with lighting applied,
|
||||
VERTEX_TYPE_PF3_TF2_CB4_NB4_XW1_TEXGEN, // as VERTEX_TYPE_PF3_TF2_CB4_NB4_XW1 with tex gen
|
||||
VERTEX_TYPE_COUNT
|
||||
} eVertexType;
|
||||
|
||||
// Pixel shader
|
||||
typedef enum
|
||||
{
|
||||
PIXEL_SHADER_TYPE_STANDARD,
|
||||
PIXEL_SHADER_TYPE_PROJECTION,
|
||||
PIXEL_SHADER_TYPE_FORCELOD,
|
||||
PIXEL_SHADER_COUNT
|
||||
} ePixelShaderType;
|
||||
|
||||
typedef enum
|
||||
{
|
||||
VIEWPORT_TYPE_FULLSCREEN,
|
||||
VIEWPORT_TYPE_SPLIT_TOP,
|
||||
VIEWPORT_TYPE_SPLIT_BOTTOM,
|
||||
VIEWPORT_TYPE_SPLIT_LEFT,
|
||||
VIEWPORT_TYPE_SPLIT_RIGHT,
|
||||
VIEWPORT_TYPE_QUADRANT_TOP_LEFT,
|
||||
VIEWPORT_TYPE_QUADRANT_TOP_RIGHT,
|
||||
VIEWPORT_TYPE_QUADRANT_BOTTOM_LEFT,
|
||||
VIEWPORT_TYPE_QUADRANT_BOTTOM_RIGHT,
|
||||
} eViewportType;
|
||||
|
||||
typedef enum
|
||||
{
|
||||
PRIMITIVE_TYPE_TRIANGLE_LIST,
|
||||
PRIMITIVE_TYPE_TRIANGLE_STRIP,
|
||||
PRIMITIVE_TYPE_TRIANGLE_FAN,
|
||||
PRIMITIVE_TYPE_QUAD_LIST,
|
||||
PRIMITIVE_TYPE_LINE_LIST,
|
||||
PRIMITIVE_TYPE_LINE_STRIP,
|
||||
PRIMITIVE_TYPE_COUNT
|
||||
} ePrimitiveType;
|
||||
|
||||
void DrawVertices(ePrimitiveType PrimitiveType, int count, void *dataIn, eVertexType vType, C4JRender::ePixelShaderType psType);
|
||||
|
||||
// Command buffers
|
||||
void CBuffLockStaticCreations();
|
||||
int CBuffCreate(int count);
|
||||
void CBuffDelete(int first, int count);
|
||||
void CBuffStart(int index, bool full = false);
|
||||
void CBuffClear(int index);
|
||||
int CBuffSize(int index);
|
||||
void CBuffEnd();
|
||||
bool CBuffCall(int index, bool full = true);
|
||||
void CBuffTick();
|
||||
void CBuffDeferredModeStart();
|
||||
void CBuffDeferredModeEnd();
|
||||
|
||||
typedef enum
|
||||
{
|
||||
TEXTURE_FORMAT_RxGyBzAw, // Normal 32-bit RGBA texture, 8 bits per component
|
||||
/* Don't think these are all directly available on D3D 11 - leaving for now
|
||||
TEXTURE_FORMAT_R0G0B0Ax, // One 8-bit component mapped to alpha channel, R=G=B=0
|
||||
TEXTURE_FORMAT_R1G1B1Ax, // One 8-bit component mapped to alpha channel, R=G=B=1
|
||||
TEXTURE_FORMAT_RxGxBxAx, // One 8-bit component mapped to all channels
|
||||
*/
|
||||
MAX_TEXTURE_FORMATS
|
||||
} eTextureFormat;
|
||||
|
||||
// Textures
|
||||
int TextureCreate();
|
||||
void TextureFree(int idx);
|
||||
void TextureBind(int idx);
|
||||
void TextureBindVertex(int idx);
|
||||
void TextureSetTextureLevels(int levels);
|
||||
int TextureGetTextureLevels();
|
||||
void TextureData(int width, int height, void *data, int level, eTextureFormat format = TEXTURE_FORMAT_RxGyBzAw);
|
||||
void TextureDataUpdate(int xoffset, int yoffset, int width, int height, void *data, int level);
|
||||
void TextureSetParam(int param, int value);
|
||||
void TextureDynamicUpdateStart();
|
||||
void TextureDynamicUpdateEnd();
|
||||
HRESULT LoadTextureData(const char *szFilename,D3DXIMAGE_INFO *pSrcInfo, int **ppDataOut);
|
||||
HRESULT LoadTextureData(BYTE *pbData, DWORD dwBytes,D3DXIMAGE_INFO *pSrcInfo, int **ppDataOut);
|
||||
HRESULT SaveTextureData(const char *szFilename, D3DXIMAGE_INFO *pSrcInfo, int *ppDataOut);
|
||||
HRESULT SaveTextureDataToMemory(void *pOutput, int outputCapacity, int *outputLength, int width, int height, int *ppDataIn);
|
||||
void TextureGetStats();
|
||||
void *TextureGetTexture(int idx);
|
||||
|
||||
// State control
|
||||
void StateSetColour(float r, float g, float b, float a);
|
||||
void StateSetDepthMask(bool enable);
|
||||
void StateSetBlendEnable(bool enable);
|
||||
void StateSetBlendFunc(int src, int dst);
|
||||
void StateSetBlendFactor(unsigned int colour);
|
||||
void StateSetAlphaFunc(int func, float param);
|
||||
void StateSetDepthFunc(int func);
|
||||
void StateSetFaceCull(bool enable);
|
||||
void StateSetFaceCullCW(bool enable);
|
||||
void StateSetLineWidth(float width);
|
||||
void StateSetWriteEnable(bool red, bool green, bool blue, bool alpha);
|
||||
void StateSetDepthTestEnable(bool enable);
|
||||
void StateSetAlphaTestEnable(bool enable);
|
||||
void StateSetDepthSlopeAndBias(float slope, float bias);
|
||||
void StateSetFogEnable(bool enable);
|
||||
void StateSetFogMode(int mode);
|
||||
void StateSetFogNearDistance(float dist);
|
||||
void StateSetFogFarDistance(float dist);
|
||||
void StateSetFogDensity(float density);
|
||||
void StateSetFogColour(float red, float green, float blue);
|
||||
void StateSetLightingEnable(bool enable);
|
||||
void StateSetVertexTextureUV( float u, float v);
|
||||
void StateSetLightColour(int light, float red, float green, float blue);
|
||||
void StateSetLightAmbientColour(float red, float green, float blue);
|
||||
void StateSetLightDirection(int light, float x, float y, float z);
|
||||
void StateSetLightEnable(int light, bool enable);
|
||||
void StateSetViewport(eViewportType viewportType);
|
||||
void StateSetEnableViewportClipPlanes(bool enable);
|
||||
void StateSetTexGenCol(int col, float x, float y, float z, float w, bool eyeSpace);
|
||||
void StateSetStencil(int Function, uint8_t stencil_ref, uint8_t stencil_func_mask, uint8_t stencil_write_mask);
|
||||
void StateSetForceLOD(int LOD);
|
||||
|
||||
// Event tracking
|
||||
void BeginEvent(LPCWSTR eventName);
|
||||
void EndEvent();
|
||||
|
||||
// PLM event handling
|
||||
void Suspend();
|
||||
bool Suspended();
|
||||
void Resume();
|
||||
};
|
||||
|
||||
|
||||
const int GL_MODELVIEW_MATRIX = 0;
|
||||
const int GL_PROJECTION_MATRIX = 1;
|
||||
const int GL_MODELVIEW = 0;
|
||||
const int GL_PROJECTION = 1;
|
||||
const int GL_TEXTURE = 2;
|
||||
|
||||
// These things required for tex gen
|
||||
|
||||
const int GL_S = 0;
|
||||
const int GL_T = 1;
|
||||
const int GL_R = 2;
|
||||
const int GL_Q = 3;
|
||||
|
||||
const int GL_TEXTURE_GEN_S = 0;
|
||||
const int GL_TEXTURE_GEN_T = 1;
|
||||
const int GL_TEXTURE_GEN_Q = 2;
|
||||
const int GL_TEXTURE_GEN_R = 3;
|
||||
|
||||
const int GL_TEXTURE_GEN_MODE = 0;
|
||||
const int GL_OBJECT_LINEAR = 0;
|
||||
const int GL_EYE_LINEAR = 1;
|
||||
const int GL_OBJECT_PLANE = 0;
|
||||
const int GL_EYE_PLANE = 1;
|
||||
|
||||
|
||||
// These things are used by glEnable/glDisable so must be different and non-zero (zero is used by things we haven't assigned yet)
|
||||
const int GL_TEXTURE_2D = 1;
|
||||
const int GL_BLEND = 2;
|
||||
const int GL_CULL_FACE = 3;
|
||||
const int GL_ALPHA_TEST = 4;
|
||||
const int GL_DEPTH_TEST = 5;
|
||||
const int GL_FOG = 6;
|
||||
const int GL_LIGHTING = 7;
|
||||
const int GL_LIGHT0 = 8;
|
||||
const int GL_LIGHT1 = 9;
|
||||
|
||||
const int CLEAR_DEPTH_FLAG = 1;
|
||||
const int CLEAR_COLOUR_FLAG = 2;
|
||||
|
||||
const int GL_DEPTH_BUFFER_BIT = CLEAR_DEPTH_FLAG;
|
||||
const int GL_COLOR_BUFFER_BIT = CLEAR_COLOUR_FLAG;
|
||||
|
||||
const int GL_SRC_ALPHA = D3D11_BLEND_SRC_ALPHA;
|
||||
const int GL_ONE_MINUS_SRC_ALPHA = D3D11_BLEND_INV_SRC_ALPHA;
|
||||
const int GL_ONE = D3D11_BLEND_ONE;
|
||||
const int GL_ZERO = D3D11_BLEND_ZERO;
|
||||
const int GL_DST_ALPHA = D3D11_BLEND_DEST_ALPHA;
|
||||
const int GL_SRC_COLOR = D3D11_BLEND_SRC_COLOR;
|
||||
const int GL_DST_COLOR = D3D11_BLEND_DEST_COLOR;
|
||||
const int GL_ONE_MINUS_DST_COLOR = D3D11_BLEND_INV_DEST_COLOR;
|
||||
const int GL_ONE_MINUS_SRC_COLOR = D3D11_BLEND_INV_SRC_COLOR;
|
||||
const int GL_CONSTANT_ALPHA = D3D11_BLEND_BLEND_FACTOR;
|
||||
const int GL_ONE_MINUS_CONSTANT_ALPHA = D3D11_BLEND_INV_BLEND_FACTOR;
|
||||
|
||||
const int GL_GREATER = D3D11_COMPARISON_GREATER;
|
||||
const int GL_EQUAL = D3D11_COMPARISON_EQUAL;
|
||||
const int GL_LEQUAL = D3D11_COMPARISON_LESS_EQUAL;
|
||||
const int GL_GEQUAL = D3D11_COMPARISON_GREATER_EQUAL;
|
||||
const int GL_ALWAYS = D3D11_COMPARISON_ALWAYS;
|
||||
|
||||
const int GL_TEXTURE_MIN_FILTER = 1;
|
||||
const int GL_TEXTURE_MAG_FILTER = 2;
|
||||
const int GL_TEXTURE_WRAP_S = 3;
|
||||
const int GL_TEXTURE_WRAP_T = 4;
|
||||
|
||||
const int GL_NEAREST = 0;
|
||||
const int GL_LINEAR = 1;
|
||||
const int GL_EXP = 2;
|
||||
const int GL_NEAREST_MIPMAP_LINEAR = 0; // TODO - mipmapping bit of this
|
||||
|
||||
const int GL_CLAMP = 0;
|
||||
const int GL_REPEAT = 1;
|
||||
|
||||
const int GL_FOG_START = 1;
|
||||
const int GL_FOG_END = 2;
|
||||
const int GL_FOG_MODE = 3;
|
||||
const int GL_FOG_DENSITY = 4;
|
||||
const int GL_FOG_COLOR = 5;
|
||||
|
||||
const int GL_POSITION = 1;
|
||||
const int GL_AMBIENT = 2;
|
||||
const int GL_DIFFUSE = 3;
|
||||
const int GL_SPECULAR = 4;
|
||||
|
||||
const int GL_LIGHT_MODEL_AMBIENT = 1;
|
||||
|
||||
const int GL_LINES = C4JRender::PRIMITIVE_TYPE_LINE_LIST;
|
||||
const int GL_LINE_STRIP = C4JRender::PRIMITIVE_TYPE_LINE_STRIP;
|
||||
const int GL_QUADS = C4JRender::PRIMITIVE_TYPE_QUAD_LIST;
|
||||
const int GL_TRIANGLE_FAN = C4JRender::PRIMITIVE_TYPE_TRIANGLE_FAN;
|
||||
const int GL_TRIANGLE_STRIP = C4JRender::PRIMITIVE_TYPE_TRIANGLE_STRIP;
|
||||
|
||||
// Singleton
|
||||
extern C4JRender RenderManager;
|
||||
|
||||
|
||||
30
4J.Render/CMakeLists.txt
Normal file
30
4J.Render/CMakeLists.txt
Normal file
|
|
@ -0,0 +1,30 @@
|
|||
cmake_minimum_required(VERSION 3.16.0 FATAL_ERROR)
|
||||
project(4J_Render CXX)
|
||||
|
||||
add_library(${PROJECT_NAME})
|
||||
target_sources(${PROJECT_NAME}
|
||||
PRIVATE
|
||||
4J_Render.cpp
|
||||
RendererCbuff.cpp
|
||||
RendererCore.cpp
|
||||
RendererMatrix.cpp
|
||||
RendererState.cpp
|
||||
RendererTexture.cpp
|
||||
RendererVertex.cpp
|
||||
stdafx.cpp
|
||||
)
|
||||
target_include_directories(${PROJECT_NAME}
|
||||
PRIVATE
|
||||
${CMAKE_CURRENT_SOURCE_DIR}
|
||||
)
|
||||
# giving a boost on the next macos implmentation
|
||||
|
||||
if(UNIX AND NOT APPLE)
|
||||
find_package(PNG REQUIRED)
|
||||
target_link_libraries(${PROJECT_NAME} PRIVATE PNG::PNG)
|
||||
endif()
|
||||
|
||||
# Mimic cmake converter behaviour
|
||||
target_precompile_headers(${PROJECT_NAME} PRIVATE
|
||||
"$<$<COMPILE_LANGUAGE:CXX>:${CMAKE_CURRENT_SOURCE_DIR}/stdafx.h>"
|
||||
)
|
||||
0
4J.Render/RendererCbuff.cpp
Normal file
0
4J.Render/RendererCbuff.cpp
Normal file
0
4J.Render/RendererCore.cpp
Normal file
0
4J.Render/RendererCore.cpp
Normal file
0
4J.Render/RendererMatrix.cpp
Normal file
0
4J.Render/RendererMatrix.cpp
Normal file
0
4J.Render/RendererState.cpp
Normal file
0
4J.Render/RendererState.cpp
Normal file
0
4J.Render/RendererTexture.cpp
Normal file
0
4J.Render/RendererTexture.cpp
Normal file
0
4J.Render/RendererVertex.cpp
Normal file
0
4J.Render/RendererVertex.cpp
Normal file
1
4J.Render/stdafx.cpp
Normal file
1
4J.Render/stdafx.cpp
Normal file
|
|
@ -0,0 +1 @@
|
|||
#include "stdafx.h"
|
||||
8
4J.Render/stdafx.h
Normal file
8
4J.Render/stdafx.h
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
#ifndef _4J_RENDER_STADAFX_H
|
||||
#define _4J_RENDER_STADAFX_H
|
||||
|
||||
#ifdef __linux__
|
||||
#include "../Minecraft.Client/Platform/Linux/Stubs/LinuxStubs.h"
|
||||
#endif
|
||||
|
||||
#endif //_4J_RENDER_STADAFX_H
|
||||
92
4J.Storage/4J_Storage.cpp
Normal file
92
4J.Storage/4J_Storage.cpp
Normal file
|
|
@ -0,0 +1,92 @@
|
|||
#include "4J_Storage.h"
|
||||
#include <cstring>
|
||||
#include <vector>
|
||||
#include <string>
|
||||
|
||||
C4JStorage StorageManager;
|
||||
|
||||
static XMARKETPLACE_CONTENTOFFER_INFO s_dummyOffer = {};
|
||||
static XCONTENT_DATA s_dummyContentData = {};
|
||||
|
||||
C4JStorage::C4JStorage() : m_pStringTable(nullptr) {}
|
||||
|
||||
void C4JStorage::Tick(void) {}
|
||||
|
||||
C4JStorage::EMessageResult C4JStorage::RequestMessageBox(UINT uiTitle, UINT uiText, UINT *uiOptionA, UINT uiOptionC, DWORD dwPad,
|
||||
int(*Func)(LPVOID, int, const C4JStorage::EMessageResult), LPVOID lpParam, C4JStringTable *pStringTable, WCHAR *pwchFormatString, DWORD dwFocusButton) {
|
||||
return EMessage_ResultAccept;
|
||||
}
|
||||
|
||||
C4JStorage::EMessageResult C4JStorage::GetMessageBoxResult() { return EMessage_Undefined; }
|
||||
|
||||
bool C4JStorage::SetSaveDevice(int(*Func)(LPVOID, const bool), LPVOID lpParam, bool bForceResetOfSaveDevice) { return true; }
|
||||
|
||||
void C4JStorage::Init(unsigned int uiSaveVersion, LPCWSTR pwchDefaultSaveName, char *pszSavePackName, int iMinimumSaveSize, int(*Func)(LPVOID, const ESavingMessage, int), LPVOID lpParam, LPCSTR szGroupID) {}
|
||||
void C4JStorage::ResetSaveData() {}
|
||||
void C4JStorage::SetDefaultSaveNameForKeyboardDisplay(LPCWSTR pwchDefaultSaveName) {}
|
||||
void C4JStorage::SetSaveTitle(LPCWSTR pwchDefaultSaveName) {}
|
||||
bool C4JStorage::GetSaveUniqueNumber(INT *piVal) { if (piVal) *piVal = 0; return true; }
|
||||
bool C4JStorage::GetSaveUniqueFilename(char *pszName) { if (pszName) pszName[0] = '\0'; return true; }
|
||||
void C4JStorage::SetSaveUniqueFilename(char *szFilename) {}
|
||||
void C4JStorage::SetState(ESaveGameControlState eControlState, int(*Func)(LPVOID, const bool), LPVOID lpParam) {}
|
||||
void C4JStorage::SetSaveDisabled(bool bDisable) {}
|
||||
bool C4JStorage::GetSaveDisabled(void) { return false; }
|
||||
unsigned int C4JStorage::GetSaveSize() { return 0; }
|
||||
void C4JStorage::GetSaveData(void *pvData, unsigned int *puiBytes) { if (puiBytes) *puiBytes = 0; }
|
||||
PVOID C4JStorage::AllocateSaveData(unsigned int uiBytes) { return malloc(uiBytes); }
|
||||
void C4JStorage::SetSaveImages(PBYTE pbThumbnail, DWORD dwThumbnailBytes, PBYTE pbImage, DWORD dwImageBytes, PBYTE pbTextData, DWORD dwTextDataBytes) {}
|
||||
C4JStorage::ESaveGameState C4JStorage::SaveSaveData(int(*Func)(LPVOID, const bool), LPVOID lpParam) { return ESaveGame_Idle; }
|
||||
void C4JStorage::CopySaveDataToNewSave(PBYTE pbThumbnail, DWORD cbThumbnail, WCHAR *wchNewName, int(*Func)(LPVOID lpParam, bool), LPVOID lpParam) {}
|
||||
void C4JStorage::SetSaveDeviceSelected(unsigned int uiPad, bool bSelected) {}
|
||||
bool C4JStorage::GetSaveDeviceSelected(unsigned int iPad) { return true; }
|
||||
C4JStorage::ESaveGameState C4JStorage::DoesSaveExist(bool *pbExists) { if (pbExists) *pbExists = false; return ESaveGame_Idle; }
|
||||
bool C4JStorage::EnoughSpaceForAMinSaveGame() { return true; }
|
||||
void C4JStorage::SetSaveMessageVPosition(float fY) {}
|
||||
C4JStorage::ESaveGameState C4JStorage::GetSavesInfo(int iPad, int(*Func)(LPVOID lpParam, SAVE_DETAILS *pSaveDetails, const bool), LPVOID lpParam, char *pszSavePackName) { return ESaveGame_Idle; }
|
||||
PSAVE_DETAILS C4JStorage::ReturnSavesInfo() { return nullptr; }
|
||||
void C4JStorage::ClearSavesInfo() {}
|
||||
C4JStorage::ESaveGameState C4JStorage::LoadSaveDataThumbnail(PSAVE_INFO pSaveInfo, int(*Func)(LPVOID lpParam, PBYTE pbThumbnail, DWORD dwThumbnailBytes), LPVOID lpParam) { return ESaveGame_Idle; }
|
||||
void C4JStorage::GetSaveCacheFileInfo(DWORD dwFile, XCONTENT_DATA &xContentData) { memset(&xContentData, 0, sizeof(xContentData)); }
|
||||
void C4JStorage::GetSaveCacheFileInfo(DWORD dwFile, PBYTE *ppbImageData, DWORD *pdwImageBytes) { if (ppbImageData) *ppbImageData = nullptr; if (pdwImageBytes) *pdwImageBytes = 0; }
|
||||
C4JStorage::ESaveGameState C4JStorage::LoadSaveData(PSAVE_INFO pSaveInfo, int(*Func)(LPVOID lpParam, const bool, const bool), LPVOID lpParam) { return ESaveGame_Idle; }
|
||||
C4JStorage::ESaveGameState C4JStorage::DeleteSaveData(PSAVE_INFO pSaveInfo, int(*Func)(LPVOID lpParam, const bool), LPVOID lpParam) { return ESaveGame_Idle; }
|
||||
void C4JStorage::RegisterMarketplaceCountsCallback(int(*Func)(LPVOID lpParam, C4JStorage::DLC_TMS_DETAILS *, int), LPVOID lpParam) {}
|
||||
void C4JStorage::SetDLCPackageRoot(char *pszDLCRoot) {}
|
||||
C4JStorage::EDLCStatus C4JStorage::GetDLCOffers(int iPad, int(*Func)(LPVOID, int, DWORD, int), LPVOID lpParam, DWORD dwOfferTypesBitmask) { return EDLC_NoOffers; }
|
||||
DWORD C4JStorage::CancelGetDLCOffers() { return 0; }
|
||||
void C4JStorage::ClearDLCOffers() {}
|
||||
XMARKETPLACE_CONTENTOFFER_INFO& C4JStorage::GetOffer(DWORD dw) { return s_dummyOffer; }
|
||||
int C4JStorage::GetOfferCount() { return 0; }
|
||||
DWORD C4JStorage::InstallOffer(int iOfferIDC, __uint64 *ullOfferIDA, int(*Func)(LPVOID, int, int), LPVOID lpParam, bool bTrial) { return 0; }
|
||||
DWORD C4JStorage::GetAvailableDLCCount(int iPad) { return 0; }
|
||||
C4JStorage::EDLCStatus C4JStorage::GetInstalledDLC(int iPad, int(*Func)(LPVOID, int, int), LPVOID lpParam) { return EDLC_NoInstalledDLC; }
|
||||
XCONTENT_DATA& C4JStorage::GetDLC(DWORD dw) { return s_dummyContentData; }
|
||||
DWORD C4JStorage::MountInstalledDLC(int iPad, DWORD dwDLC, int(*Func)(LPVOID, int, DWORD, DWORD), LPVOID lpParam, LPCSTR szMountDrive) { return 0; }
|
||||
DWORD C4JStorage::UnmountInstalledDLC(LPCSTR szMountDrive) { return 0; }
|
||||
void C4JStorage::GetMountedDLCFileList(const char *szMountDrive, std::vector<std::string> &fileList) { fileList.clear(); }
|
||||
std::string C4JStorage::GetMountedPath(std::string szMount) { return ""; }
|
||||
C4JStorage::ETMSStatus C4JStorage::ReadTMSFile(int iQuadrant, eGlobalStorage eStorageFacility, C4JStorage::eTMS_FileType eFileType,
|
||||
WCHAR *pwchFilename, BYTE **ppBuffer, DWORD *pdwBufferSize, int(*Func)(LPVOID, WCHAR *, int, bool, int), LPVOID lpParam, int iAction) { return ETMSStatus_Fail; }
|
||||
bool C4JStorage::WriteTMSFile(int iQuadrant, eGlobalStorage eStorageFacility, WCHAR *pwchFilename, BYTE *pBuffer, DWORD dwBufferSize) { return false; }
|
||||
bool C4JStorage::DeleteTMSFile(int iQuadrant, eGlobalStorage eStorageFacility, WCHAR *pwchFilename) { return false; }
|
||||
void C4JStorage::StoreTMSPathName(WCHAR *pwchName) {}
|
||||
C4JStorage::ETMSStatus C4JStorage::TMSPP_ReadFile(int iPad, C4JStorage::eGlobalStorage eStorageFacility, C4JStorage::eTMS_FILETYPEVAL eFileTypeVal, LPCSTR szFilename, int(*Func)(LPVOID, int, int, PTMSPP_FILEDATA, LPCSTR), LPVOID lpParam, int iUserData) { return ETMSStatus_Fail; }
|
||||
unsigned int C4JStorage::CRC(unsigned char *buf, int len) {
|
||||
unsigned int crc = 0xFFFFFFFF;
|
||||
for (int i = 0; i < len; i++) {
|
||||
crc ^= buf[i];
|
||||
for (int j = 0; j < 8; j++) {
|
||||
crc = (crc >> 1) ^ (0xEDB88320 & (-(crc & 1)));
|
||||
}
|
||||
}
|
||||
return ~crc;
|
||||
}
|
||||
|
||||
int C4JStorage::AddSubfile(int regionIndex) { (void)regionIndex; return 0; }
|
||||
unsigned int C4JStorage::GetSubfileCount() { return 0; }
|
||||
void C4JStorage::GetSubfileDetails(unsigned int i, int* regionIndex, void** data, unsigned int* size) { (void)i; if(regionIndex) *regionIndex=0; if(data) *data=0; if(size) *size=0; }
|
||||
void C4JStorage::ResetSubfiles() {}
|
||||
void C4JStorage::UpdateSubfile(int index, void* data, unsigned int size) { (void)index; (void)data; (void)size; }
|
||||
void C4JStorage::SaveSubfiles(int (*Func)(void*, const bool), void* param) { if(Func) Func(param, true); }
|
||||
C4JStorage::ESaveGameState C4JStorage::GetSaveState() { return ESaveGame_Idle; }
|
||||
void C4JStorage::ContinueIncompleteOperation() {}
|
||||
353
4J.Storage/4J_Storage.h
Normal file
353
4J.Storage/4J_Storage.h
Normal file
|
|
@ -0,0 +1,353 @@
|
|||
#pragma once
|
||||
|
||||
|
||||
#include <vector>
|
||||
//#include <xtms.h>
|
||||
|
||||
class C4JStringTable;
|
||||
|
||||
#define MAX_DISPLAYNAME_LENGTH 128 // CELL_SAVEDATA_SYSP_SUBTITLE_SIZE on PS3
|
||||
#define MAX_DETAILS_LENGTH 128 // CELL_SAVEDATA_SYSP_SUBTITLE_SIZE on PS3
|
||||
#define MAX_SAVEFILENAME_LENGTH 32 // CELL_SAVEDATA_DIRNAME_SIZE
|
||||
|
||||
typedef struct
|
||||
{
|
||||
time_t modifiedTime;
|
||||
unsigned int dataSize;
|
||||
unsigned int thumbnailSize;
|
||||
}
|
||||
CONTAINER_METADATA;
|
||||
|
||||
typedef struct
|
||||
{
|
||||
char UTF8SaveFilename[MAX_SAVEFILENAME_LENGTH];
|
||||
char UTF8SaveTitle[MAX_DISPLAYNAME_LENGTH];
|
||||
CONTAINER_METADATA metaData;
|
||||
PBYTE thumbnailData;
|
||||
}
|
||||
SAVE_INFO,*PSAVE_INFO;
|
||||
|
||||
typedef struct
|
||||
{
|
||||
int iSaveC;
|
||||
PSAVE_INFO SaveInfoA;
|
||||
}
|
||||
SAVE_DETAILS,*PSAVE_DETAILS;
|
||||
|
||||
typedef std::vector <PXMARKETPLACE_CONTENTOFFER_INFO> OfferDataArray;
|
||||
typedef std::vector <PXCONTENT_DATA> XContentDataArray;
|
||||
//typedef std::vector <PSAVE_DETAILS> SaveDetailsArray;
|
||||
|
||||
// Current version of the dlc data creator
|
||||
#define CURRENT_DLC_VERSION_NUM 3
|
||||
|
||||
class C4JStorage
|
||||
{
|
||||
|
||||
public:
|
||||
// Structs defined in the DLC_Creator, but added here to be used in the app
|
||||
typedef struct
|
||||
{
|
||||
unsigned int uiFileSize;
|
||||
DWORD dwType;
|
||||
DWORD dwWchCount; // count of WCHAR in next array
|
||||
WCHAR wchFile[1];
|
||||
}
|
||||
DLC_FILE_DETAILS, *PDLC_FILE_DETAILS;
|
||||
|
||||
typedef struct
|
||||
{
|
||||
DWORD dwType;
|
||||
DWORD dwWchCount; // count of WCHAR in next array;
|
||||
WCHAR wchData[1]; // will be an array of size dwBytes
|
||||
}
|
||||
DLC_FILE_PARAM, *PDLC_FILE_PARAM;
|
||||
// End of DLC_Creator structs
|
||||
|
||||
typedef struct
|
||||
{
|
||||
WCHAR wchDisplayName[XCONTENT_MAX_DISPLAYNAME_LENGTH];
|
||||
CHAR szFileName[XCONTENT_MAX_FILENAME_LENGTH];
|
||||
DWORD dwImageOffset;
|
||||
DWORD dwImageBytes;
|
||||
}
|
||||
CACHEINFOSTRUCT;
|
||||
|
||||
// structure to hold DLC info in TMS
|
||||
typedef struct
|
||||
{
|
||||
DWORD dwVersion;
|
||||
DWORD dwNewOffers;
|
||||
DWORD dwTotalOffers;
|
||||
DWORD dwInstalledTotalOffers;
|
||||
BYTE bPadding[1024-sizeof(DWORD)*4]; // future expansion
|
||||
}
|
||||
DLC_TMS_DETAILS;
|
||||
|
||||
enum eGTS_FileTypes
|
||||
{
|
||||
eGTS_Type_Skin=0,
|
||||
eGTS_Type_Cape,
|
||||
eGTS_Type_MAX
|
||||
};
|
||||
|
||||
enum eGlobalStorage
|
||||
{
|
||||
//eGlobalStorage_GameClip=0,
|
||||
eGlobalStorage_Title=0,
|
||||
eGlobalStorage_TitleUser,
|
||||
eGlobalStorage_Max
|
||||
};
|
||||
|
||||
enum EMessageResult
|
||||
{
|
||||
EMessage_Undefined=0,
|
||||
EMessage_Busy,
|
||||
EMessage_Pending,
|
||||
EMessage_Cancelled,
|
||||
EMessage_ResultAccept,
|
||||
EMessage_ResultDecline,
|
||||
EMessage_ResultThirdOption,
|
||||
EMessage_ResultFourthOption
|
||||
};
|
||||
|
||||
enum ESaveGameControlState
|
||||
{
|
||||
ESaveGameControl_Idle=0,
|
||||
ESaveGameControl_Save,
|
||||
ESaveGameControl_InternalRequestingDevice,
|
||||
ESaveGameControl_InternalGetSaveName,
|
||||
ESaveGameControl_InternalSaving,
|
||||
ESaveGameControl_CopySave,
|
||||
ESaveGameControl_CopyingSave,
|
||||
};
|
||||
|
||||
enum ESaveGameState
|
||||
{
|
||||
ESaveGame_Idle=0,
|
||||
ESaveGame_Save,
|
||||
ESaveGame_InternalRequestingDevice,
|
||||
ESaveGame_InternalGetSaveName,
|
||||
ESaveGame_InternalSaving,
|
||||
ESaveGame_CopySave,
|
||||
ESaveGame_CopyingSave,
|
||||
ESaveGame_Load,
|
||||
ESaveGame_GetSavesInfo,
|
||||
ESaveGame_Rename,
|
||||
ESaveGame_Delete,
|
||||
|
||||
ESaveGame_GetSaveThumbnail // Not used as an actual state in the PS4, but the game expects this to be returned to indicate success when getting a thumbnail
|
||||
|
||||
};
|
||||
enum ELoadGameStatus
|
||||
{
|
||||
ELoadGame_Idle=0,
|
||||
ELoadGame_InProgress,
|
||||
ELoadGame_NoSaves,
|
||||
ELoadGame_ChangedDevice,
|
||||
ELoadGame_DeviceRemoved
|
||||
};
|
||||
|
||||
enum EDeleteGameStatus
|
||||
{
|
||||
EDeleteGame_Idle=0,
|
||||
EDeleteGame_InProgress,
|
||||
};
|
||||
|
||||
|
||||
enum ESGIStatus
|
||||
{
|
||||
ESGIStatus_Error=0,
|
||||
ESGIStatus_Idle,
|
||||
ESGIStatus_ReadInProgress,
|
||||
ESGIStatus_NoSaves,
|
||||
};
|
||||
|
||||
enum EDLCStatus
|
||||
{
|
||||
EDLC_Error=0,
|
||||
EDLC_Idle,
|
||||
EDLC_NoOffers,
|
||||
EDLC_AlreadyEnumeratedAllOffers,
|
||||
EDLC_NoInstalledDLC,
|
||||
EDLC_Pending,
|
||||
EDLC_LoadInProgress,
|
||||
EDLC_Loaded,
|
||||
EDLC_ChangedDevice
|
||||
};
|
||||
|
||||
enum ESavingMessage
|
||||
{
|
||||
ESavingMessage_None=0,
|
||||
ESavingMessage_Short,
|
||||
ESavingMessage_Long
|
||||
};
|
||||
|
||||
enum ETMSStatus
|
||||
{
|
||||
ETMSStatus_Idle=0,
|
||||
ETMSStatus_Fail,
|
||||
ETMSStatus_Fail_ReadInProgress,
|
||||
ETMSStatus_Fail_WriteInProgress,
|
||||
ETMSStatus_Pending,
|
||||
};
|
||||
|
||||
enum eTMS_FileType
|
||||
{
|
||||
eTMS_FileType_Normal=0,
|
||||
eTMS_FileType_Graphic,
|
||||
};
|
||||
|
||||
enum eTMS_FILETYPEVAL
|
||||
{
|
||||
TMS_FILETYPE_BINARY,
|
||||
TMS_FILETYPE_CONFIG,
|
||||
TMS_FILETYPE_JSON,
|
||||
TMS_FILETYPE_MAX
|
||||
};
|
||||
enum eTMS_UGCTYPE
|
||||
{
|
||||
TMS_UGCTYPE_NONE,
|
||||
TMS_UGCTYPE_IMAGE,
|
||||
TMS_UGCTYPE_MAX
|
||||
};
|
||||
|
||||
|
||||
typedef struct
|
||||
{
|
||||
CHAR szFilename[256];
|
||||
int iFileSize;
|
||||
eTMS_FILETYPEVAL eFileTypeVal;
|
||||
}
|
||||
TMSPP_FILE_DETAILS, *PTMSPP_FILE_DETAILS;
|
||||
|
||||
typedef struct
|
||||
{
|
||||
int iCount;
|
||||
PTMSPP_FILE_DETAILS FileDetailsA;
|
||||
}
|
||||
TMSPP_FILE_LIST, *PTMSPP_FILE_LIST;
|
||||
|
||||
typedef struct
|
||||
{
|
||||
DWORD dwSize;
|
||||
PBYTE pbData;
|
||||
}
|
||||
TMSPP_FILEDATA, *PTMSPP_FILEDATA;
|
||||
|
||||
|
||||
C4JStorage();
|
||||
|
||||
void Tick(void);
|
||||
|
||||
// Messages
|
||||
C4JStorage::EMessageResult RequestMessageBox(UINT uiTitle, UINT uiText, UINT *uiOptionA,UINT uiOptionC, DWORD dwPad=XUSER_INDEX_ANY,
|
||||
int( *Func)(LPVOID,int,const C4JStorage::EMessageResult)=NULL,LPVOID lpParam=NULL, C4JStringTable *pStringTable=NULL, WCHAR *pwchFormatString=NULL,DWORD dwFocusButton=0);
|
||||
|
||||
|
||||
C4JStorage::EMessageResult GetMessageBoxResult();
|
||||
|
||||
// save device
|
||||
bool SetSaveDevice(int( *Func)(LPVOID,const bool),LPVOID lpParam, bool bForceResetOfSaveDevice=false);
|
||||
|
||||
// savegame
|
||||
void Init(unsigned int uiSaveVersion,LPCWSTR pwchDefaultSaveName,char *pszSavePackName,int iMinimumSaveSize,int( *Func)(LPVOID, const ESavingMessage, int),LPVOID lpParam,LPCSTR szGroupID);
|
||||
void ResetSaveData(); // Call before a new save to clear out stored save file name
|
||||
void SetDefaultSaveNameForKeyboardDisplay(LPCWSTR pwchDefaultSaveName);
|
||||
void SetSaveTitle(LPCWSTR pwchDefaultSaveName);
|
||||
bool GetSaveUniqueNumber(INT *piVal);
|
||||
bool GetSaveUniqueFilename(char *pszName);
|
||||
void SetSaveUniqueFilename(char *szFilename);
|
||||
void SetState(ESaveGameControlState eControlState,int( *Func)(LPVOID,const bool),LPVOID lpParam);
|
||||
void SetSaveDisabled(bool bDisable);
|
||||
bool GetSaveDisabled(void);
|
||||
unsigned int GetSaveSize();
|
||||
void GetSaveData(void *pvData,unsigned int *puiBytes);
|
||||
PVOID AllocateSaveData(unsigned int uiBytes);
|
||||
void SetSaveImages( PBYTE pbThumbnail,DWORD dwThumbnailBytes,PBYTE pbImage,DWORD dwImageBytes, PBYTE pbTextData ,DWORD dwTextDataBytes); // Sets the thumbnail & image for the save, optionally setting the metadata in the png
|
||||
C4JStorage::ESaveGameState SaveSaveData(int( *Func)(LPVOID ,const bool),LPVOID lpParam);
|
||||
void CopySaveDataToNewSave(PBYTE pbThumbnail,DWORD cbThumbnail,WCHAR *wchNewName,int ( *Func)(LPVOID lpParam, bool), LPVOID lpParam);
|
||||
void SetSaveDeviceSelected(unsigned int uiPad,bool bSelected);
|
||||
bool GetSaveDeviceSelected(unsigned int iPad);
|
||||
C4JStorage::ESaveGameState DoesSaveExist(bool *pbExists);
|
||||
bool EnoughSpaceForAMinSaveGame();
|
||||
|
||||
void SetSaveMessageVPosition(float fY); // The 'Saving' message will display at a default position unless changed
|
||||
// Get the info for the saves
|
||||
C4JStorage::ESaveGameState GetSavesInfo(int iPad,int ( *Func)(LPVOID lpParam,SAVE_DETAILS *pSaveDetails,const bool),LPVOID lpParam,char *pszSavePackName);
|
||||
PSAVE_DETAILS ReturnSavesInfo();
|
||||
void ClearSavesInfo(); // Clears results
|
||||
C4JStorage::ESaveGameState LoadSaveDataThumbnail(PSAVE_INFO pSaveInfo,int( *Func)(LPVOID lpParam,PBYTE pbThumbnail,DWORD dwThumbnailBytes), LPVOID lpParam); // Get the thumbnail for an individual save referenced by pSaveInfo
|
||||
|
||||
void GetSaveCacheFileInfo(DWORD dwFile,XCONTENT_DATA &xContentData);
|
||||
void GetSaveCacheFileInfo(DWORD dwFile, PBYTE *ppbImageData, DWORD *pdwImageBytes);
|
||||
|
||||
// Load the save. Need to call GetSaveData once the callback is called
|
||||
C4JStorage::ESaveGameState LoadSaveData(PSAVE_INFO pSaveInfo,int( *Func)(LPVOID lpParam,const bool, const bool), LPVOID lpParam);
|
||||
C4JStorage::ESaveGameState DeleteSaveData(PSAVE_INFO pSaveInfo,int( *Func)(LPVOID lpParam,const bool), LPVOID lpParam);
|
||||
|
||||
// DLC
|
||||
void RegisterMarketplaceCountsCallback(int ( *Func)(LPVOID lpParam, C4JStorage::DLC_TMS_DETAILS *, int), LPVOID lpParam );
|
||||
void SetDLCPackageRoot(char *pszDLCRoot);
|
||||
C4JStorage::EDLCStatus GetDLCOffers(int iPad,int( *Func)(LPVOID, int, DWORD, int),LPVOID lpParam, DWORD dwOfferTypesBitmask=XMARKETPLACE_OFFERING_TYPE_CONTENT);
|
||||
DWORD CancelGetDLCOffers();
|
||||
void ClearDLCOffers();
|
||||
XMARKETPLACE_CONTENTOFFER_INFO& GetOffer(DWORD dw);
|
||||
int GetOfferCount();
|
||||
DWORD InstallOffer(int iOfferIDC, __uint64 *ullOfferIDA,int( *Func)(LPVOID, int, int),LPVOID lpParam, bool bTrial=false);
|
||||
DWORD GetAvailableDLCCount( int iPad);
|
||||
|
||||
C4JStorage::EDLCStatus GetInstalledDLC(int iPad,int( *Func)(LPVOID, int, int),LPVOID lpParam);
|
||||
XCONTENT_DATA& GetDLC(DWORD dw);
|
||||
DWORD MountInstalledDLC(int iPad,DWORD dwDLC,int( *Func)(LPVOID, int, DWORD,DWORD),LPVOID lpParam,LPCSTR szMountDrive=NULL);
|
||||
DWORD UnmountInstalledDLC(LPCSTR szMountDrive = NULL);
|
||||
void GetMountedDLCFileList(const char* szMountDrive, std::vector<std::string>& fileList);
|
||||
std::string GetMountedPath(std::string szMount);
|
||||
|
||||
// Global title storage
|
||||
C4JStorage::ETMSStatus ReadTMSFile(int iQuadrant,eGlobalStorage eStorageFacility,C4JStorage::eTMS_FileType eFileType,
|
||||
WCHAR *pwchFilename,BYTE **ppBuffer,DWORD *pdwBufferSize,int( *Func)(LPVOID, WCHAR *,int, bool, int)=NULL,LPVOID lpParam=NULL, int iAction=0);
|
||||
bool WriteTMSFile(int iQuadrant,eGlobalStorage eStorageFacility,WCHAR *pwchFilename,BYTE *pBuffer,DWORD dwBufferSize);
|
||||
bool DeleteTMSFile(int iQuadrant,eGlobalStorage eStorageFacility,WCHAR *pwchFilename);
|
||||
void StoreTMSPathName(WCHAR *pwchName=NULL);
|
||||
|
||||
// TMS++
|
||||
#ifdef _XBOX
|
||||
C4JStorage::ETMSStatus WriteTMSFile(int iPad,C4JStorage::eGlobalStorage eStorageFacility,C4JStorage::eTMS_FileType eFileType,CHAR *pchFilePath,CHAR *pchBuffer,DWORD dwBufferSize,TMSCLIENT_CALLBACK Func,LPVOID lpParam);
|
||||
HRESULT GetUserQuotaInfo(int iPad,TMSCLIENT_CALLBACK Func,LPVOID lpParam);
|
||||
#endif
|
||||
|
||||
// C4JStorage::ETMSStatus TMSPP_WriteFile(int iPad,C4JStorage::eGlobalStorage eStorageFacility,C4JStorage::eTMS_FILETYPEVAL eFileTypeVal,C4JStorage::eTMS_UGCTYPE eUGCType,CHAR *pchFilePath,CHAR *pchBuffer,DWORD dwBufferSize,int( *Func)(LPVOID,int,int)=NULL,LPVOID lpParam=NULL, int iUserData=0);
|
||||
// C4JStorage::ETMSStatus TMSPP_GetUserQuotaInfo(int iPad,TMSCLIENT_CALLBACK Func,LPVOID lpParam, int iUserData=0);
|
||||
C4JStorage::ETMSStatus TMSPP_ReadFile(int iPad,C4JStorage::eGlobalStorage eStorageFacility,C4JStorage::eTMS_FILETYPEVAL eFileTypeVal,LPCSTR szFilename,int( *Func)(LPVOID,int,int,PTMSPP_FILEDATA, LPCSTR)=NULL,LPVOID lpParam=NULL, int iUserData=0);
|
||||
// C4JStorage::ETMSStatus TMSPP_ReadFileList(int iPad,C4JStorage::eGlobalStorage eStorageFacility,CHAR *pchFilePath,int( *Func)(LPVOID,int,int,PTMSPP_FILE_LIST)=NULL,LPVOID lpParam=NULL, int iUserData=0);
|
||||
// C4JStorage::ETMSStatus TMSPP_DeleteFile(int iPad,LPCSTR szFilePath,C4JStorage::eTMS_FILETYPEVAL eFileTypeVal,int( *Func)(LPVOID,int,int),LPVOID lpParam=NULL, int iUserData=0);
|
||||
// bool TMSPP_InFileList(eGlobalStorage eStorageFacility, int iPad,const wstring &Filename);
|
||||
// unsigned int CRC(unsigned char *buf, int len);
|
||||
|
||||
// enum eXBLWS
|
||||
// {
|
||||
// eXBLWS_GET,
|
||||
// eXBLWS_POST,
|
||||
// eXBLWS_PUT,
|
||||
// eXBLWS_DELETE,
|
||||
// };
|
||||
//bool XBLWS_Command(eXBLWS eCommand);
|
||||
|
||||
|
||||
unsigned int CRC(unsigned char *buf, int len);
|
||||
|
||||
int AddSubfile(int regionIndex);
|
||||
unsigned int GetSubfileCount();
|
||||
void GetSubfileDetails(unsigned int i, int* regionIndex, void** data, unsigned int* size);
|
||||
void ResetSubfiles();
|
||||
void UpdateSubfile(int index, void* data, unsigned int size);
|
||||
void SaveSubfiles(int (*Func)(void*, const bool), void* param);
|
||||
ESaveGameState GetSaveState();
|
||||
|
||||
void ContinueIncompleteOperation();
|
||||
|
||||
C4JStringTable *m_pStringTable;
|
||||
};
|
||||
|
||||
extern C4JStorage StorageManager;
|
||||
21
4J.Storage/CMakeLists.txt
Normal file
21
4J.Storage/CMakeLists.txt
Normal file
|
|
@ -0,0 +1,21 @@
|
|||
cmake_minimum_required(VERSION 3.16.0 FATAL_ERROR)
|
||||
project(4J_Storage CXX)
|
||||
|
||||
add_library(${PROJECT_NAME})
|
||||
target_sources(${PROJECT_NAME}
|
||||
PRIVATE
|
||||
4J_Storage.cpp
|
||||
STO_DLC.cpp
|
||||
STO_Main.cpp
|
||||
STO_SaveGame.cpp
|
||||
stdafx.cpp
|
||||
)
|
||||
target_include_directories(${PROJECT_NAME}
|
||||
PRIVATE
|
||||
${CMAKE_CURRENT_SOURCE_DIR}
|
||||
)
|
||||
|
||||
# Mimic cmake converter behaviour
|
||||
target_precompile_headers(${PROJECT_NAME} PRIVATE
|
||||
"$<$<COMPILE_LANGUAGE:CXX>:${CMAKE_CURRENT_SOURCE_DIR}/stdafx.h>"
|
||||
)
|
||||
0
4J.Storage/STO_DLC.cpp
Normal file
0
4J.Storage/STO_DLC.cpp
Normal file
0
4J.Storage/STO_Main.cpp
Normal file
0
4J.Storage/STO_Main.cpp
Normal file
0
4J.Storage/STO_SaveGame.cpp
Normal file
0
4J.Storage/STO_SaveGame.cpp
Normal file
1
4J.Storage/stdafx.cpp
Normal file
1
4J.Storage/stdafx.cpp
Normal file
|
|
@ -0,0 +1 @@
|
|||
#include "stdafx.h"
|
||||
10
4J.Storage/stdafx.h
Normal file
10
4J.Storage/stdafx.h
Normal file
|
|
@ -0,0 +1,10 @@
|
|||
#ifndef _4J_STORAGE_STADAFX_H
|
||||
#define _4J_STORAGE_STADAFX_H
|
||||
|
||||
#ifdef __linux__
|
||||
#include "../Minecraft.Client/Platform/Linux/Stubs/LinuxStubs.h"
|
||||
#endif
|
||||
|
||||
#include "../Minecraft.World/Build/x64headers/extraX64.h"
|
||||
|
||||
#endif //_4J_STORAGE_STADAFX_H
|
||||
|
|
@ -104,6 +104,10 @@ set_property(GLOBAL PROPERTY USE_FOLDERS ON)
|
|||
################################################################################
|
||||
# Sub-projects
|
||||
################################################################################
|
||||
add_subdirectory(4J.Input)
|
||||
add_subdirectory(4J.Profile)
|
||||
add_subdirectory(4J.Render)
|
||||
add_subdirectory(4J.Storage)
|
||||
add_subdirectory(Minecraft.Client/Build Minecraft.Client)
|
||||
add_subdirectory(Minecraft.World/Build Minecraft.World)
|
||||
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ source_group("Common\\Source Files" FILES ${Common__Source_Files})
|
|||
set(Common__Source_Files__Audio
|
||||
"Common/Audio/Consoles_SoundEngine.cpp"
|
||||
"Common/Audio/Consoles_SoundEngine.h"
|
||||
# "Common/Audio/SoundEngine.cpp"
|
||||
"Common/Audio/SoundEngine.cpp"
|
||||
"Common/Audio/SoundEngine.h"
|
||||
"Common/Audio/SoundNames.cpp"
|
||||
)
|
||||
|
|
@ -175,8 +175,8 @@ set(Common__Source_Files__Network
|
|||
"Common/Network/GameNetworkManager.h"
|
||||
"Common/Network/NetworkPlayerInterface.h"
|
||||
"Common/Network/PlatformNetworkManagerInterface.h"
|
||||
# "Common/Network/PlatformNetworkManagerStub.cpp"
|
||||
# "Common/Network/PlatformNetworkManagerStub.h"
|
||||
"Common/Network/PlatformNetworkManagerStub.cpp"
|
||||
"Common/Network/PlatformNetworkManagerStub.h"
|
||||
"Common/Network/SessionInfo.h"
|
||||
"../Network Implementation Notes.txt"
|
||||
)
|
||||
|
|
@ -418,8 +418,8 @@ set(Common__Source_Files__UI__Controls
|
|||
"Common/UI/UIControl_TextInput.h"
|
||||
"Common/UI/UIControl_TexturePackList.cpp"
|
||||
"Common/UI/UIControl_TexturePackList.h"
|
||||
# "Common/UI/UIControl_Touch.cpp"
|
||||
# "Common/UI/UIControl_Touch.h"
|
||||
"Common/UI/UIControl_Touch.cpp"
|
||||
"Common/UI/UIControl_Touch.h"
|
||||
)
|
||||
source_group("Common\\Source Files\\UI\\Controls" FILES ${Common__Source_Files__UI__Controls})
|
||||
|
||||
|
|
@ -526,8 +526,8 @@ set(Common__Source_Files__UI__Scenes__In-Game_Menu_Screens
|
|||
"Common/UI/UIScene_InGameInfoMenu.h"
|
||||
"Common/UI/UIScene_InGamePlayerOptionsMenu.cpp"
|
||||
"Common/UI/UIScene_InGamePlayerOptionsMenu.h"
|
||||
# "Common/UI/UIScene_InGameSaveManagementMenu.cpp"
|
||||
# "Common/UI/UIScene_InGameSaveManagementMenu.h"
|
||||
"Common/UI/UIScene_InGameSaveManagementMenu.cpp"
|
||||
"Common/UI/UIScene_InGameSaveManagementMenu.h"
|
||||
"Common/UI/UIScene_PauseMenu.cpp"
|
||||
"Common/UI/UIScene_PauseMenu.h"
|
||||
"Common/UI/UIScene_SignEntryMenu.cpp"
|
||||
|
|
@ -1104,6 +1104,8 @@ set(Linux
|
|||
"../Platform/Linux/Linux_UIController.cpp"
|
||||
"../Platform/Linux/Linux_Minecraft.cpp"
|
||||
"../Platform/Linux/Linux_App.cpp"
|
||||
"../Platform/Linux/LinuxGL.cpp"
|
||||
"../Platform/Linux/linux_game_stubs.cpp"
|
||||
)
|
||||
source_group("Linux" FILES ${Linux})
|
||||
|
||||
|
|
@ -5216,3 +5218,32 @@ endif()
|
|||
add_compile_options(-fpermissive -Wtemplate-body)
|
||||
target_link_libraries(${PROJECT_NAME} PRIVATE "${ADDITIONAL_LIBRARY_DEPENDENCIES}")
|
||||
target_link_libraries(${PROJECT_NAME} PRIVATE Minecraft.World)
|
||||
|
||||
if(UNIX AND NOT APPLE)
|
||||
find_package(OpenGL REQUIRED)
|
||||
find_package(PkgConfig REQUIRED)
|
||||
pkg_check_modules(GLFW3 REQUIRED glfw3)
|
||||
|
||||
target_include_directories(${PROJECT_NAME} PRIVATE
|
||||
${GLFW3_INCLUDE_DIRS}
|
||||
${CMAKE_SOURCE_DIR}/4J.Input
|
||||
${CMAKE_SOURCE_DIR}/4J.Profile
|
||||
${CMAKE_SOURCE_DIR}/4J.Render
|
||||
${CMAKE_SOURCE_DIR}/4J.Storage
|
||||
)
|
||||
|
||||
target_link_libraries(${PROJECT_NAME} PRIVATE
|
||||
Minecraft.World
|
||||
OpenGL::GL
|
||||
GLU
|
||||
${GLFW3_LIBRARIES}
|
||||
4J_Input
|
||||
4J_Profile
|
||||
4J_Render
|
||||
4J_Storage
|
||||
pthread
|
||||
dl
|
||||
)
|
||||
|
||||
target_compile_definitions(${PROJECT_NAME} PRIVATE __linux__)
|
||||
endif()
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@
|
|||
#endif
|
||||
|
||||
// take out Orbis until they are done
|
||||
#if defined _XBOX
|
||||
#if defined _XBOX || defined(__linux__)
|
||||
|
||||
SoundEngine::SoundEngine() {}
|
||||
void SoundEngine::init(Options *pOptions)
|
||||
|
|
@ -52,6 +52,13 @@ void SoundEngine::addStreaming(const wstring& name, File *file) {}
|
|||
char *SoundEngine::ConvertSoundPathToName(const wstring& name, bool bConvertSpaces) { return NULL; }
|
||||
bool SoundEngine::isStreamingWavebankReady() { return true; }
|
||||
void SoundEngine::playMusicTick() {};
|
||||
void SoundEngine::SetStreamingSounds(int, int, int, int, int, int, int) {}
|
||||
void SoundEngine::updateSystemMusicPlaying(bool) {}
|
||||
#ifdef __linux__
|
||||
char SoundEngine::m_szSoundPath[]={"Sound/"};
|
||||
char SoundEngine::m_szMusicPath[]={"music/"};
|
||||
char SoundEngine::m_szRedistName[]={"redist64"};
|
||||
#endif
|
||||
|
||||
#else
|
||||
|
||||
|
|
@ -95,6 +102,8 @@ char SoundEngine::m_szRedistName[]={"redist"};
|
|||
|
||||
#endif
|
||||
|
||||
#ifndef __linux__
|
||||
|
||||
F32 AILCALLBACK custom_falloff_function (HSAMPLE S,
|
||||
F32 distance,
|
||||
F32 rolloff_factor,
|
||||
|
|
@ -1666,3 +1675,5 @@ F32 AILCALLBACK custom_falloff_function (HSAMPLE S,
|
|||
|
||||
return result;
|
||||
}
|
||||
|
||||
#endif
|
||||
File diff suppressed because it is too large
Load diff
|
|
@ -7,6 +7,25 @@
|
|||
#include "../../../Minecraft.h"
|
||||
#include "../../../Textures/Packs/TexturePackRepository.h"
|
||||
|
||||
#ifdef __linux__
|
||||
#include <stdint.h>
|
||||
static const size_t DLC_WCHAR_BINARY = 2;
|
||||
static wstring dlc_read_wstring(const void *data)
|
||||
{
|
||||
const uint16_t *p = (const uint16_t *)data;
|
||||
wstring s;
|
||||
while (*p) s += (wchar_t)*p++;
|
||||
return s;
|
||||
}
|
||||
#define DLC_WSTRING(ptr) dlc_read_wstring(ptr)
|
||||
#define DLC_PARAM_ADV(n) (sizeof(C4JStorage::DLC_FILE_PARAM) + (n) * DLC_WCHAR_BINARY)
|
||||
#define DLC_DETAIL_ADV(n) (sizeof(C4JStorage::DLC_FILE_DETAILS) + (n) * DLC_WCHAR_BINARY)
|
||||
#else
|
||||
#define DLC_WSTRING(ptr) wstring((WCHAR *)(ptr))
|
||||
#define DLC_PARAM_ADV(n) (sizeof(C4JStorage::DLC_FILE_PARAM) + sizeof(WCHAR) * (n))
|
||||
#define DLC_DETAIL_ADV(n) (sizeof(C4JStorage::DLC_FILE_DETAILS) + sizeof(WCHAR) * (n))
|
||||
#endif
|
||||
|
||||
const WCHAR *DLCManager::wchTypeNamesA[]=
|
||||
{
|
||||
L"DISPLAYNAME",
|
||||
|
|
@ -282,6 +301,7 @@ DWORD DLCManager::checkForCorruptDLCAndAlert(bool showMessage /*= true*/)
|
|||
}
|
||||
}
|
||||
|
||||
// gotta fix this someday
|
||||
if(corruptDLCCount > 0 && showMessage)
|
||||
{
|
||||
UINT uiIDA[1];
|
||||
|
|
@ -398,13 +418,13 @@ bool DLCManager::processDLCDataFile(DWORD &dwFilesProcessed, PBYTE pbData, DWORD
|
|||
for(unsigned int i=0;i<uiParameterCount;i++)
|
||||
{
|
||||
// Map DLC strings to application strings, then store the DLC index mapping to application index
|
||||
wstring parameterName((WCHAR *)pParams->wchData);
|
||||
wstring parameterName = DLC_WSTRING(pParams->wchData);
|
||||
DLCManager::EDLCParameterType type = DLCManager::getParameterType(parameterName);
|
||||
if( type != DLCManager::e_DLCParamType_Invalid )
|
||||
{
|
||||
parameterMapping[pParams->dwType] = type;
|
||||
}
|
||||
uiCurrentByte+= sizeof(C4JStorage::DLC_FILE_PARAM)+(pParams->dwWchCount*sizeof(WCHAR));
|
||||
uiCurrentByte+= DLC_PARAM_ADV(pParams->dwWchCount);
|
||||
pParams = (C4JStorage::DLC_FILE_PARAM *)&pbData[uiCurrentByte];
|
||||
}
|
||||
//ulCurrentByte+=ulParameterCount * sizeof(C4JStorage::DLC_FILE_PARAM);
|
||||
|
|
@ -416,7 +436,7 @@ bool DLCManager::processDLCDataFile(DWORD &dwFilesProcessed, PBYTE pbData, DWORD
|
|||
DWORD dwTemp=uiCurrentByte;
|
||||
for(unsigned int i=0;i<uiFileCount;i++)
|
||||
{
|
||||
dwTemp+=sizeof(C4JStorage::DLC_FILE_DETAILS)+pFile->dwWchCount*sizeof(WCHAR);
|
||||
dwTemp+=DLC_DETAIL_ADV(pFile->dwWchCount);
|
||||
pFile = (C4JStorage::DLC_FILE_DETAILS *)&pbData[dwTemp];
|
||||
}
|
||||
PBYTE pbTemp=((PBYTE )pFile);//+ sizeof(C4JStorage::DLC_FILE_DETAILS)*ulFileCount;
|
||||
|
|
@ -435,7 +455,7 @@ bool DLCManager::processDLCDataFile(DWORD &dwFilesProcessed, PBYTE pbData, DWORD
|
|||
}
|
||||
else if(type != e_DLCType_PackConfig)
|
||||
{
|
||||
dlcFile = pack->addFile(type,(WCHAR *)pFile->wchFile);
|
||||
dlcFile = pack->addFile(type, DLC_WSTRING(pFile->wchFile));
|
||||
}
|
||||
|
||||
// Params
|
||||
|
|
@ -452,15 +472,15 @@ bool DLCManager::processDLCDataFile(DWORD &dwFilesProcessed, PBYTE pbData, DWORD
|
|||
{
|
||||
if(type == e_DLCType_PackConfig)
|
||||
{
|
||||
pack->addParameter(it->second,(WCHAR *)pParams->wchData);
|
||||
pack->addParameter(it->second, DLC_WSTRING(pParams->wchData));
|
||||
}
|
||||
else
|
||||
{
|
||||
if(dlcFile != NULL) dlcFile->addParameter(it->second,(WCHAR *)pParams->wchData);
|
||||
else if(dlcTexturePack != NULL) dlcTexturePack->addParameter(it->second, (WCHAR *)pParams->wchData);
|
||||
if(dlcFile != NULL) dlcFile->addParameter(it->second, DLC_WSTRING(pParams->wchData));
|
||||
else if(dlcTexturePack != NULL) dlcTexturePack->addParameter(it->second, DLC_WSTRING(pParams->wchData));
|
||||
}
|
||||
}
|
||||
pbTemp+=sizeof(C4JStorage::DLC_FILE_PARAM)+(sizeof(WCHAR)*pParams->dwWchCount);
|
||||
pbTemp+=DLC_PARAM_ADV(pParams->dwWchCount);
|
||||
pParams = (C4JStorage::DLC_FILE_PARAM *)pbTemp;
|
||||
}
|
||||
//pbTemp+=ulParameterCount * sizeof(C4JStorage::DLC_FILE_PARAM);
|
||||
|
|
@ -495,7 +515,7 @@ bool DLCManager::processDLCDataFile(DWORD &dwFilesProcessed, PBYTE pbData, DWORD
|
|||
switch(pFile->dwType)
|
||||
{
|
||||
case DLCManager::e_DLCType_Skin:
|
||||
app.vSkinNames.push_back((WCHAR *)pFile->wchFile);
|
||||
app.vSkinNames.push_back(DLC_WSTRING(pFile->wchFile));
|
||||
break;
|
||||
}
|
||||
|
||||
|
|
@ -504,7 +524,7 @@ bool DLCManager::processDLCDataFile(DWORD &dwFilesProcessed, PBYTE pbData, DWORD
|
|||
|
||||
// Move the pointer to the start of the next files data;
|
||||
pbTemp+=pFile->uiFileSize;
|
||||
uiCurrentByte+=sizeof(C4JStorage::DLC_FILE_DETAILS)+pFile->dwWchCount*sizeof(WCHAR);
|
||||
uiCurrentByte+=DLC_DETAIL_ADV(pFile->dwWchCount);
|
||||
|
||||
pFile=(C4JStorage::DLC_FILE_DETAILS *)&pbData[uiCurrentByte];
|
||||
}
|
||||
|
|
@ -603,13 +623,13 @@ DWORD DLCManager::retrievePackID(PBYTE pbData, DWORD dwLength, DLCPack *pack)
|
|||
for(unsigned int i=0;i<uiParameterCount;i++)
|
||||
{
|
||||
// Map DLC strings to application strings, then store the DLC index mapping to application index
|
||||
wstring parameterName((WCHAR *)pParams->wchData);
|
||||
wstring parameterName = DLC_WSTRING(pParams->wchData);
|
||||
DLCManager::EDLCParameterType type = DLCManager::getParameterType(parameterName);
|
||||
if( type != DLCManager::e_DLCParamType_Invalid )
|
||||
{
|
||||
parameterMapping[pParams->dwType] = type;
|
||||
}
|
||||
uiCurrentByte+= sizeof(C4JStorage::DLC_FILE_PARAM)+(pParams->dwWchCount*sizeof(WCHAR));
|
||||
uiCurrentByte+= DLC_PARAM_ADV(pParams->dwWchCount);
|
||||
pParams = (C4JStorage::DLC_FILE_PARAM *)&pbData[uiCurrentByte];
|
||||
}
|
||||
|
||||
|
|
@ -620,7 +640,7 @@ DWORD DLCManager::retrievePackID(PBYTE pbData, DWORD dwLength, DLCPack *pack)
|
|||
DWORD dwTemp=uiCurrentByte;
|
||||
for(unsigned int i=0;i<uiFileCount;i++)
|
||||
{
|
||||
dwTemp+=sizeof(C4JStorage::DLC_FILE_DETAILS)+pFile->dwWchCount*sizeof(WCHAR);
|
||||
dwTemp+=DLC_DETAIL_ADV(pFile->dwWchCount);
|
||||
pFile = (C4JStorage::DLC_FILE_DETAILS *)&pbData[dwTemp];
|
||||
}
|
||||
PBYTE pbTemp=((PBYTE )pFile);
|
||||
|
|
@ -644,7 +664,7 @@ DWORD DLCManager::retrievePackID(PBYTE pbData, DWORD dwLength, DLCPack *pack)
|
|||
{
|
||||
if(it->second==e_DLCParamType_PackId)
|
||||
{
|
||||
wstring wsTemp=(WCHAR *)pParams->wchData;
|
||||
wstring wsTemp = DLC_WSTRING(pParams->wchData);
|
||||
std::wstringstream ss;
|
||||
// 4J Stu - numbered using decimal to make it easier for artists/people to number manually
|
||||
ss << std::dec << wsTemp.c_str();
|
||||
|
|
@ -654,14 +674,14 @@ DWORD DLCManager::retrievePackID(PBYTE pbData, DWORD dwLength, DLCPack *pack)
|
|||
}
|
||||
}
|
||||
}
|
||||
pbTemp+=sizeof(C4JStorage::DLC_FILE_PARAM)+(sizeof(WCHAR)*pParams->dwWchCount);
|
||||
pbTemp+=DLC_PARAM_ADV(pParams->dwWchCount);
|
||||
pParams = (C4JStorage::DLC_FILE_PARAM *)pbTemp;
|
||||
}
|
||||
|
||||
if(bPackIDSet) break;
|
||||
// Move the pointer to the start of the next files data;
|
||||
pbTemp+=pFile->uiFileSize;
|
||||
uiCurrentByte+=sizeof(C4JStorage::DLC_FILE_DETAILS)+pFile->dwWchCount*sizeof(WCHAR);
|
||||
uiCurrentByte+=DLC_DETAIL_ADV(pFile->dwWchCount);
|
||||
|
||||
pFile=(C4JStorage::DLC_FILE_DETAILS *)&pbData[uiCurrentByte];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,6 @@
|
|||
#include "../../../../Minecraft.World/Build/stdafx.h"
|
||||
#include <iterator>
|
||||
#include <sstream>
|
||||
#include "UI.h"
|
||||
#include "UIControl_EnchantmentButton.h"
|
||||
#include "../../../../Minecraft.World/Headers/net.minecraft.world.inventory.h"
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ void UIControl_Touch::init(int iId)
|
|||
{
|
||||
m_id = iId;
|
||||
|
||||
// 4J-TomK - add this touch control to the vita touch box list
|
||||
#if !defined(__linux__)
|
||||
switch(m_parentScene->GetParentLayer()->m_iLayer)
|
||||
{
|
||||
case eUILayer_Error:
|
||||
|
|
@ -28,6 +28,7 @@ void UIControl_Touch::init(int iId)
|
|||
ui.TouchBoxAdd(this,m_parentScene);
|
||||
break;
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
void UIControl_Touch::ReInit()
|
||||
|
|
|
|||
|
|
@ -1285,7 +1285,6 @@ void UIController::setupCustomDrawGameStateAndMatrices(UIScene *scene, CustomDra
|
|||
void UIController::endCustomDrawGameState()
|
||||
{
|
||||
#if defined(__ORBIS__) || defined(__linux__)
|
||||
// TO BE IMPLEMENTED
|
||||
RenderManager.Clear(GL_DEPTH_BUFFER_BIT);
|
||||
#else
|
||||
RenderManager.Clear(GL_DEPTH_BUFFER_BIT, &m_customRenderingClearRect);
|
||||
|
|
@ -2506,7 +2505,6 @@ C4JStorage::EMessageResult UIController::RequestContentRestrictedMessageBox(UINT
|
|||
if (message == -1)
|
||||
{
|
||||
#if defined(_XBOX_ONE) || defined(_WINDOWS64) || defined(__linux__)
|
||||
// IDS_CONTENT_RESTRICTION doesn't exist on XB1
|
||||
message = IDS_NO_USER_CREATED_CONTENT_PRIVILEGE_CREATE;
|
||||
#else
|
||||
message = IDS_CONTENT_RESTRICTION;
|
||||
|
|
|
|||
|
|
@ -190,7 +190,9 @@ void UIScene_InGameSaveManagementMenu::tick()
|
|||
{
|
||||
if(m_bUpdateSaveSize)
|
||||
{
|
||||
#if defined(_XBOX_ONE) || defined(__ORBIS__)
|
||||
m_spaceIndicatorSaves.selectSave(m_iSaveListIndex);
|
||||
#endif
|
||||
m_bUpdateSaveSize = false;
|
||||
}
|
||||
|
||||
|
|
@ -200,7 +202,9 @@ void UIScene_InGameSaveManagementMenu::tick()
|
|||
m_pSaveDetails=StorageManager.ReturnSavesInfo();
|
||||
if(m_pSaveDetails!=NULL)
|
||||
{
|
||||
#if defined(_XBOX_ONE) || defined(__ORBIS__)
|
||||
m_spaceIndicatorSaves.reset();
|
||||
#endif
|
||||
|
||||
m_bSavesDisplayed=true;
|
||||
|
||||
|
|
@ -286,6 +290,8 @@ void UIScene_InGameSaveManagementMenu::tick()
|
|||
(wchar_t *)u16Message, // destination buffer
|
||||
MAX_SAVEFILENAME_LENGTH // size of destination buffer, in WCHAR's
|
||||
);
|
||||
#elif defined(__linux__)
|
||||
mbstowcs((wchar_t *)u16Message, m_saveDetails[m_iRequestingThumbnailId].UTF8SaveFilename, MAX_SAVEFILENAME_LENGTH);
|
||||
#else
|
||||
#ifdef __PS3
|
||||
size_t srcmax,dstmax;
|
||||
|
|
|
|||
|
|
@ -30,6 +30,8 @@ UIScene_Intro::UIScene_Intro(int iPad, void *initData, UILayer *parentLayer) : U
|
|||
int platformIdx = 4;
|
||||
#elif defined(__PSVITA__)
|
||||
int platformIdx = 5;
|
||||
#elif defined(__linux__)
|
||||
int platformIdx = 0;
|
||||
#endif
|
||||
|
||||
IggyDataValue result;
|
||||
|
|
|
|||
|
|
@ -256,7 +256,7 @@ HRESULT XMemDecompress(
|
|||
XMEMDECOMPRESSION_CONTEXT Context,
|
||||
VOID *pDestination,
|
||||
SIZE_T *pDestSize,
|
||||
CONST VOID *pSource,
|
||||
VOID *pSource,
|
||||
SIZE_T SrcSize
|
||||
)
|
||||
{
|
||||
|
|
@ -287,7 +287,7 @@ HRESULT XMemCompress(
|
|||
XMEMCOMPRESSION_CONTEXT Context,
|
||||
VOID *pDestination,
|
||||
SIZE_T *pDestSize,
|
||||
CONST VOID *pSource,
|
||||
VOID *pSource,
|
||||
SIZE_T SrcSize
|
||||
)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -188,11 +188,10 @@ typedef XUID GameSessionUID;
|
|||
#include "../Platform/Windows64/4JLibs/inc/4J_Render.h"
|
||||
#include "../Platform/Windows64/4JLibs/inc/4J_Storage.h"
|
||||
#elif defined __linux__
|
||||
// draw the rest of the owl
|
||||
#include "../Platform/Windows64/4JLibs/inc/4J_Input.h"
|
||||
#include "../Platform/Windows64/4JLibs/inc/4J_Profile.h"
|
||||
#include "../Platform/Windows64/4JLibs/inc/4J_Render.h"
|
||||
#include "../Platform/Windows64/4JLibs/inc/4J_Storage.h"
|
||||
#include "../../4J.Input/4J_Input.h"
|
||||
#include "../../4J.Profile/4J_Profile.h"
|
||||
#include "../../4J.Render/4J_Render.h"
|
||||
#include "../../4J.Storage/4J_Storage.h"
|
||||
#elif defined __PSVITA__
|
||||
#include "../Platform/PSVita/4JLibs/inc/4J_Input.h"
|
||||
#include "../Platform/PSVita/4JLibs/inc/4J_Profile.h"
|
||||
|
|
|
|||
|
|
@ -1,5 +1,7 @@
|
|||
#include "stdafx.h"
|
||||
|
||||
#ifndef __linux__
|
||||
|
||||
void glReadPixels(int,int, int, int, int, int, ByteBuffer *)
|
||||
{
|
||||
}
|
||||
|
|
@ -116,4 +118,6 @@ DWORD XCamSetView(
|
|||
) { return 0; }
|
||||
|
||||
XCAMDEVICESTATE XCamGetStatus() { return XCAMDEVICESTATE_DISCONNECTED; }
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
|
@ -1,6 +1,41 @@
|
|||
#pragma once
|
||||
|
||||
#ifdef __linux__
|
||||
#include <GL/gl.h>
|
||||
#include <GL/glu.h>
|
||||
|
||||
#undef GL_SMOOTH
|
||||
#undef GL_FLAT
|
||||
static const int GL_SMOOTH = 0x1D01;
|
||||
static const int GL_FLAT = 0x1D00;
|
||||
|
||||
class FloatBuffer;
|
||||
class IntBuffer;
|
||||
class ByteBuffer;
|
||||
|
||||
void glGenTextures(IntBuffer *);
|
||||
int glGenTextures();
|
||||
void glDeleteTextures(IntBuffer *);
|
||||
void glDeleteTextures(int);
|
||||
void glLight(int, int, FloatBuffer *);
|
||||
void glLightModel(int, FloatBuffer *);
|
||||
void glGetFloat(int, FloatBuffer *);
|
||||
void glTexGen(int, int, FloatBuffer *);
|
||||
void glFog(int, FloatBuffer *);
|
||||
void glTexCoordPointer(int, int, FloatBuffer *);
|
||||
void glNormalPointer(int, ByteBuffer *);
|
||||
void glColorPointer(int, bool, int, ByteBuffer *);
|
||||
void glVertexPointer(int, int, FloatBuffer *);
|
||||
void glEndList(int);
|
||||
void glTexImage2D(int, int, int, int, int, int, int, int, ByteBuffer *);
|
||||
void glCallLists(IntBuffer *);
|
||||
void glGenQueriesARB(IntBuffer *);
|
||||
void glBeginQueryARB(int, int);
|
||||
void glEndQueryARB(int);
|
||||
void glGetQueryObjectuARB(int, int, IntBuffer *);
|
||||
void glReadPixels(int, int, int, int, int, int, ByteBuffer *);
|
||||
|
||||
#else
|
||||
|
||||
const int GL_BYTE = 0;
|
||||
const int GL_FLOAT = 0;
|
||||
|
|
@ -115,10 +150,32 @@ void glFog(int,FloatBuffer *);
|
|||
void glColorMaterial(int,int);
|
||||
void glMultiTexCoord2f(int, float, float);
|
||||
|
||||
//1.8.2
|
||||
void glClientActiveTexture(int);
|
||||
void glActiveTexture(int);
|
||||
|
||||
#endif
|
||||
|
||||
#ifdef __linux__
|
||||
class GL11
|
||||
{
|
||||
public:
|
||||
static const int GL_SMOOTH = 0x1D01;
|
||||
static const int GL_FLAT = 0x1D00;
|
||||
static void glShadeModel(int mode) { ::glShadeModel(mode); }
|
||||
};
|
||||
|
||||
#undef GL_ARRAY_BUFFER_ARB
|
||||
#undef GL_STREAM_DRAW_ARB
|
||||
class ARBVertexBufferObject
|
||||
{
|
||||
public:
|
||||
static const int GL_ARRAY_BUFFER_ARB = 0x8892;
|
||||
static const int GL_STREAM_DRAW_ARB = 0x88E0;
|
||||
static void glBindBufferARB(int, int) {}
|
||||
static void glBufferDataARB(int, ByteBuffer *, int) {}
|
||||
static void glGenBuffersARB(IntBuffer *) {}
|
||||
};
|
||||
#else
|
||||
class GL11
|
||||
{
|
||||
public:
|
||||
|
|
@ -136,6 +193,7 @@ public:
|
|||
static void glBufferDataARB(int, ByteBuffer *, int) {}
|
||||
static void glGenBuffersARB(IntBuffer *) {}
|
||||
};
|
||||
#endif
|
||||
|
||||
|
||||
class Level;
|
||||
|
|
|
|||
|
|
@ -1955,3 +1955,4 @@
|
|||
#define IDS_YOU_DIED 1953
|
||||
#define IDS_YOU_HAVE 1954
|
||||
#define IDS_ZOMBIE 1955
|
||||
// gone cuz previous implementation is better
|
||||
|
|
|
|||
159
Minecraft.Client/Platform/Linux/LinuxGL.cpp
Normal file
159
Minecraft.Client/Platform/Linux/LinuxGL.cpp
Normal file
|
|
@ -0,0 +1,159 @@
|
|||
#ifdef __linux__
|
||||
|
||||
#include <GL/gl.h>
|
||||
#include <GL/glu.h>
|
||||
#include <GL/glext.h>
|
||||
#include <dlfcn.h>
|
||||
#include "../../Minecraft.World/IntBuffer.h"
|
||||
#include "../../Minecraft.World/FloatBuffer.h"
|
||||
#include "../../Minecraft.World/ByteBuffer.h"
|
||||
|
||||
int glGenTextures()
|
||||
{
|
||||
GLuint id = 0;
|
||||
::glGenTextures(1, &id);
|
||||
return (int)id;
|
||||
}
|
||||
|
||||
void glGenTextures(IntBuffer *buf)
|
||||
{
|
||||
GLuint id = 0;
|
||||
::glGenTextures(1, &id);
|
||||
buf->put((int)id);
|
||||
buf->flip();
|
||||
}
|
||||
|
||||
void glDeleteTextures(int id)
|
||||
{
|
||||
GLuint uid = (GLuint)id;
|
||||
::glDeleteTextures(1, &uid);
|
||||
}
|
||||
|
||||
void glDeleteTextures(IntBuffer *buf)
|
||||
{
|
||||
int id = buf->get(0);
|
||||
GLuint uid = (GLuint)id;
|
||||
::glDeleteTextures(1, &uid);
|
||||
}
|
||||
|
||||
void glLight(int light, int pname, FloatBuffer *params)
|
||||
{
|
||||
::glLightfv((GLenum)light, (GLenum)pname, params->_getDataPointer());
|
||||
}
|
||||
|
||||
void glLightModel(int pname, FloatBuffer *params)
|
||||
{
|
||||
::glLightModelfv((GLenum)pname, params->_getDataPointer());
|
||||
}
|
||||
|
||||
void glGetFloat(int pname, FloatBuffer *params)
|
||||
{
|
||||
::glGetFloatv((GLenum)pname, params->_getDataPointer());
|
||||
}
|
||||
|
||||
void glTexGen(int coord, int pname, FloatBuffer *params)
|
||||
{
|
||||
::glTexGenfv((GLenum)coord, (GLenum)pname, params->_getDataPointer());
|
||||
}
|
||||
|
||||
void glFog(int pname, FloatBuffer *params)
|
||||
{
|
||||
::glFogfv((GLenum)pname, params->_getDataPointer());
|
||||
}
|
||||
|
||||
void glTexCoordPointer(int size, int type, FloatBuffer *pointer)
|
||||
{
|
||||
::glTexCoordPointer(size, (GLenum)type, 0, pointer->_getDataPointer());
|
||||
}
|
||||
|
||||
void glNormalPointer(int type, ByteBuffer *pointer)
|
||||
{
|
||||
::glNormalPointer((GLenum)type, 0, pointer->getBuffer());
|
||||
}
|
||||
|
||||
void glColorPointer(int size, bool normalized, int stride, ByteBuffer *pointer)
|
||||
{
|
||||
(void)normalized;
|
||||
::glColorPointer(size, GL_UNSIGNED_BYTE, stride, pointer->getBuffer());
|
||||
}
|
||||
|
||||
void glVertexPointer(int size, int type, FloatBuffer *pointer)
|
||||
{
|
||||
::glVertexPointer(size, (GLenum)type, 0, pointer->_getDataPointer());
|
||||
}
|
||||
|
||||
void glEndList(int)
|
||||
{
|
||||
::glEndList();
|
||||
}
|
||||
|
||||
void glTexImage2D(int target, int level, int internalformat, int width, int height, int border, int format, int type, ByteBuffer *pixels)
|
||||
{
|
||||
void *data = pixels ? pixels->getBuffer() : nullptr;
|
||||
::glTexImage2D((GLenum)target, level, internalformat, width, height, border, (GLenum)format, (GLenum)type, data);
|
||||
}
|
||||
|
||||
void glCallLists(IntBuffer *lists)
|
||||
{
|
||||
int count = lists->limit() - lists->position();
|
||||
::glCallLists(count, GL_INT, lists->getBuffer());
|
||||
}
|
||||
|
||||
static PFNGLGENQUERIESARBPROC _glGenQueriesARB = nullptr;
|
||||
static PFNGLBEGINQUERYARBPROC _glBeginQueryARB = nullptr;
|
||||
static PFNGLENDQUERYARBPROC _glEndQueryARB = nullptr;
|
||||
static PFNGLGETQUERYOBJECTUIVARBPROC _glGetQueryObjectuivARB = nullptr;
|
||||
static bool _queriesInitialized = false;
|
||||
|
||||
static void initQueryFuncs()
|
||||
{
|
||||
if (_queriesInitialized) return;
|
||||
_queriesInitialized = true;
|
||||
_glGenQueriesARB = (PFNGLGENQUERIESARBPROC)dlsym(RTLD_DEFAULT, "glGenQueriesARB");
|
||||
_glBeginQueryARB = (PFNGLBEGINQUERYARBPROC)dlsym(RTLD_DEFAULT, "glBeginQueryARB");
|
||||
_glEndQueryARB = (PFNGLENDQUERYARBPROC)dlsym(RTLD_DEFAULT, "glEndQueryARB");
|
||||
_glGetQueryObjectuivARB = (PFNGLGETQUERYOBJECTUIVARBPROC)dlsym(RTLD_DEFAULT, "glGetQueryObjectuivARB");
|
||||
}
|
||||
|
||||
void glGenQueriesARB(IntBuffer *buf)
|
||||
{
|
||||
initQueryFuncs();
|
||||
if (_glGenQueriesARB)
|
||||
{
|
||||
GLuint id = 0;
|
||||
_glGenQueriesARB(1, &id);
|
||||
buf->put((int)id);
|
||||
buf->flip();
|
||||
}
|
||||
}
|
||||
|
||||
void glBeginQueryARB(int target, int id)
|
||||
{
|
||||
initQueryFuncs();
|
||||
if (_glBeginQueryARB) _glBeginQueryARB((GLenum)target, (GLuint)id);
|
||||
}
|
||||
|
||||
void glEndQueryARB(int target)
|
||||
{
|
||||
initQueryFuncs();
|
||||
if (_glEndQueryARB) _glEndQueryARB((GLenum)target);
|
||||
}
|
||||
|
||||
void glGetQueryObjectuARB(int id, int pname, IntBuffer *params)
|
||||
{
|
||||
initQueryFuncs();
|
||||
if (_glGetQueryObjectuivARB)
|
||||
{
|
||||
GLuint val = 0;
|
||||
_glGetQueryObjectuivARB((GLuint)id, (GLenum)pname, &val);
|
||||
params->put((int)val);
|
||||
params->flip();
|
||||
}
|
||||
}
|
||||
|
||||
void glReadPixels(int x, int y, int width, int height, int format, int type, ByteBuffer *pixels)
|
||||
{
|
||||
::glReadPixels(x, y, width, height, (GLenum)format, (GLenum)type, pixels->getBuffer());
|
||||
}
|
||||
|
||||
#endif
|
||||
|
|
@ -4,6 +4,7 @@
|
|||
#pragma once
|
||||
|
||||
#include <cassert>
|
||||
#include <cstdarg>
|
||||
|
||||
#define TRUE true
|
||||
#define FALSE false
|
||||
|
|
@ -413,12 +414,27 @@ static inline HANDLE CreateFileA(const char *lpFileName, DWORD dwDesiredAccess,
|
|||
return fd == -1 ? INVALID_HANDLE_VALUE : (HANDLE)(intptr_t)fd;
|
||||
}
|
||||
|
||||
static inline HANDLE CreateFileW(const wchar_t *lpFileName, DWORD dwDesiredAccess, DWORD dwShareMode,
|
||||
void *lpSecurityAttributes, DWORD dwCreationDisposition, DWORD dwFlagsAndAttributes, HANDLE hTemplateFile)
|
||||
{
|
||||
char narrowBuf[1024];
|
||||
wcstombs(narrowBuf, lpFileName, sizeof(narrowBuf));
|
||||
narrowBuf[sizeof(narrowBuf) - 1] = '\0';
|
||||
return CreateFileA(narrowBuf, dwDesiredAccess, dwShareMode, lpSecurityAttributes, dwCreationDisposition, dwFlagsAndAttributes, hTemplateFile);
|
||||
}
|
||||
|
||||
static inline HANDLE CreateFile(const char *lpFileName, DWORD dwDesiredAccess, DWORD dwShareMode,
|
||||
void *lpSecurityAttributes, DWORD dwCreationDisposition, DWORD dwFlagsAndAttributes, HANDLE hTemplateFile)
|
||||
{
|
||||
return CreateFileA(lpFileName, dwDesiredAccess, dwShareMode, lpSecurityAttributes, dwCreationDisposition, dwFlagsAndAttributes, hTemplateFile);
|
||||
}
|
||||
|
||||
static inline HANDLE CreateFile(const wchar_t *lpFileName, DWORD dwDesiredAccess, DWORD dwShareMode,
|
||||
void *lpSecurityAttributes, DWORD dwCreationDisposition, DWORD dwFlagsAndAttributes, HANDLE hTemplateFile)
|
||||
{
|
||||
return CreateFileW(lpFileName, dwDesiredAccess, dwShareMode, lpSecurityAttributes, dwCreationDisposition, dwFlagsAndAttributes, hTemplateFile);
|
||||
}
|
||||
|
||||
static inline BOOL CloseHandle(HANDLE hObject)
|
||||
{
|
||||
if (hObject == INVALID_HANDLE_VALUE) return FALSE;
|
||||
|
|
@ -766,6 +782,198 @@ static inline HANDLE CreateEvent(int manual_reset, int initial_state) {
|
|||
return (HANDLE)ev;
|
||||
}
|
||||
|
||||
static inline HANDLE CreateEvent(void*, BOOL manual_reset, BOOL initial_state, void*) {
|
||||
return CreateEvent(manual_reset, initial_state);
|
||||
}
|
||||
|
||||
static inline BOOL SetEvent(HANDLE hEvent) {
|
||||
Event* ev = (Event*)hEvent;
|
||||
if (!ev) return FALSE;
|
||||
pthread_mutex_lock(&ev->mutex);
|
||||
ev->signaled = 1;
|
||||
if (ev->manual_reset) pthread_cond_broadcast(&ev->cond);
|
||||
else pthread_cond_signal(&ev->cond);
|
||||
pthread_mutex_unlock(&ev->mutex);
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
static inline BOOL ResetEvent(HANDLE hEvent) {
|
||||
Event* ev = (Event*)hEvent;
|
||||
if (!ev) return FALSE;
|
||||
pthread_mutex_lock(&ev->mutex);
|
||||
ev->signaled = 0;
|
||||
pthread_mutex_unlock(&ev->mutex);
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
#define WAIT_OBJECT_0 0
|
||||
#define WAIT_TIMEOUT 258
|
||||
#define WAIT_FAILED ((DWORD)0xFFFFFFFF)
|
||||
#define INFINITE 0xFFFFFFFF
|
||||
|
||||
static inline DWORD WaitForSingleObject(HANDLE hHandle, DWORD dwMilliseconds) {
|
||||
Event* ev = (Event*)hHandle;
|
||||
if (!ev) return WAIT_FAILED;
|
||||
pthread_mutex_lock(&ev->mutex);
|
||||
if (dwMilliseconds == INFINITE) {
|
||||
while (!ev->signaled) pthread_cond_wait(&ev->cond, &ev->mutex);
|
||||
} else if (dwMilliseconds > 0) {
|
||||
struct timespec ts;
|
||||
clock_gettime(CLOCK_REALTIME, &ts);
|
||||
ts.tv_sec += dwMilliseconds / 1000;
|
||||
ts.tv_nsec += (dwMilliseconds % 1000) * 1000000;
|
||||
if (ts.tv_nsec >= 1000000000) { ts.tv_sec++; ts.tv_nsec -= 1000000000; }
|
||||
while (!ev->signaled) {
|
||||
if (pthread_cond_timedwait(&ev->cond, &ev->mutex, &ts) != 0) {
|
||||
pthread_mutex_unlock(&ev->mutex);
|
||||
return WAIT_TIMEOUT;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
if (!ev->signaled) { pthread_mutex_unlock(&ev->mutex); return WAIT_TIMEOUT; }
|
||||
}
|
||||
if (!ev->manual_reset) ev->signaled = 0;
|
||||
pthread_mutex_unlock(&ev->mutex);
|
||||
return WAIT_OBJECT_0;
|
||||
}
|
||||
|
||||
static inline DWORD WaitForMultipleObjects(DWORD nCount, const HANDLE* lpHandles, BOOL bWaitAll, DWORD dwMilliseconds) {
|
||||
if (bWaitAll) {
|
||||
for (DWORD i = 0; i < nCount; i++) WaitForSingleObject(lpHandles[i], dwMilliseconds);
|
||||
return WAIT_OBJECT_0;
|
||||
}
|
||||
for (int pass = 0; pass < 1000; pass++) {
|
||||
for (DWORD i = 0; i < nCount; i++) {
|
||||
if (WaitForSingleObject(lpHandles[i], 0) == WAIT_OBJECT_0) return WAIT_OBJECT_0 + i;
|
||||
}
|
||||
usleep(1000);
|
||||
}
|
||||
return WAIT_TIMEOUT;
|
||||
}
|
||||
|
||||
static inline void CloseHandle_Event(HANDLE hEvent) {
|
||||
Event* ev = (Event*)hEvent;
|
||||
if (!ev) return;
|
||||
pthread_mutex_destroy(&ev->mutex);
|
||||
pthread_cond_destroy(&ev->cond);
|
||||
free(ev);
|
||||
}
|
||||
|
||||
#define STILL_ACTIVE 259
|
||||
#define CREATE_SUSPENDED 0x00000004
|
||||
#define THREAD_PRIORITY_LOWEST (-2)
|
||||
#define THREAD_PRIORITY_BELOW_NORMAL (-1)
|
||||
#define THREAD_PRIORITY_NORMAL 0
|
||||
#define THREAD_PRIORITY_ABOVE_NORMAL 1
|
||||
#define THREAD_PRIORITY_HIGHEST 2
|
||||
#define THREAD_PRIORITY_TIME_CRITICAL 15
|
||||
|
||||
typedef DWORD (*LPTHREAD_START_ROUTINE)(void*);
|
||||
|
||||
struct LinuxThread {
|
||||
pthread_t thread;
|
||||
LPTHREAD_START_ROUTINE func;
|
||||
void* param;
|
||||
DWORD threadId;
|
||||
DWORD exitCode;
|
||||
int suspended;
|
||||
pthread_mutex_t suspendMutex;
|
||||
pthread_cond_t suspendCond;
|
||||
};
|
||||
|
||||
static inline void* _linux_thread_entry(void* arg) {
|
||||
LinuxThread* lt = (LinuxThread*)arg;
|
||||
pthread_mutex_lock(<->suspendMutex);
|
||||
while (lt->suspended) pthread_cond_wait(<->suspendCond, <->suspendMutex);
|
||||
pthread_mutex_unlock(<->suspendMutex);
|
||||
lt->exitCode = lt->func(lt->param);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
static DWORD g_nextThreadId = 1000;
|
||||
|
||||
static inline HANDLE CreateThread(void*, SIZE_T stackSize, LPTHREAD_START_ROUTINE lpStartAddress, void* lpParameter, DWORD dwCreationFlags, DWORD* lpThreadId) {
|
||||
LinuxThread* lt = (LinuxThread*)calloc(1, sizeof(LinuxThread));
|
||||
lt->func = lpStartAddress;
|
||||
lt->param = lpParameter;
|
||||
lt->exitCode = STILL_ACTIVE;
|
||||
lt->suspended = (dwCreationFlags & CREATE_SUSPENDED) ? 1 : 0;
|
||||
lt->threadId = __sync_fetch_and_add(&g_nextThreadId, 1);
|
||||
pthread_mutex_init(<->suspendMutex, NULL);
|
||||
pthread_cond_init(<->suspendCond, NULL);
|
||||
if (lpThreadId) *lpThreadId = lt->threadId;
|
||||
pthread_attr_t attr;
|
||||
pthread_attr_init(&attr);
|
||||
if (stackSize > 0) pthread_attr_setstacksize(&attr, stackSize);
|
||||
pthread_create(<->thread, &attr, _linux_thread_entry, lt);
|
||||
pthread_attr_destroy(&attr);
|
||||
return (HANDLE)lt;
|
||||
}
|
||||
|
||||
static inline DWORD ResumeThread(HANDLE hThread) {
|
||||
LinuxThread* lt = (LinuxThread*)hThread;
|
||||
if (!lt) return (DWORD)-1;
|
||||
pthread_mutex_lock(<->suspendMutex);
|
||||
lt->suspended = 0;
|
||||
pthread_cond_signal(<->suspendCond);
|
||||
pthread_mutex_unlock(<->suspendMutex);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static inline BOOL SetThreadPriority(HANDLE hThread, int nPriority) {
|
||||
(void)hThread; (void)nPriority;
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
static inline BOOL GetExitCodeThread(HANDLE hThread, DWORD* lpExitCode) {
|
||||
LinuxThread* lt = (LinuxThread*)hThread;
|
||||
if (!lt || !lpExitCode) return FALSE;
|
||||
*lpExitCode = lt->exitCode;
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
static inline DWORD GetCurrentThreadId() {
|
||||
return (DWORD)(unsigned long)pthread_self();
|
||||
}
|
||||
|
||||
static inline HANDLE GetCurrentThread() {
|
||||
return (HANDLE)(unsigned long)pthread_self();
|
||||
}
|
||||
|
||||
template<size_t N>
|
||||
static inline int sprintf_s(char (&buf)[N], const char* fmt, ...) {
|
||||
va_list args;
|
||||
va_start(args, fmt);
|
||||
int ret = vsnprintf(buf, N, fmt, args);
|
||||
va_end(args);
|
||||
return ret;
|
||||
}
|
||||
|
||||
static inline int sprintf_s(char* buf, size_t sz, const char* fmt, ...) {
|
||||
va_list args;
|
||||
va_start(args, fmt); // fucking horrid
|
||||
int ret = vsnprintf(buf, sz, fmt, args);
|
||||
va_end(args);
|
||||
return ret;
|
||||
}
|
||||
|
||||
template<size_t N>
|
||||
static inline int swprintf_s(wchar_t (&buf)[N], const wchar_t* fmt, ...) {
|
||||
va_list args;
|
||||
va_start(args, fmt);
|
||||
int ret = vswprintf(buf, N, fmt, args);
|
||||
va_end(args);
|
||||
return ret;
|
||||
}
|
||||
|
||||
static inline int swprintf_s(wchar_t* buf, size_t sz, const wchar_t* fmt, ...) {
|
||||
va_list args;
|
||||
va_start(args, fmt);
|
||||
int ret = vswprintf(buf, sz, fmt, args);
|
||||
va_end(args);
|
||||
return ret;
|
||||
}
|
||||
|
||||
static inline HMODULE GetModuleHandle(LPCSTR lpModuleName) { return 0; }
|
||||
|
||||
static inline LPVOID VirtualAlloc(LPVOID lpAddress, SIZE_T dwSize, DWORD flAllocationType, DWORD flProtect) {
|
||||
|
|
@ -776,5 +984,11 @@ static inline BOOL VirtualFree(LPVOID lpAddress, SIZE_T dwSize, DWORD dwFreeType
|
|||
assert(0 && "FIXME: implement VirtualFree");
|
||||
}
|
||||
|
||||
#define swscanf_s swscanf
|
||||
#define sscanf_s sscanf
|
||||
#define _wcsicmp wcscasecmp
|
||||
#define _stricmp strcasecmp
|
||||
#define _strnicmp strncasecmp
|
||||
#define _wcsnicmp wcsncasecmp
|
||||
|
||||
#endif // WINAPISTUBS_H
|
||||
|
|
|
|||
|
|
@ -157,9 +157,6 @@ FORCEINLINE void XBX_SetStorageDeviceId( DWORD idx ) {}
|
|||
FORCEINLINE const char *XBX_GetLanguageString() { return ""; }
|
||||
FORCEINLINE bool XBX_IsLocalized() { return false; }
|
||||
|
||||
// #define XCONTENT_MAX_DISPLAYNAME_LENGTH 128
|
||||
// #define XCONTENT_MAX_FILENAME_LENGTH 42
|
||||
|
||||
#define XBX_INVALID_STORAGE_ID ((DWORD) -1)
|
||||
#define XBX_STORAGE_DECLINED ((DWORD) -2)
|
||||
|
||||
|
|
|
|||
44
Minecraft.Client/Platform/Linux/linux_game_stubs.cpp
Normal file
44
Minecraft.Client/Platform/Linux/linux_game_stubs.cpp
Normal file
|
|
@ -0,0 +1,44 @@
|
|||
#ifdef __linux__
|
||||
|
||||
#include <cstddef>
|
||||
#include <cstring>
|
||||
#include <string>
|
||||
#include <pthread.h>
|
||||
|
||||
#include "../stubs.h"
|
||||
#include "../Common/Consoles_App.h"
|
||||
|
||||
void Display::update() {}
|
||||
|
||||
int CMinecraftApp::GetTPConfigVal(WCHAR* pwchDataFile) { return 0; }
|
||||
|
||||
#include "../../Minecraft.World/x64headers/extraX64.h"
|
||||
|
||||
void PIXSetMarkerDeprecated(int a, const char* b, ...) {}
|
||||
|
||||
#include "../Xbox/Network/NetworkPlayerXbox.h"
|
||||
|
||||
NetworkPlayerXbox::NetworkPlayerXbox(IQNetPlayer* p) : m_qnetPlayer(p), m_pSocket(nullptr) {}
|
||||
IQNetPlayer* NetworkPlayerXbox::GetQNetPlayer() { return m_qnetPlayer; }
|
||||
unsigned char NetworkPlayerXbox::GetSmallId() { return 0; }
|
||||
void NetworkPlayerXbox::SendData(INetworkPlayer*, const void*, int, bool) {}
|
||||
bool NetworkPlayerXbox::IsSameSystem(INetworkPlayer*) { return false; }
|
||||
int NetworkPlayerXbox::GetSendQueueSizeBytes(INetworkPlayer*, bool) { return 0; }
|
||||
int NetworkPlayerXbox::GetSendQueueSizeMessages(INetworkPlayer*, bool) { return 0; }
|
||||
int NetworkPlayerXbox::GetCurrentRtt() { return 0; }
|
||||
bool NetworkPlayerXbox::IsHost() { return false; }
|
||||
bool NetworkPlayerXbox::IsGuest() { return false; }
|
||||
bool NetworkPlayerXbox::IsLocal() { return true; }
|
||||
int NetworkPlayerXbox::GetSessionIndex() { return 0; }
|
||||
bool NetworkPlayerXbox::IsTalking() { return false; }
|
||||
bool NetworkPlayerXbox::IsMutedByLocalUser(int) { return false; }
|
||||
bool NetworkPlayerXbox::HasVoice() { return false; }
|
||||
bool NetworkPlayerXbox::HasCamera() { return false; }
|
||||
int NetworkPlayerXbox::GetUserIndex() { return 0; }
|
||||
void NetworkPlayerXbox::SetSocket(Socket* s) { m_pSocket = s; }
|
||||
Socket* NetworkPlayerXbox::GetSocket() { return m_pSocket; }
|
||||
const wchar_t* NetworkPlayerXbox::GetOnlineName() { return L"Player"; }
|
||||
std::wstring NetworkPlayerXbox::GetDisplayName() { return L"Player"; }
|
||||
PlayerUID NetworkPlayerXbox::GetUID() { return PlayerUID(); }
|
||||
|
||||
#endif
|
||||
|
|
@ -1,4 +1,7 @@
|
|||
#include "../Build/stdafx.h"
|
||||
|
||||
#ifndef __linux__
|
||||
|
||||
#include "../../Minecraft.World/IO/Streams/FloatBuffer.h"
|
||||
#include "../../Minecraft.World/IO/Streams/IntBuffer.h"
|
||||
#include "../../Minecraft.World/IO/Streams/ByteBuffer.h"
|
||||
|
|
@ -386,4 +389,7 @@ void glTexGen(int coord, int mode, FloatBuffer *vec)
|
|||
void glCullFace(int dir)
|
||||
{
|
||||
RenderManager.StateSetFaceCullCW( dir == GL_BACK);
|
||||
}
|
||||
}
|
||||
|
||||
#endif
|
||||
#endif
|
||||
|
|
@ -133,7 +133,7 @@ void Texture::_init(const wstring &name, int mode, int width, int height, int de
|
|||
for(unsigned int level = 1; level < m_iMipLevels; ++level)
|
||||
{
|
||||
int ww = width >> level;
|
||||
int hh = height >> height;
|
||||
int hh = height >> level;
|
||||
|
||||
byteArray tempBytes = byteArray(ww * hh * depth * 4);
|
||||
for (int index = 0; index < tempBytes.length; index++)
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
#include "../../../Minecraft.World/Util/SharedConstants.h"
|
||||
#include "../../../Minecraft.World/Util/StringHelpers.h"
|
||||
|
||||
const wstring ChatScreen::allowedChars = SharedConstants::acceptableLetters;
|
||||
const wstring ChatScreen::allowedChars = SharedConstants::readAcceptableChars();
|
||||
|
||||
ChatScreen::ChatScreen()
|
||||
{
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
#include "../../../Minecraft.World/Headers/net.minecraft.world.level.tile.h"
|
||||
|
||||
|
||||
const wstring TextEditScreen::allowedChars = SharedConstants::acceptableLetters;;
|
||||
const wstring TextEditScreen::allowedChars = SharedConstants::readAcceptableChars();
|
||||
|
||||
TextEditScreen::TextEditScreen(shared_ptr<SignTileEntity> sign)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -5,8 +5,8 @@ set(PROJECT_NAME Minecraft.World)
|
|||
################################################################################
|
||||
set(ConsoleHelpers
|
||||
"../Util/ArrayWithLength.h"
|
||||
# "C4JThread.cpp"
|
||||
# "C4JThread.h"
|
||||
"../Util/C4JThread.cpp"
|
||||
"../Util/C4JThread.h"
|
||||
"../Util/Definitions.h"
|
||||
"../Util/HashExtension.h"
|
||||
"../Util/PerformanceTimer.cpp"
|
||||
|
|
@ -29,8 +29,8 @@ set(ConsoleHelpers__ConsoleSaveFileIO
|
|||
"../IO/Files/ConsoleSaveFileOriginal.h"
|
||||
"../IO/Files/ConsoleSaveFileOutputStream.cpp"
|
||||
"../IO/Files/ConsoleSaveFileOutputStream.h"
|
||||
# "ConsoleSaveFileSplit.cpp"
|
||||
# "ConsoleSaveFileSplit.h"
|
||||
"../IO/Files/ConsoleSaveFileSplit.cpp"
|
||||
"../IO/Files/ConsoleSaveFileSplit.h"
|
||||
"../IO/Files/ConsoleSavePath.h"
|
||||
"../IO/Files/FileHeader.cpp"
|
||||
"../IO/Files/FileHeader.h"
|
||||
|
|
@ -1906,6 +1906,7 @@ endif()
|
|||
################################################################################
|
||||
# Target name
|
||||
################################################################################
|
||||
if(MSVC)
|
||||
set_target_properties(${PROJECT_NAME} PROPERTIES
|
||||
TARGET_NAME_CONTENTPACKAGE_NO_TU "${OUTPUT_DIRECTORY}${PROJECT_NAME}"
|
||||
TARGET_NAME_CONTENTPACKAGE_SYMBOLS "${OUTPUT_DIRECTORY}${PROJECT_NAME}"
|
||||
|
|
@ -1913,6 +1914,15 @@ set_target_properties(${PROJECT_NAME} PROPERTIES
|
|||
TARGET_NAME_DEBUG "${OUTPUT_DIRECTORY}${PROJECT_NAME}"
|
||||
TARGET_NAME_RELEASE "${OUTPUT_DIRECTORY}${PROJECT_NAME}"
|
||||
TARGET_NAME_RELEASEFORART "${OUTPUT_DIRECTORY}${PROJECT_NAME}")
|
||||
else()
|
||||
set_target_properties(${PROJECT_NAME} PROPERTIES
|
||||
TARGET_NAME_CONTENTPACKAGE_NO_TU "${PROJECT_NAME}"
|
||||
TARGET_NAME_CONTENTPACKAGE_SYMBOLS "${PROJECT_NAME}"
|
||||
TARGET_NAME_CONTENTPACKAGE "${PROJECT_NAME}"
|
||||
TARGET_NAME_DEBUG "${PROJECT_NAME}"
|
||||
TARGET_NAME_RELEASE "${PROJECT_NAME}"
|
||||
TARGET_NAME_RELEASEFORART "${PROJECT_NAME}")
|
||||
endif()
|
||||
|
||||
################################################################################
|
||||
# Output directory
|
||||
|
|
|
|||
|
|
@ -176,11 +176,10 @@ void MemSect(int sect);
|
|||
#include "../../Minecraft.Client/Platform/PSVita/4JLibs/inc/4J_Storage.h"
|
||||
#include "../../Minecraft.Client/Platform/PSVita/4JLibs/inc/4J_Input.h"
|
||||
#elif defined __linux__
|
||||
// FIXME: Port 4JLibs to POSIX
|
||||
#include "../../Minecraft.Client/Platform/Windows64/4JLibs/inc/4J_Profile.h"
|
||||
#include "../../Minecraft.Client/Platform/Windows64/4JLibs/inc/4J_Render.h"
|
||||
#include "../../Minecraft.Client/Platform/Windows64/4JLibs/inc/4J_Storage.h"
|
||||
#include "../../Minecraft.Client/Platform/Windows64/4JLibs/inc/4J_Input.h"
|
||||
#include "../../4J.Profile/4J_Profile.h"
|
||||
#include "../../4J.Render/4J_Render.h"
|
||||
#include "../../4J.Storage/4J_Storage.h"
|
||||
#include "../../4J.Input/4J_Input.h"
|
||||
#else
|
||||
#include "../../Minecraft.Client/Platform/Orbis/4JLibs/inc/4J_Profile.h"
|
||||
#include "../../Minecraft.Client/Platform/Orbis/4JLibs/inc/4J_Render.h"
|
||||
|
|
|
|||
|
|
@ -129,9 +129,7 @@ bool File::mkdir() const
|
|||
#if defined (_UNICODE)
|
||||
return CreateDirectory( getPath().c_str(), NULL) != 0;
|
||||
#elif defined(__linux__)
|
||||
std::wstring wpath = getPath();
|
||||
std::string path(wpath.begin(), wpath.end());
|
||||
return ::mkdir(path.c_str(), 0777) == 0; // rwxrwxrwx
|
||||
return ::mkdir(wstringtofilename(getPath()), 0777) == 0;
|
||||
#else
|
||||
return CreateDirectory( wstringtofilename(getPath()), NULL) != 0;
|
||||
#endif
|
||||
|
|
@ -186,11 +184,10 @@ bool File::mkdirs() const
|
|||
}
|
||||
}
|
||||
#elif defined(__linux__)
|
||||
std::wstring wpath = getPath();
|
||||
std::string path(wpath.begin(), wpath.end());
|
||||
const char *mkpath = wstringtofilename(getPath());
|
||||
struct stat info;
|
||||
if (stat(path.c_str(), &info) != 0 || !(info.st_mode & S_IFDIR)) {
|
||||
if (::mkdir(path.c_str(), 0777) != 0) {
|
||||
if (stat(mkpath, &info) != 0 || !(info.st_mode & S_IFDIR)) {
|
||||
if (::mkdir(mkpath, 0777) != 0) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
|
@ -229,9 +226,8 @@ bool File::exists() const
|
|||
#if defined(_UNICODE)
|
||||
return GetFileAttributes( getPath().c_str() ) != -1;
|
||||
#elif defined(__linux__)
|
||||
std::wstring wpath = getPath();
|
||||
std::string path(wpath.begin(), wpath.end());
|
||||
return access(path.c_str(), F_OK) != -1;
|
||||
// BAD DOBBY BAD DOBBY
|
||||
return access(wstringtofilename(getPath()), F_OK) != -1;
|
||||
#else
|
||||
return GetFileAttributes( wstringtofilename(getPath()) ) != -1;
|
||||
#endif
|
||||
|
|
@ -567,9 +563,9 @@ bool File::isDirectory() const
|
|||
#if defined(_UNICODE)
|
||||
return exists() && ( GetFileAttributes( getPath().c_str() ) & FILE_ATTRIBUTE_DIRECTORY) == FILE_ATTRIBUTE_DIRECTORY;
|
||||
#elif defined(__linux__)
|
||||
std::wstring wpath = getPath();
|
||||
std::string path(wpath.begin(), wpath.end());
|
||||
return access(path.c_str(), F_OK) != -1;
|
||||
const char *dirpath = wstringtofilename(getPath());
|
||||
struct stat st;
|
||||
return stat(dirpath, &st) == 0 && S_ISDIR(st.st_mode);
|
||||
#else
|
||||
return exists() && ( GetFileAttributes( wstringtofilename(getPath()) ) & FILE_ATTRIBUTE_DIRECTORY) == FILE_ATTRIBUTE_DIRECTORY;
|
||||
#endif
|
||||
|
|
@ -645,10 +641,9 @@ __int64 File::length()
|
|||
return statData.fileSize;
|
||||
#elif defined(__linux__)
|
||||
struct stat fileInfoBuffer;
|
||||
std::wstring wpath = getPath();
|
||||
std::string path(wpath.begin(), wpath.end());
|
||||
const char *path = wstringtofilename(getPath());
|
||||
|
||||
int result = stat(path.c_str(), &fileInfoBuffer);
|
||||
int result = stat(path, &fileInfoBuffer);
|
||||
|
||||
if(result == 0) {
|
||||
return fileInfoBuffer.st_size;
|
||||
|
|
@ -726,10 +721,7 @@ __int64 File::lastModified()
|
|||
}
|
||||
#else
|
||||
struct stat fileStat;
|
||||
struct stat fileInfoBuffer;
|
||||
std::wstring wpath = getPath();
|
||||
std::string path(wpath.begin(), wpath.end());
|
||||
if (stat(path.c_str(), &fileStat) == 0 && !S_ISDIR(fileStat.st_mode)) {
|
||||
if (stat(wstringtofilename(getPath()), &fileStat) == 0 && !S_ISDIR(fileStat.st_mode)) {
|
||||
return static_cast<__int64>(fileStat.st_mtime);
|
||||
} else {
|
||||
return 0l;
|
||||
|
|
|
|||
|
|
@ -300,7 +300,7 @@ HRESULT Compression::DecompressRLE(void *pDestination, unsigned int *pDestSize,
|
|||
HRESULT Compression::Compress(void *pDestination, unsigned int *pDestSize, void *pSource, unsigned int SrcSize)
|
||||
{
|
||||
// Using zlib for x64 compression - 360 is using native 360 compression and PS3 a stubbed non-compressing version of this
|
||||
#if defined __ORBIS__ || defined _DURANGO || defined _WIN64 || defined __PSVITA__
|
||||
#if defined __ORBIS__ || defined _DURANGO || defined _WIN64 || defined __PSVITA__ || defined __linux__
|
||||
SIZE_T destSize = (SIZE_T)(*pDestSize);
|
||||
int res = ::compress((Bytef *)pDestination, (uLongf *)&destSize, (Bytef *)pSource, SrcSize);
|
||||
*pDestSize = (unsigned int)destSize;
|
||||
|
|
@ -328,7 +328,7 @@ HRESULT Compression::Decompress(void *pDestination, unsigned int *pDestSize, voi
|
|||
}
|
||||
|
||||
// Using zlib for x64 compression - 360 is using native 360 compression and PS3 a stubbed non-compressing version of this
|
||||
#if defined __ORBIS__ || defined _DURANGO || defined _WIN64 || defined __PSVITA__
|
||||
#if defined __ORBIS__ || defined _DURANGO || defined _WIN64 || defined __PSVITA__ || defined __linux__
|
||||
SIZE_T destSize = (SIZE_T)(*pDestSize);
|
||||
int res = ::uncompress((Bytef *)pDestination, (uLongf *)&destSize, (Bytef *)pSource, SrcSize);
|
||||
*pDestSize = (unsigned int)destSize;
|
||||
|
|
@ -405,7 +405,7 @@ HRESULT Compression::DecompressWithType(void *pDestination, unsigned int *pDestS
|
|||
}
|
||||
break;
|
||||
case eCompressionType_ZLIBRLE:
|
||||
#if (defined __ORBIS__ || defined __PS3__ || defined _DURANGO || defined _WIN64)
|
||||
#if (defined __ORBIS__ || defined __PS3__ || defined _DURANGO || defined _WIN64 || defined __linux__)
|
||||
if (pDestination != NULL)
|
||||
return ::uncompress((PBYTE)pDestination, (unsigned long *) pDestSize, (PBYTE) pSource, SrcSize); // Decompress
|
||||
else break; // Cannot decompress when destination is NULL
|
||||
|
|
|
|||
|
|
@ -77,7 +77,7 @@ private:
|
|||
|
||||
//extern Compression gCompression;
|
||||
|
||||
#if defined __ORBIS__ || defined _DURANGO || defined _WIN64 || defined __PSVITA__
|
||||
#if defined __ORBIS__ || defined _DURANGO || defined _WIN64 || defined __PSVITA__ || defined __linux__
|
||||
#define APPROPRIATE_COMPRESSION_TYPE Compression::eCompressionType_ZLIBRLE
|
||||
#elif defined __PS3__
|
||||
#define APPROPRIATE_COMPRESSION_TYPE Compression::eCompressionType_PS3ZLIB
|
||||
|
|
|
|||
|
|
@ -284,7 +284,7 @@ LevelData *DirectoryLevelStorage::prepareLevel()
|
|||
for(unsigned int i = 0; i < count; ++i)
|
||||
{
|
||||
PlayerUID playerUid = dis.readPlayerUID();
|
||||
#ifdef _WINDOWS64
|
||||
#if defined(_WINDOWS64) || defined(__linux__)
|
||||
app.DebugPrintf(" -- %d\n", playerUid);
|
||||
#else
|
||||
#ifdef __linux__
|
||||
|
|
@ -692,7 +692,7 @@ void DirectoryLevelStorage::saveMapIdLookup()
|
|||
app.DebugPrintf("Saving %d mappings\n", m_playerMappings.size());
|
||||
for(AUTO_VAR(it,m_playerMappings.begin()); it != m_playerMappings.end(); ++it)
|
||||
{
|
||||
#ifdef _WINDOWS64
|
||||
#if defined(_WINDOWS64) || defined(__linux__)
|
||||
app.DebugPrintf(" -- %d\n", it->first);
|
||||
#else
|
||||
#ifdef __linux__
|
||||
|
|
|
|||
|
|
@ -51,6 +51,6 @@ int RemoveEntitiesPacket::getEstimatedSize()
|
|||
4J: These are necesary on the PS3.
|
||||
(and 4).
|
||||
*/
|
||||
#if (defined __PS3__ || defined __ORBIS__ || defined __PSVITA__)
|
||||
#if (defined __PS3__ || defined __ORBIS__ || defined __PSVITA__ || defined __linux__)
|
||||
const int RemoveEntitiesPacket::MAX_PER_PACKET;
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ bool SharedConstants::isAllowedChatCharacter(char ch)
|
|||
return true;
|
||||
}
|
||||
|
||||
wstring SharedConstants::acceptableLetters;
|
||||
wstring SharedConstants::acceptableLetters = SharedConstants::readAcceptableChars();
|
||||
|
||||
void SharedConstants::staticCtor()
|
||||
{
|
||||
|
|
|
|||
|
|
@ -14,8 +14,7 @@ class SharedConstants
|
|||
static const int WORLD_RESOLUTION = 16;
|
||||
|
||||
static bool isAllowedChatCharacter(char ch);
|
||||
|
||||
private:
|
||||
// why private??????????
|
||||
static wstring readAcceptableChars();
|
||||
|
||||
public:
|
||||
|
|
|
|||
|
|
@ -56,7 +56,7 @@ const char *wstringtofilename(const wstring& name)
|
|||
for(unsigned int i = 0; i < name.length(); i++ )
|
||||
{
|
||||
wchar_t c = name[i];
|
||||
#if defined __PS3__ || defined __ORBIS__
|
||||
#if defined __PS3__ || defined __ORBIS__ || defined __linux__
|
||||
if(c=='\\') c='/';
|
||||
#else
|
||||
if(c=='/') c='\\';
|
||||
|
|
|
|||
Loading…
Reference in a new issue