December 2014 files

Minecraft.Client/PSVita/4JLibs/inc/4J_Profile.h

@@ -7,6 +7,76 @@
 using namespace sce::Toolkit::NP;
 using namespace sce::Toolkit::NP::Utilities;
 
+class CXuiStringTable;
+
+// Note - there are now 3 types of PlayerUID
+// (1) A full online ID - either the primary login, or a sub-signin through to PSN. This has m_onlineID set up as a normal SceNpOnlineId, with dummy[0] set to 0
+// (2) An offline ID, where there is also a primary login on the system. This has m_onlineID set up to copy the primary SceNpOnlineId, except with dummy[0] set to the controller ID of this other player
+// (3) An offline ID, where there isn't a primary PSN login on the system. This has SceNpOnlineId fully zeroed.
+
+class PlayerUID
+{
+	char m_onlineID[SCE_NP_ONLINEID_MAX_LENGTH];
+	char term;
+	bool m_bSignedIntoPSN : 1;
+	unsigned char m_quadrant : 2;
+	uint8_t m_macAddress[SCE_NET_ETHER_ADDR_LEN];
+	int	m_userID;		// user logged on to the XMB
+
+public:
+
+	class Hash 
+	{
+	public:		
+		std::size_t operator()(const PlayerUID& k) const;
+	};
+
+	PlayerUID();
+	PlayerUID(int userID, SceNpOnlineId& onlineID, bool bSignedInPSN, int quadrant);
+	PlayerUID(std::wstring fromString);
+
+	bool operator==(const PlayerUID& rhs) const;
+	bool operator!=(const PlayerUID& rhs);
+	void setCurrentMacAddress();
+	std::wstring macAddressStr() const;
+	std::wstring userIDStr() const;
+	std::wstring toString() const;
+	void setOnlineID(SceNpOnlineId& id, bool bSignedIntoPSN);
+	void setUserID(unsigned int id);
+
+
+	const char*			getOnlineID() const		{ return m_onlineID; }
+	int					getUserID() const		{ return m_userID; }
+	int					getQuadrant() const		{ return m_quadrant;  }
+	bool				isPrimaryUser() const;	// only true if we're on the local machine and signed into the first quadrant;
+	bool				isSignedIntoPSN() const	{ return m_bSignedIntoPSN; }
+	void				setForAdhoc();
+private:
+};
+
+typedef PlayerUID *PPlayerUID;
+
+class GameSessionUID
+{
+	char m_onlineID[SCE_NP_ONLINEID_MAX_LENGTH];
+	char term;
+	bool m_bSignedIntoPSN : 1;
+	unsigned char m_quadrant : 2;
+public:
+	GameSessionUID();
+	GameSessionUID(int nullVal);
+
+	bool operator==(const GameSessionUID& rhs) const;
+	bool operator!=(const GameSessionUID& rhs);
+	GameSessionUID& operator=(const PlayerUID& rhs);
+
+	const char*			getOnlineID() const		{ return m_onlineID; }
+	int					getQuadrant() const		{ return m_quadrant;  }
+	bool				isSignedIntoPSN() const	{ return m_bSignedIntoPSN; }
+	void				setForAdhoc();
+
+};
+
 enum eAwardType
 {
 	eAwardType_Achievement	= 0,
@@ -101,7 +171,7 @@ public:
 	int					GetPrimaryPad();
 	void				SetPrimaryPad(int iPad);
 	char*				GetGamertag(int iPad);
-	wstring				GetDisplayName(int iPad);										
+	std::wstring		GetDisplayName(int iPad);										
 
 	bool				IsFullVersion();
 	void				SetFullVersion(bool bFull);

Minecraft.Client/PSVita/4JLibs/inc/4J_Render.h

@@ -2,6 +2,8 @@
 
 #include <gxm.h>
 
+
+
 class ImageFileBuffer 
 {
 public:
@@ -57,7 +59,7 @@ public:
 	void Set_matrixDirty();
 
 	// Core
-	void Initialise(ID3D11Device *pDevice, IDXGISwapChain *pSwapChain);
+	void Initialise();
 	void InitialiseContext();
 	void StartFrame();
 	void Present();
@@ -79,6 +81,8 @@ public:
 		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_COMPRESSED_FOG_1,
+		VERTEX_TYPE_COMPRESSED_FOG_2,
 		VERTEX_TYPE_COUNT
 	} eVertexType;
 
@@ -86,6 +90,9 @@ public:
 	typedef enum
 	{
 		PIXEL_SHADER_TYPE_STANDARD,
+		PIXEL_SHADER_TYPE_STANDARD2,
+		PIXEL_SHADER_TYPE_STANDARD3,
+		PIXEL_SHADER_TYPE_STANDARD4,
 		PIXEL_SHADER_TYPE_PROJECTION,
 		PIXEL_SHADER_COUNT
 	} ePixelShaderType;
@@ -151,6 +158,7 @@ public:
 	int TextureCreate();
 	void TextureFree(int idx);
 	void TextureBind(int idx);
+	void TextureBind(int layer, int idx);
 	void TextureBindVertex(int idx);
 	void TextureSetTextureLevels(int levels);
 	int  TextureGetTextureLevels();

Minecraft.Client/PSVita/4JLibs/inc/4J_Storage.h

@@ -381,7 +381,7 @@ public:
 	void						SetDLCProductCode(const char* szProductCode);
 	void						SetProductUpgradeKey(const char* szKey);
 	bool						CheckForTrialUpgradeKey(void( *Func)(LPVOID, bool),LPVOID lpParam);
-	void						SetDLCInfoMap(unordered_map<wstring, SONYDLC *>* pSONYDLCMap);
+	void						SetDLCInfoMap(std::unordered_map<wstring, SONYDLC *>* pSONYDLCMap);
 	void						EntitlementsCallback(bool bFoundEntitlements);
 
 };