mirror of
https://github.com/smartcmd/MinecraftConsoles.git
synced 2026-04-27 09:26:47 +00:00
Squashed commit of the following:
commit b40530fa5e12bdd0e2d03686b111964f9c5b3359
Author: Langtanium <94726057+Langtanium@users.noreply.github.com>
Date: Wed Apr 15 19:59:46 2026 -0700
Implemented skin offsets in UI
Added code to render skin offsets in the skin select UI.
commit a8384d984089b989a162550705dee7a505412e22
Author: Langtanium <94726057+Langtanium@users.noreply.github.com>
Date: Wed Apr 15 19:38:08 2026 -0700
Partially implemented offsets
Added code that visually shifts the player's model parts, but only in game not in the skin select UI.
commit 875100cf9afe7df258dc653a4b33857d3cd285c1
Author: Langtanium <94726057+Langtanium@users.noreply.github.com>
Date: Wed Apr 15 16:48:03 2026 -0700
Minor change
Simplified redundant conditions in HumanoidModel.cpp
commit 96f683d1fb93d09a49987460ef698e0d125c2c93
Merge: db685a74 24c74aa2
Author: Langtanium <94726057+Langtanium@users.noreply.github.com>
Date: Tue Apr 14 16:37:30 2026 -0700
Merge branch 'feat/64x64-skins' into feat/skin-offsets
commit db685a74f34d02cc83e33ab97c5a7ad9a62ef023
Author: Langtanium <94726057+Langtanium@users.noreply.github.com>
Date: Tue Apr 14 15:35:38 2026 -0700
Fixed skin offset data
Fixed skin offsets so they now return the actual data instead of the defaults, added a few minor tweaks, and added code in PlayerRenderer.cpp to access offsets (Can read the offsets but can not apply them).
commit aa769d54adb8f5bf96c75d10766422d23cc9129a
Author: Langtanium <94726057+Langtanium@users.noreply.github.com>
Date: Sat Apr 11 19:36:52 2026 -0700
Fixed crashes
Fixed code for offsets preventing crashes. The amount of offsets is correctly obtain, but lacks the actual data.
commit f18ac12cc072db74ed9b8da937e00c2e15f889a0
Merge: 8e76763a fd2fd659
Author: Langtanium <94726057+Langtanium@users.noreply.github.com>
Date: Fri Apr 10 16:06:57 2026 -0700
Merge branch 'feat/64x64-skins' into feat/skin-offsets
commit 8e76763a3ddeaff943243fd0469d6c4a7b12b6c1
Author: Langtanium <94726057+Langtanium@users.noreply.github.com>
Date: Tue Apr 7 16:50:43 2026 -0700
Made more changes
Made more changes in files to support skin offsets. The game still crashes when trying to load skins.
commit 1a8f3532979033717044e74e6ceb766e23e35032
Merge: a1d9ae59 bb5fa506
Author: Langtanium <94726057+Langtanium@users.noreply.github.com>
Date: Tue Apr 7 13:12:39 2026 -0700
Merge branch 'feat/64x64-skins' into feat/skin-offsets
commit a1d9ae591ac27117626aac708a4204a9e2451684
Author: Langtanium <94726057+Langtanium@users.noreply.github.com>
Date: Fri Apr 3 21:50:42 2026 -0700
Added small additions
Added more code referencing skin offsets. Still doesn't work correctly.
commit d28a751d9ca0527854e40be82e7841a650c2f189
Merge: 3888de7a 8bf03435
Author: Langtanium <94726057+Langtanium@users.noreply.github.com>
Date: Thu Apr 2 17:09:08 2026 -0700
Merge branch 'smartcmd:main' into feat/skin-offsets
commit 3888de7ab401d9562b7b922eca8b898aa73ba024
Author: Langtanium <94726057+Langtanium@users.noreply.github.com>
Date: Thu Apr 2 17:07:48 2026 -0700
Added code for skin offsets
Added code to the file which have the functionality to get skin boxes and duplicated the functionality for skin offsets. The code causes the game to crash when switching to third person. The error occurs with the skin offsets returning as an empty class object.
This commit is contained in:
Langtanium
parent
24c74aa225
commit
760484e546
|
|
@ -2711,7 +2711,7 @@ void ClientConnection::handleTextureAndGeometry(shared_ptr<TextureAndGeometryPac
|
|||
{
|
||||
unsigned int uiAnimOverrideBitmask= app.GetAnimOverrideBitmask(packet->dwSkinID);
|
||||
|
||||
send(std::make_shared<TextureAndGeometryPacket>(packet->textureName, pbData, dwBytes, app.GetAdditionalSkinBoxes(packet->dwSkinID), uiAnimOverrideBitmask));
|
||||
send(std::make_shared<TextureAndGeometryPacket>(packet->textureName, pbData, dwBytes, app.GetAdditionalSkinBoxes(packet->dwSkinID), app.GetModelOffsets(packet->dwSkinID), uiAnimOverrideBitmask));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -2728,6 +2728,11 @@ void ClientConnection::handleTextureAndGeometry(shared_ptr<TextureAndGeometryPac
|
|||
{
|
||||
app.SetAdditionalSkinBoxes(packet->dwSkinID,packet->BoxDataA,packet->dwBoxC);
|
||||
}
|
||||
// Add the offet data
|
||||
if(packet->dwOffsetC!=0)
|
||||
{
|
||||
app.SetSkinOffsets(packet->dwSkinID,packet->OffsetDataA,packet->dwOffsetC);
|
||||
}
|
||||
// Add the anim override
|
||||
app.SetAnimOverrideBitmask(packet->dwSkinID,packet->uiAnimOverrideBitmask);
|
||||
|
||||
|
|
|
|||
|
|
@ -196,6 +196,7 @@ CMinecraftApp::CMinecraftApp()
|
|||
InitializeCriticalSection(&csTMSPPDownloadQueue);
|
||||
InitializeCriticalSection(&csAdditionalModelParts);
|
||||
InitializeCriticalSection(&csAdditionalSkinBoxes);
|
||||
InitializeCriticalSection(&csModelOffsets);
|
||||
InitializeCriticalSection(&csAnimOverrideBitmask);
|
||||
InitializeCriticalSection(&csMemFilesLock);
|
||||
InitializeCriticalSection(&csMemTPDLock);
|
||||
|
|
@ -9201,7 +9202,7 @@ bool CMinecraftApp::DLCContentRetrieved(eDLCMarketplaceType eType)
|
|||
void CMinecraftApp::SetAdditionalSkinBoxes(DWORD dwSkinID, SKIN_BOX *SkinBoxA, DWORD dwSkinBoxC)
|
||||
{
|
||||
EntityRenderer *renderer = EntityRenderDispatcher::instance->getRenderer(eTYPE_PLAYER);
|
||||
unsigned int m_uiAnimOverrideBitmask = Player::getSkinAnimOverrideBitmask(dwSkinID);
|
||||
unsigned int m_uiAnimOverrideBitmask = GetAnimOverrideBitmask(dwSkinID);
|
||||
Model *pModel;
|
||||
if (m_uiAnimOverrideBitmask&(1<<HumanoidModel::eAnim_ClassicModel))
|
||||
pModel = renderer->getModelClassic();
|
||||
|
|
@ -9237,10 +9238,30 @@ void CMinecraftApp::SetAdditionalSkinBoxes(DWORD dwSkinID, SKIN_BOX *SkinBoxA, D
|
|||
|
||||
}
|
||||
|
||||
void CMinecraftApp::SetSkinOffsets(DWORD dwSkinID, SKIN_OFFSET *SkinOffsetA, DWORD dwSkinOffsetC)
|
||||
{
|
||||
vector<SKIN_OFFSET *> *pvSkinOffset = new vector<SKIN_OFFSET *>;
|
||||
|
||||
EnterCriticalSection( &csModelOffsets );
|
||||
|
||||
app.DebugPrintf("*** SetAdditionalSkinBoxes - Inserting model parts for skin %d from array of Skin Boxes\n",dwSkinID&0x0FFFFFFF);
|
||||
|
||||
for(unsigned int i=0;i<dwSkinOffsetC;i++)
|
||||
{
|
||||
pvSkinOffset->push_back(&SkinOffsetA[i]);
|
||||
}
|
||||
|
||||
|
||||
m_SkinOffsets.insert( std::pair<DWORD, vector<SKIN_OFFSET *> *>(dwSkinID, pvSkinOffset) );
|
||||
|
||||
LeaveCriticalSection( &csModelOffsets );
|
||||
|
||||
}
|
||||
|
||||
vector<ModelPart *> * CMinecraftApp::SetAdditionalSkinBoxes(DWORD dwSkinID, vector<SKIN_BOX *> *pvSkinBoxA)
|
||||
{
|
||||
EntityRenderer *renderer = EntityRenderDispatcher::instance->getRenderer(eTYPE_PLAYER);
|
||||
unsigned int m_uiAnimOverrideBitmask = Player::getSkinAnimOverrideBitmask(dwSkinID);
|
||||
unsigned int m_uiAnimOverrideBitmask = GetAnimOverrideBitmask(dwSkinID);
|
||||
Model *pModel;
|
||||
if (m_uiAnimOverrideBitmask&(1<<HumanoidModel::eAnim_ClassicModel))
|
||||
pModel = renderer->getModelClassic();
|
||||
|
|
@ -9272,6 +9293,24 @@ vector<ModelPart *> * CMinecraftApp::SetAdditionalSkinBoxes(DWORD dwSkinID, vect
|
|||
return pvModelPart;
|
||||
}
|
||||
|
||||
vector<SKIN_OFFSET *> * CMinecraftApp::SetSkinOffsets(DWORD dwSkinID, vector<SKIN_OFFSET *> *pvSkinOffsetA)
|
||||
{
|
||||
vector<SKIN_OFFSET *> *pvModelOffset = new vector<SKIN_OFFSET *>;
|
||||
|
||||
EnterCriticalSection( &csModelOffsets );
|
||||
app.DebugPrintf("*** SetSkinOffsets - Inserting model offsets for skin %d from array of Skin Offsets\n",dwSkinID&0x0FFFFFFF);
|
||||
|
||||
for( auto& it : *pvSkinOffsetA )
|
||||
{
|
||||
pvModelOffset->push_back(it);
|
||||
}
|
||||
|
||||
m_SkinOffsets.emplace(dwSkinID, pvSkinOffsetA);
|
||||
|
||||
LeaveCriticalSection( &csModelOffsets );
|
||||
return pvModelOffset;
|
||||
}
|
||||
|
||||
|
||||
vector<ModelPart *> *CMinecraftApp::GetAdditionalModelParts(DWORD dwSkinID)
|
||||
{
|
||||
|
|
@ -9307,6 +9346,23 @@ vector<SKIN_BOX *> *CMinecraftApp::GetAdditionalSkinBoxes(DWORD dwSkinID)
|
|||
return pvSkinBoxes;
|
||||
}
|
||||
|
||||
vector<SKIN_OFFSET *> *CMinecraftApp::GetModelOffsets(DWORD dwSkinID)
|
||||
{
|
||||
EnterCriticalSection( &csModelOffsets );
|
||||
vector<SKIN_OFFSET *> *pvModelOffsets=nullptr;
|
||||
if(m_SkinOffsets.size()>0)
|
||||
{
|
||||
auto it = m_SkinOffsets.find(dwSkinID);
|
||||
if(it!=m_SkinOffsets.end())
|
||||
{
|
||||
pvModelOffsets = (*it).second;
|
||||
}
|
||||
}
|
||||
|
||||
LeaveCriticalSection( &csModelOffsets );
|
||||
return pvModelOffsets;
|
||||
}
|
||||
|
||||
unsigned int CMinecraftApp::GetAnimOverrideBitmask(DWORD dwSkinID)
|
||||
{
|
||||
EnterCriticalSection( &csAnimOverrideBitmask );
|
||||
|
|
|
|||
|
|
@ -21,6 +21,7 @@ using namespace std;
|
|||
#include ".\GameRules\ConsoleGameRulesConstants.h"
|
||||
#include ".\GameRules\GameRuleManager.h"
|
||||
#include "..\SkinBox.h"
|
||||
#include "..\SkinOffset.h"
|
||||
#include "..\ArchiveFile.h"
|
||||
|
||||
typedef struct _JoinFromInviteData
|
||||
|
|
@ -824,6 +825,7 @@ private:
|
|||
CRITICAL_SECTION csTMSPPDownloadQueue;
|
||||
CRITICAL_SECTION csAdditionalModelParts;
|
||||
CRITICAL_SECTION csAdditionalSkinBoxes;
|
||||
CRITICAL_SECTION csModelOffsets;
|
||||
CRITICAL_SECTION csAnimOverrideBitmask;
|
||||
bool m_bCorruptSaveDeleted;
|
||||
|
||||
|
|
@ -845,6 +847,9 @@ public:
|
|||
vector<ModelPart *> * SetAdditionalSkinBoxes(DWORD dwSkinID, vector<SKIN_BOX *> *pvSkinBoxA);
|
||||
vector<ModelPart *> *GetAdditionalModelParts(DWORD dwSkinID);
|
||||
vector<SKIN_BOX *> *GetAdditionalSkinBoxes(DWORD dwSkinID);
|
||||
void SetSkinOffsets(DWORD dwSkinID, SKIN_OFFSET *SkinOffsetA, DWORD dwSkinOffsetC);
|
||||
vector<SKIN_OFFSET *> * SetSkinOffsets(DWORD dwSkinID, vector<SKIN_OFFSET *> *pvSkinOffsetA);
|
||||
vector<SKIN_OFFSET *> *GetModelOffsets(DWORD dwSkinID);
|
||||
void SetAnimOverrideBitmask(DWORD dwSkinID,unsigned int uiAnimOverrideBitmask);
|
||||
unsigned int GetAnimOverrideBitmask(DWORD dwSkinID);
|
||||
|
||||
|
|
@ -875,6 +880,7 @@ private:
|
|||
// vector of additional skin model parts, indexed by the skin texture id
|
||||
unordered_map<DWORD, vector<ModelPart *> *> m_AdditionalModelParts;
|
||||
unordered_map<DWORD, vector<SKIN_BOX *> *> m_AdditionalSkinBoxes;
|
||||
unordered_map<DWORD, vector<SKIN_OFFSET *> *> m_SkinOffsets;
|
||||
unordered_map<DWORD, unsigned int> m_AnimOverrides;
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -110,7 +110,7 @@ void DLCSkinFile::addParameter(DLCManager::EDLCParameterType type, const wstring
|
|||
break;
|
||||
case DLCManager::e_DLCParamType_Box:
|
||||
{
|
||||
WCHAR wchBodyPart[11];
|
||||
WCHAR wchBodyPart[10];
|
||||
SKIN_BOX *pSkinBox = new SKIN_BOX;
|
||||
ZeroMemory(pSkinBox,sizeof(SKIN_BOX));
|
||||
|
||||
|
|
@ -118,7 +118,7 @@ void DLCSkinFile::addParameter(DLCManager::EDLCParameterType type, const wstring
|
|||
// 4J Stu - The Xbox version used swscanf_s which isn't available in GCC.
|
||||
swscanf(value.c_str(), L"%10ls%f%f%f%f%f%f%f%f%f%f%f", wchBodyPart,
|
||||
#else
|
||||
swscanf_s(value.c_str(), L"%9ls%f%f%f%f%f%f%f%f%f%f%f", wchBodyPart,11,
|
||||
swscanf_s(value.c_str(), L"%9ls%f%f%f%f%f%f%f%f%f%f%f", wchBodyPart,10,
|
||||
#endif
|
||||
&pSkinBox->fX,
|
||||
&pSkinBox->fY,
|
||||
|
|
@ -231,18 +231,31 @@ void DLCSkinFile::addParameter(DLCManager::EDLCParameterType type, const wstring
|
|||
break;
|
||||
case DLCManager::e_DLCParamType_Offset:
|
||||
{
|
||||
WCHAR wchBodyPart[2];
|
||||
WCHAR wchBodyPart[10];
|
||||
wchar_t wchDirection[2];
|
||||
SKIN_OFFSET *pSkinOffset = new SKIN_OFFSET;
|
||||
ZeroMemory(pSkinOffset,sizeof(SKIN_OFFSET));
|
||||
|
||||
|
||||
#ifdef __PS3__
|
||||
// 4J Stu - The Xbox version used swscanf_s which isn't available in GCC.
|
||||
swscanf(value.c_str(), L"%10ls%f%f", wchBodyPart,
|
||||
swscanf(value.c_str(), L"%10ls%2ls%f", wchBodyPart,
|
||||
#else
|
||||
swscanf_s(value.c_str(), L"%9ls%f%f", wchBodyPart,2,
|
||||
swscanf_s(value.c_str(), L"%9ls%2ls%f", wchBodyPart,10, wchDirection,2,
|
||||
#endif
|
||||
&pSkinOffset->fD,
|
||||
&pSkinOffset->fO);
|
||||
|
||||
if(wcscmp(wchDirection,L"X")==0)
|
||||
{
|
||||
pSkinOffset->fD=eOffsetDirection_X;
|
||||
}
|
||||
else if (wcscmp(wchDirection,L"Y")==0)
|
||||
{
|
||||
pSkinOffset->fD=eOffsetDirection_Y;
|
||||
}
|
||||
else if(wcscmp(wchDirection,L"Z")==0)
|
||||
{
|
||||
pSkinOffset->fD=eOffsetDirection_Z;
|
||||
}
|
||||
|
||||
if(wcscmp(wchBodyPart,L"HEAD")==0)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -132,6 +132,7 @@ void UIControl_PlayerSkinPreview::SetTexture(const wstring &url, TEXTURE_NAME ba
|
|||
}
|
||||
|
||||
m_pvAdditionalModelParts=app.GetAdditionalModelParts(app.getSkinIdFromPath(m_customTextureUrl));
|
||||
m_pvModelOffsets=app.GetModelOffsets(app.getSkinIdFromPath(m_customTextureUrl));
|
||||
}
|
||||
|
||||
void UIControl_PlayerSkinPreview::SetFacing(ESkinPreviewFacing facing, bool bAnimate /*= false*/)
|
||||
|
|
@ -365,7 +366,7 @@ void UIControl_PlayerSkinPreview::render(EntityRenderer *renderer, double x, dou
|
|||
glEnable(GL_ALPHA_TEST);
|
||||
|
||||
//model->prepareMobModel(mob, wp, ws, a);
|
||||
model->render(nullptr, wp, ws, bob, headRot - bodyRot, headRotx, _scale, true);
|
||||
model->render(nullptr, wp, ws, bob, headRot - bodyRot, headRotx, _scale, true, m_pvModelOffsets);
|
||||
/*for (int i = 0; i < MAX_ARMOR_LAYERS; i++)
|
||||
{
|
||||
if (prepareArmor(mob, i, a))
|
||||
|
|
|
|||
|
|
@ -53,6 +53,7 @@ private:
|
|||
ESkinPreviewAnimations m_currentAnimation;
|
||||
//vector<Model::SKIN_BOX *> *m_pvAdditionalBoxes;
|
||||
vector<ModelPart *> *m_pvAdditionalModelParts;
|
||||
vector<SKIN_OFFSET *> *m_pvModelOffsets;
|
||||
public:
|
||||
enum ESkinPreviewFacing
|
||||
{
|
||||
|
|
|
|||
|
|
@ -59,6 +59,7 @@ UIScene_SkinSelectMenu::UIScene_SkinSelectMenu(int iPad, void *initData, UILayer
|
|||
m_selectedSkinPath = L"";
|
||||
m_selectedCapePath = L"";
|
||||
m_vAdditionalSkinBoxes = nullptr;
|
||||
m_vSkinOffsets = nullptr;
|
||||
|
||||
m_bSlidingSkins = false;
|
||||
m_bAnimatingMove = false;
|
||||
|
|
@ -662,6 +663,7 @@ void UIScene_SkinSelectMenu::handleSkinIndexChanged()
|
|||
m_selectedSkinPath = skinFile->getPath();
|
||||
m_selectedCapePath = skinFile->getParameterAsString(DLCManager::e_DLCParamType_Cape);
|
||||
m_vAdditionalSkinBoxes = skinFile->getAdditionalBoxes();
|
||||
m_vSkinOffsets = skinFile->getOffsets();
|
||||
|
||||
skinName = skinFile->getParameterAsString( DLCManager::e_DLCParamType_DisplayName );
|
||||
skinOrigin = skinFile->getParameterAsString( DLCManager::e_DLCParamType_ThemeName );
|
||||
|
|
@ -684,6 +686,7 @@ void UIScene_SkinSelectMenu::handleSkinIndexChanged()
|
|||
m_selectedSkinPath = L"";
|
||||
m_selectedCapePath = L"";
|
||||
m_vAdditionalSkinBoxes = nullptr;
|
||||
m_vSkinOffsets = nullptr;
|
||||
|
||||
switch(m_packIndex)
|
||||
{
|
||||
|
|
@ -726,6 +729,7 @@ void UIScene_SkinSelectMenu::handleSkinIndexChanged()
|
|||
m_selectedSkinPath = skinFile->getPath();
|
||||
m_selectedCapePath = skinFile->getParameterAsString(DLCManager::e_DLCParamType_Cape);
|
||||
m_vAdditionalSkinBoxes = skinFile->getAdditionalBoxes();
|
||||
m_vSkinOffsets = skinFile->getOffsets();
|
||||
|
||||
skinName = skinFile->getParameterAsString( DLCManager::e_DLCParamType_DisplayName );
|
||||
skinOrigin = skinFile->getParameterAsString( DLCManager::e_DLCParamType_ThemeName );
|
||||
|
|
@ -773,6 +777,17 @@ void UIScene_SkinSelectMenu::handleSkinIndexChanged()
|
|||
pAdditionalModelParts = app.SetAdditionalSkinBoxes(skinFile->getSkinID(),m_vAdditionalSkinBoxes);
|
||||
}
|
||||
}
|
||||
|
||||
if(m_vSkinOffsets && m_vSkinOffsets->size()!=0)
|
||||
{
|
||||
// add the boxes to the humanoid model, but only if we've not done this already
|
||||
|
||||
vector<SKIN_OFFSET *> *pModelOffsets = app.GetModelOffsets(skinFile->getSkinID());
|
||||
if(pModelOffsets==nullptr)
|
||||
{
|
||||
pModelOffsets = app.SetSkinOffsets(skinFile->getSkinID(),m_vSkinOffsets);
|
||||
}
|
||||
}
|
||||
|
||||
if(skinFile!=nullptr)
|
||||
{
|
||||
|
|
@ -790,6 +805,7 @@ void UIScene_SkinSelectMenu::handleSkinIndexChanged()
|
|||
wstring otherSkinPath = L"";
|
||||
wstring otherCapePath = L"";
|
||||
vector<SKIN_BOX *> *othervAdditionalSkinBoxes=nullptr;
|
||||
vector<SKIN_OFFSET *> *othervSkinOffsets=nullptr;
|
||||
wchar_t chars[256];
|
||||
|
||||
// turn off all displays
|
||||
|
|
@ -844,6 +860,7 @@ void UIScene_SkinSelectMenu::handleSkinIndexChanged()
|
|||
otherSkinPath = skinFile->getPath();
|
||||
otherCapePath = skinFile->getParameterAsString(DLCManager::e_DLCParamType_Cape);
|
||||
othervAdditionalSkinBoxes = skinFile->getAdditionalBoxes();
|
||||
othervSkinOffsets = skinFile->getOffsets();
|
||||
backupTexture = TN_MOB_CHAR;
|
||||
}
|
||||
else
|
||||
|
|
@ -851,6 +868,7 @@ void UIScene_SkinSelectMenu::handleSkinIndexChanged()
|
|||
otherSkinPath = L"";
|
||||
otherCapePath = L"";
|
||||
othervAdditionalSkinBoxes=nullptr;
|
||||
othervSkinOffsets=nullptr;
|
||||
switch(m_packIndex)
|
||||
{
|
||||
case SKIN_SELECT_PACK_DEFAULT:
|
||||
|
|
@ -870,6 +888,7 @@ void UIScene_SkinSelectMenu::handleSkinIndexChanged()
|
|||
otherSkinPath = skinFile->getPath();
|
||||
otherCapePath = skinFile->getParameterAsString(DLCManager::e_DLCParamType_Cape);
|
||||
othervAdditionalSkinBoxes = skinFile->getAdditionalBoxes();
|
||||
othervSkinOffsets = skinFile->getOffsets();
|
||||
backupTexture = TN_MOB_CHAR;
|
||||
}
|
||||
}
|
||||
|
|
@ -887,6 +906,14 @@ void UIScene_SkinSelectMenu::handleSkinIndexChanged()
|
|||
pAdditionalModelParts = app.SetAdditionalSkinBoxes(skinFile->getSkinID(),othervAdditionalSkinBoxes);
|
||||
}
|
||||
}
|
||||
if(othervSkinOffsets && othervSkinOffsets->size()!=0)
|
||||
{
|
||||
vector<SKIN_OFFSET *> *pModelOffsets = app.GetModelOffsets(skinFile->getSkinID());
|
||||
if(pModelOffsets==nullptr)
|
||||
{
|
||||
pModelOffsets = app.SetSkinOffsets(skinFile->getSkinID(),othervSkinOffsets);
|
||||
}
|
||||
}
|
||||
// 4J-PB - anim override needs set before SetTexture
|
||||
if(skinFile!=nullptr)
|
||||
{
|
||||
|
|
@ -915,6 +942,7 @@ void UIScene_SkinSelectMenu::handleSkinIndexChanged()
|
|||
otherSkinPath = skinFile->getPath();
|
||||
otherCapePath = skinFile->getParameterAsString(DLCManager::e_DLCParamType_Cape);
|
||||
othervAdditionalSkinBoxes = skinFile->getAdditionalBoxes();
|
||||
othervSkinOffsets = skinFile->getOffsets();
|
||||
backupTexture = TN_MOB_CHAR;
|
||||
}
|
||||
else
|
||||
|
|
@ -922,6 +950,7 @@ void UIScene_SkinSelectMenu::handleSkinIndexChanged()
|
|||
otherSkinPath = L"";
|
||||
otherCapePath = L"";
|
||||
othervAdditionalSkinBoxes=nullptr;
|
||||
othervSkinOffsets=nullptr;
|
||||
switch(m_packIndex)
|
||||
{
|
||||
case SKIN_SELECT_PACK_DEFAULT:
|
||||
|
|
@ -941,6 +970,7 @@ void UIScene_SkinSelectMenu::handleSkinIndexChanged()
|
|||
otherSkinPath = skinFile->getPath();
|
||||
otherCapePath = skinFile->getParameterAsString(DLCManager::e_DLCParamType_Cape);
|
||||
othervAdditionalSkinBoxes = skinFile->getAdditionalBoxes();
|
||||
othervSkinOffsets = skinFile->getOffsets();
|
||||
backupTexture = TN_MOB_CHAR;
|
||||
}
|
||||
}
|
||||
|
|
@ -958,6 +988,14 @@ void UIScene_SkinSelectMenu::handleSkinIndexChanged()
|
|||
pAdditionalModelParts = app.SetAdditionalSkinBoxes(skinFile->getSkinID(),othervAdditionalSkinBoxes);
|
||||
}
|
||||
}
|
||||
if(othervSkinOffsets && othervSkinOffsets->size()!=0)
|
||||
{
|
||||
vector<SKIN_OFFSET *> *pModelOffsets = app.GetModelOffsets(skinFile->getSkinID());
|
||||
if(pModelOffsets==nullptr)
|
||||
{
|
||||
pModelOffsets = app.SetSkinOffsets(skinFile->getSkinID(),othervSkinOffsets);
|
||||
}
|
||||
}
|
||||
// 4J-PB - anim override needs set before SetTexture
|
||||
if(skinFile)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -104,6 +104,7 @@ private:
|
|||
DWORD m_originalSkinId;
|
||||
wstring m_currentSkinPath, m_selectedSkinPath, m_selectedCapePath;
|
||||
vector<SKIN_BOX *> *m_vAdditionalSkinBoxes;
|
||||
vector<SKIN_OFFSET *> *m_vSkinOffsets;
|
||||
|
||||
bool m_bSlidingSkins, m_bAnimatingMove;
|
||||
ESkinSelectNavigation m_currentNavigation;
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@
|
|||
#include "..\..\Textures.h"
|
||||
//#include "..\..\Xbox\DLC\DLCSkinFile.h"
|
||||
#include "..\..\Model.h"
|
||||
#include "..\..\SkinOffset.h"
|
||||
|
||||
using namespace std;
|
||||
|
||||
|
|
@ -103,4 +104,5 @@ private:
|
|||
ESkinPreviewAnimations m_currentAnimation;
|
||||
//vector<Model::SKIN_BOX *> *m_pvAdditionalBoxes;
|
||||
vector<ModelPart *> *m_pvAdditionalModelParts;
|
||||
vector<SKIN_OFFSET *> *m_pvModelOffsets;
|
||||
};
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
#include "stdafx.h"
|
||||
#include "HumanoidModel.h"
|
||||
#include "..\Minecraft.World\Mth.h"
|
||||
#include "..\Minecraft.World\Entity.h"
|
||||
#include "..\Minecraft.World\Player.h"
|
||||
#include "ModelPart.h"
|
||||
|
||||
// 4J added
|
||||
|
|
@ -119,7 +119,7 @@ ModelPart * HumanoidModel::AddOrRetrievePart(SKIN_BOX *pBox)
|
|||
return pNewBox;
|
||||
}
|
||||
|
||||
void HumanoidModel::_init(float g, float yOffset, int texWidth, int texHeight, bool slimHands, bool isArmor)
|
||||
void HumanoidModel::_init(float g, float yOffset, int texWidth, int texHeight, bool slim, bool isArmor)
|
||||
{
|
||||
this->texWidth = texWidth;
|
||||
this->texHeight = texHeight;
|
||||
|
|
@ -210,12 +210,12 @@ void HumanoidModel::_init(float g, float yOffset, int texWidth, int texHeight, b
|
|||
sleeve0 = new ModelPart(this, 24 + 16, 32);
|
||||
sleeve1 = new ModelPart(this, 32 + 16, 48);
|
||||
|
||||
if (slimHands == false)
|
||||
if (!slim)
|
||||
{
|
||||
sleeve0->addHumanoidBox(-3, -2, -2, 4, 12, 4, g + 0.25); // Sleeve0
|
||||
sleeve1->addHumanoidBox(-1, -2, -2, 4, 12, 4, g + 0.25); // Sleeve1
|
||||
}
|
||||
else if (slimHands == true)
|
||||
else if (slim)
|
||||
{
|
||||
sleeve0->addHumanoidBox(-2, -2, -2, 3, 12, 4, g + 0.25); // Sleeve0 Slim
|
||||
sleeve1->addHumanoidBox(-1, -2, -2, 3, 12, 4, g + 0.25); // Sleeve1 Slim
|
||||
|
|
@ -231,12 +231,12 @@ void HumanoidModel::_init(float g, float yOffset, int texWidth, int texHeight, b
|
|||
arm1->bMirror = true;
|
||||
}
|
||||
|
||||
if (slimHands == false)
|
||||
if (!slim)
|
||||
{
|
||||
arm0->addHumanoidBox(-3, -2, -2, 4, 12, 4, g); // Arm0
|
||||
arm1->addHumanoidBox(-1, -2, -2, 4, 12, 4, g); // Arm1
|
||||
}
|
||||
else if (slimHands == true)
|
||||
else if (slim)
|
||||
{
|
||||
arm0->addHumanoidBox(-2, -2, -2, 3, 12, 4, g); // Arm0 Slim
|
||||
arm1->addHumanoidBox(-1, -2, -2, 3, 12, 4, g); // Arm1 Slim
|
||||
|
|
@ -350,12 +350,12 @@ HumanoidModel::HumanoidModel(float g, float yOffset, int texWidth, int texHeight
|
|||
_init(g,yOffset,texWidth,texHeight, false, false);
|
||||
}
|
||||
|
||||
HumanoidModel::HumanoidModel(float g, float yOffset, int texWidth, int texHeight, bool slimHands) : Model()
|
||||
HumanoidModel::HumanoidModel(float g, float yOffset, int texWidth, int texHeight, bool slim) : Model()
|
||||
{
|
||||
_init(g,yOffset,texWidth,texHeight, slimHands, false);
|
||||
_init(g,yOffset,texWidth,texHeight, slim, false);
|
||||
}
|
||||
|
||||
void HumanoidModel::render(shared_ptr<Entity> entity, float time, float r, float bob, float yRot, float xRot, float scale, bool usecompiled)
|
||||
void HumanoidModel::render(shared_ptr<Entity> entity, float time, float r, float bob, float yRot, float xRot, float scale, bool usecompiled, vector<SKIN_OFFSET *> *modelOffsets)
|
||||
{
|
||||
if(entity != nullptr)
|
||||
{
|
||||
|
|
@ -385,12 +385,100 @@ void HumanoidModel::render(shared_ptr<Entity> entity, float time, float r, float
|
|||
}
|
||||
else
|
||||
{
|
||||
shared_ptr<Player> player = dynamic_pointer_cast<Player>(entity);
|
||||
vector<float> headOffsets = {0, 0, 0};
|
||||
vector<float> bodyOffsets = {0, 0, 0};
|
||||
vector<float> arm0Offsets = {0, 0, 0};
|
||||
vector<float> arm1Offsets = {0, 0, 0};
|
||||
vector<float> leg0Offsets = {0, 0, 0};
|
||||
vector<float> leg1Offsets = {0, 0, 0};
|
||||
vector<SKIN_OFFSET *>* pModelOffsets = nullptr;
|
||||
if (player != nullptr)
|
||||
pModelOffsets = player->GetModelOffsets();
|
||||
else if (modelOffsets != nullptr)
|
||||
pModelOffsets = modelOffsets;
|
||||
if (pModelOffsets != nullptr)
|
||||
{
|
||||
for( SKIN_OFFSET *pModelOffset : *pModelOffsets )
|
||||
{
|
||||
switch (pModelOffset->ePart)
|
||||
{
|
||||
case eBodyOffset_Head:
|
||||
if(pModelOffset->fD == 1)
|
||||
headOffsets[0] = pModelOffset->fO;
|
||||
else if(pModelOffset->fD == 2)
|
||||
headOffsets[1] = pModelOffset->fO;
|
||||
else if(pModelOffset->fD == 3)
|
||||
headOffsets[2] = pModelOffset->fO;
|
||||
break;
|
||||
case eBodyOffset_Body:
|
||||
if(pModelOffset->fD == 1)
|
||||
bodyOffsets[0] = pModelOffset->fO;
|
||||
else if(pModelOffset->fD == 2)
|
||||
bodyOffsets[1] = pModelOffset->fO;
|
||||
else if(pModelOffset->fD == 3)
|
||||
bodyOffsets[2] = pModelOffset->fO;
|
||||
break;
|
||||
case eBodyOffset_Arm0:
|
||||
if(pModelOffset->fD == 1)
|
||||
arm0Offsets[0] = pModelOffset->fO;
|
||||
else if(pModelOffset->fD == 2)
|
||||
arm0Offsets[1] = pModelOffset->fO;
|
||||
else if(pModelOffset->fD == 3)
|
||||
arm0Offsets[2] = pModelOffset->fO;
|
||||
break;
|
||||
case eBodyOffset_Arm1:
|
||||
if(pModelOffset->fD == 1)
|
||||
arm1Offsets[0] = pModelOffset->fO;
|
||||
else if(pModelOffset->fD == 2)
|
||||
arm1Offsets[1] = pModelOffset->fO;
|
||||
else if(pModelOffset->fD == 3)
|
||||
arm1Offsets[2] = pModelOffset->fO;
|
||||
break;
|
||||
case eBodyOffset_Leg0:
|
||||
if(pModelOffset->fD == 1)
|
||||
leg0Offsets[0] = pModelOffset->fO;
|
||||
else if(pModelOffset->fD == 2)
|
||||
leg0Offsets[1] = pModelOffset->fO;
|
||||
else if(pModelOffset->fD == 3)
|
||||
leg0Offsets[2] = pModelOffset->fO;
|
||||
break;
|
||||
case eBodyOffset_Leg1:
|
||||
if(pModelOffset->fD == 1)
|
||||
leg1Offsets[0] = pModelOffset->fO;
|
||||
else if(pModelOffset->fD == 2)
|
||||
leg1Offsets[1] = pModelOffset->fO;
|
||||
else if(pModelOffset->fD == 3)
|
||||
leg1Offsets[2] = pModelOffset->fO;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
glPushMatrix();
|
||||
glTranslatef(headOffsets[0]/16.0f, headOffsets[1]/16.0f, headOffsets[2]/16.0f);
|
||||
head->render(scale, usecompiled,(m_uiAnimOverrideBitmask&(1<<eAnim_DisableRenderHead))>0&&(!(m_uiAnimOverrideBitmask&(1<<eAnim_RenderArmorHead))>0||!m_isArmor));
|
||||
glPopMatrix();
|
||||
glPushMatrix();
|
||||
glTranslatef(bodyOffsets[0]/16.0f, bodyOffsets[1]/16.0f, bodyOffsets[2]/16.0f);
|
||||
body->render(scale, usecompiled,(m_uiAnimOverrideBitmask&(1<<eAnim_DisableRenderTorso))>0&&(!(m_uiAnimOverrideBitmask&(1<<eAnim_RenderArmorTorso))>0||!m_isArmor));
|
||||
glPopMatrix();
|
||||
glPushMatrix();
|
||||
glTranslatef(arm0Offsets[0]/16.0f, arm0Offsets[1]/16.0f, arm0Offsets[2]/16.0f);
|
||||
arm0->render(scale, usecompiled,(m_uiAnimOverrideBitmask&(1<<eAnim_DisableRenderArm0))>0&&(!(m_uiAnimOverrideBitmask&(1<<eAnim_RenderArmorArm0))>0||!m_isArmor));
|
||||
glPopMatrix();
|
||||
glPushMatrix();
|
||||
glTranslatef(arm1Offsets[0]/16.0f, arm1Offsets[1]/16.0f, arm1Offsets[2]/16.0f);
|
||||
arm1->render(scale, usecompiled,(m_uiAnimOverrideBitmask&(1<<eAnim_DisableRenderArm1))>0&&(!(m_uiAnimOverrideBitmask&(1<<eAnim_RenderArmorArm1))>0||!m_isArmor));
|
||||
glPopMatrix();
|
||||
glPushMatrix();
|
||||
glTranslatef(leg0Offsets[0]/16.0f, leg0Offsets[1]/16.0f, leg0Offsets[2]/16.0f);
|
||||
leg0->render(scale, usecompiled,(m_uiAnimOverrideBitmask&(1<<eAnim_DisableRenderLeg0))>0&&(!(m_uiAnimOverrideBitmask&(1<<eAnim_RenderArmorLeg0))>0||!m_isArmor));
|
||||
glPopMatrix();
|
||||
glPushMatrix();
|
||||
glTranslatef(leg1Offsets[0]/16.0f, leg1Offsets[1]/16.0f, leg1Offsets[2]/16.0f);
|
||||
leg1->render(scale, usecompiled,(m_uiAnimOverrideBitmask&(1<<eAnim_DisableRenderLeg1))>0&&(!(m_uiAnimOverrideBitmask&(1<<eAnim_RenderArmorLeg1))>0||!m_isArmor));
|
||||
glPopMatrix();
|
||||
hair->render(scale, usecompiled,(m_uiAnimOverrideBitmask&(1<<eAnim_DisableRenderHair))>0);
|
||||
if (jacket != 0)
|
||||
jacket->render(scale, usecompiled,(m_uiAnimOverrideBitmask&(1<<eAnim_DisableRenderJacket))>0);
|
||||
|
|
@ -687,6 +775,7 @@ void HumanoidModel::setupAnim(float time, float r, float bob, float yRot, float
|
|||
arm0->xRot += ((float) (Mth::sin(bob * 0.067f)) * 0.05f);
|
||||
arm1->xRot -= ((float) (Mth::sin(bob * 0.067f)) * 0.05f);
|
||||
}
|
||||
|
||||
if (jacket != 0)
|
||||
{
|
||||
jacket->x = body->x;
|
||||
|
|
|
|||
|
|
@ -77,13 +77,13 @@ public:
|
|||
(1<<HumanoidModel::eAnim_DisableRenderJacket);
|
||||
|
||||
|
||||
void _init(float g, float yOffset, int texWidth, int texHeight, bool slimHands, bool isArmor); // 4J added
|
||||
void _init(float g, float yOffset, int texWidth, int texHeight, bool slim, bool isArmor); // 4J added
|
||||
HumanoidModel();
|
||||
HumanoidModel(float g);
|
||||
HumanoidModel(float g, bool isArmor);
|
||||
HumanoidModel(float g, float yOffset, int texWidth, int texHeight);
|
||||
HumanoidModel(float g, float yOffset, int texWidth, int texHeight, bool slimHands);
|
||||
virtual void render(shared_ptr<Entity> entity, float time, float r, float bob, float yRot, float xRot, float scale, bool usecompiled);
|
||||
HumanoidModel(float g, float yOffset, int texWidth, int texHeight, bool slim);
|
||||
virtual void render(shared_ptr<Entity> entity, float time, float r, float bob, float yRot, float xRot, float scale, bool usecompiled, vector<SKIN_OFFSET *> *modelOffsets = nullptr);
|
||||
virtual void setupAnim(float time, float r, float bob, float yRot, float xRot, float scale, shared_ptr<Entity> entity, unsigned int uiBitmaskOverrideAnim = 0);
|
||||
void renderHair(float scale, bool usecompiled);
|
||||
void renderEars(float scale, bool usecompiled);
|
||||
|
|
|
|||
|
|
@ -1696,3 +1696,7 @@ void LocalPlayer::SetPlayerAdditionalModelParts(vector<ModelPart *>pAdditionalMo
|
|||
{
|
||||
m_pAdditionalModelParts=pAdditionalModelParts;
|
||||
}
|
||||
void LocalPlayer::SetPlayerModelOffsets(vector<SKIN_OFFSET *>pModelOffsets)
|
||||
{
|
||||
m_pModelOffsets=pModelOffsets;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -211,9 +211,11 @@ public:
|
|||
|
||||
virtual void handleCollectItem(shared_ptr<ItemInstance> item);
|
||||
void SetPlayerAdditionalModelParts(vector<ModelPart *>pAdditionalModelParts);
|
||||
void SetPlayerModelOffsets(vector<SKIN_OFFSET *>pModelOffsets);
|
||||
|
||||
private:
|
||||
vector<ModelPart *> m_pAdditionalModelParts;
|
||||
vector<SKIN_OFFSET *> m_pModelOffsets;
|
||||
};
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -891,9 +891,10 @@ void PlayerConnection::handleTextureAndGeometry(shared_ptr<TextureAndGeometryPac
|
|||
{
|
||||
// we don't have the dlc skin, so retrieve the data from the app store
|
||||
vector<SKIN_BOX *> *pvSkinBoxes = app.GetAdditionalSkinBoxes(packet->dwSkinID);
|
||||
vector<SKIN_OFFSET *> *pvSkinOffsets = app.GetModelOffsets(packet->dwSkinID);
|
||||
unsigned int uiAnimOverrideBitmask= app.GetAnimOverrideBitmask(packet->dwSkinID);
|
||||
|
||||
send(std::make_shared<TextureAndGeometryPacket>(packet->textureName, pbData, dwTextureBytes, pvSkinBoxes, uiAnimOverrideBitmask));
|
||||
send(std::make_shared<TextureAndGeometryPacket>(packet->textureName, pbData, dwTextureBytes, pvSkinBoxes, pvSkinOffsets, uiAnimOverrideBitmask));
|
||||
}
|
||||
}
|
||||
else
|
||||
|
|
@ -917,6 +918,14 @@ void PlayerConnection::handleTextureAndGeometry(shared_ptr<TextureAndGeometryPac
|
|||
#endif
|
||||
app.SetAdditionalSkinBoxes(packet->dwSkinID,packet->BoxDataA,packet->dwBoxC);
|
||||
}
|
||||
// add the offsets to the app list
|
||||
if(packet->dwOffsetC!=0)
|
||||
{
|
||||
#ifndef _CONTENT_PACKAGE
|
||||
wprintf(L"Adding skin offsets for skin id %X, offset count %d\n",packet->dwSkinID,packet->dwOffsetC);
|
||||
#endif
|
||||
app.SetSkinOffsets(packet->dwSkinID,packet->OffsetDataA,packet->dwOffsetC);
|
||||
}
|
||||
// Add the anim override
|
||||
app.SetAnimOverrideBitmask(packet->dwSkinID,packet->uiAnimOverrideBitmask);
|
||||
|
||||
|
|
@ -966,9 +975,10 @@ void PlayerConnection::handleTextureAndGeometryReceived(const wstring &textureNa
|
|||
// get the data from the app
|
||||
DWORD dwSkinID = app.getSkinIdFromPath(textureName);
|
||||
vector<SKIN_BOX *> *pvSkinBoxes = app.GetAdditionalSkinBoxes(dwSkinID);
|
||||
vector<SKIN_OFFSET *> *pvSkinOffsets = app.GetModelOffsets(dwSkinID);
|
||||
unsigned int uiAnimOverrideBitmask= app.GetAnimOverrideBitmask(dwSkinID);
|
||||
|
||||
send(std::make_shared<TextureAndGeometryPacket>(textureName, pbData, dwTextureBytes, pvSkinBoxes, uiAnimOverrideBitmask));
|
||||
send(std::make_shared<TextureAndGeometryPacket>(textureName, pbData, dwTextureBytes, pvSkinBoxes, pvSkinOffsets, uiAnimOverrideBitmask));
|
||||
}
|
||||
m_texturesRequested.erase(it);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -167,8 +167,8 @@ void PlayerRenderer::render(shared_ptr<Entity> _mob, double x, double y, double
|
|||
if(mob == nullptr) return;
|
||||
if(mob->hasInvisiblePrivilege()) return;
|
||||
|
||||
if (mob != nullptr && humanoidModelClassic != nullptr && (mob->getCustomSkin() == 18 || mob->getAnimOverrideBitmask()&(1<<HumanoidModel::eAnim_ClassicModel))) resModel = humanoidModelClassic;
|
||||
else if (mob != nullptr && humanoidModelSlim != nullptr && ((mob->getCustomSkin() >= 8 && mob->getCustomSkin() <= 17) || mob->getAnimOverrideBitmask()&(1<<HumanoidModel::eAnim_SlimModel))) resModel = humanoidModelSlim;
|
||||
if (humanoidModelClassic != nullptr && (mob->getCustomSkin() == 18 || mob->getAnimOverrideBitmask()&(1<<HumanoidModel::eAnim_ClassicModel))) resModel = humanoidModelClassic;
|
||||
else if (humanoidModelSlim != nullptr && ((mob->getCustomSkin() >= 8 && mob->getCustomSkin() <= 17) || mob->getAnimOverrideBitmask()&(1<<HumanoidModel::eAnim_SlimModel))) resModel = humanoidModelSlim;
|
||||
else resModel = humanoidModel;
|
||||
|
||||
shared_ptr<ItemInstance> item = mob->inventory->getSelected();
|
||||
|
|
@ -274,6 +274,7 @@ void PlayerRenderer::render(shared_ptr<Entity> _mob, double x, double y, double
|
|||
pModelPart->visible=false;
|
||||
}
|
||||
}
|
||||
|
||||
armorParts1->bowAndArrow = armorParts2->bowAndArrow = resModel->bowAndArrow = false;
|
||||
armorParts1->sneaking = armorParts2->sneaking = resModel->sneaking = false;
|
||||
armorParts1->holdingRightHand = armorParts2->holdingRightHand = resModel->holdingRightHand = 0;
|
||||
|
|
|
|||
|
|
@ -31,10 +31,17 @@ enum eBodyOffset
|
|||
|
||||
};
|
||||
|
||||
enum eOffsetDirection
|
||||
{
|
||||
eOffsetDirection_Unknown=0,
|
||||
eOffsetDirection_X,
|
||||
eOffsetDirection_Y,
|
||||
eOffsetDirection_Z
|
||||
};
|
||||
|
||||
typedef struct
|
||||
{
|
||||
eBodyOffset ePart;
|
||||
string fD;
|
||||
float fO;
|
||||
float fD, fO;
|
||||
}
|
||||
SKIN_OFFSET;
|
||||
|
|
|
|||
|
|
@ -2128,7 +2128,12 @@ unsigned int Entity::getAnimOverrideBitmask()
|
|||
(1<<HumanoidModel::eAnim_DisableRenderTorso) |
|
||||
(1<<HumanoidModel::eAnim_DisableRenderLeg0) |
|
||||
(1<<HumanoidModel::eAnim_DisableRenderLeg1) |
|
||||
(1<<HumanoidModel::eAnim_DisableRenderHair);
|
||||
(1<<HumanoidModel::eAnim_DisableRenderHair) |
|
||||
(1<<HumanoidModel::eAnim_DisableRenderSleeve1) |
|
||||
(1<<HumanoidModel::eAnim_DisableRenderSleeve0) |
|
||||
(1<<HumanoidModel::eAnim_DisableRenderPants1) |
|
||||
(1<<HumanoidModel::eAnim_DisableRenderPants0) |
|
||||
(1<<HumanoidModel::eAnim_DisableRenderJacket);
|
||||
|
||||
if((m_uiAnimOverrideBitmask & HumanoidModel::m_staticBitmaskIgnorePlayerCustomAnimSetting)!=0)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -100,6 +100,9 @@ void Player::_init()
|
|||
m_ppAdditionalModelParts=nullptr;
|
||||
m_bCheckedForModelParts=false;
|
||||
m_bCheckedDLCForModelParts=false;
|
||||
m_ppModelOffsets=nullptr;
|
||||
m_bCheckedForModelOffsets=false;
|
||||
m_bCheckedDLCForModelOffsets=false;
|
||||
|
||||
#if defined(__PS3__) || defined(__ORBIS__)
|
||||
m_ePlayerNameValidState=ePlayerNameValid_NotSet;
|
||||
|
|
@ -713,7 +716,10 @@ void Player::setCustomSkin(DWORD skinId)
|
|||
// reset the check for model parts
|
||||
m_bCheckedForModelParts=false;
|
||||
m_bCheckedDLCForModelParts=false;
|
||||
m_bCheckedForModelOffsets=false;
|
||||
m_bCheckedDLCForModelOffsets=false;
|
||||
this->SetAdditionalModelParts(nullptr);
|
||||
this->SetModelOffsets(nullptr);
|
||||
|
||||
|
||||
}
|
||||
|
|
@ -759,6 +765,12 @@ unsigned int Player::getSkinAnimOverrideBitmask(DWORD skinId)
|
|||
return bitmask;
|
||||
}
|
||||
|
||||
vector<SKIN_OFFSET *> *Player::getSkinModelOffsets(DWORD skinId)
|
||||
{
|
||||
vector<SKIN_OFFSET *> *skinOffsets = app.GetModelOffsets(skinId);
|
||||
return skinOffsets;
|
||||
}
|
||||
|
||||
void Player::setXuid(PlayerUID xuid)
|
||||
{
|
||||
m_xuid = xuid;
|
||||
|
|
@ -3148,11 +3160,57 @@ vector<ModelPart *> *Player::GetAdditionalModelParts()
|
|||
return m_ppAdditionalModelParts;
|
||||
}
|
||||
|
||||
vector<SKIN_OFFSET *> *Player::GetModelOffsets()
|
||||
{
|
||||
if(m_ppModelOffsets==nullptr && !m_bCheckedForModelOffsets)
|
||||
{
|
||||
bool hasCustomTexture = !customTextureUrl.empty();
|
||||
bool customTextureIsDefaultSkin = customTextureUrl.substr(0,3).compare(L"def") == 0;
|
||||
|
||||
// see if we can find the parts
|
||||
m_ppModelOffsets=app.GetModelOffsets(m_dwSkinId);
|
||||
|
||||
// If it's a default texture (which has no parts), we have the parts, or we already have the texture (in which case we should have parts if there are any) then we are done
|
||||
if(!hasCustomTexture || customTextureIsDefaultSkin || m_ppModelOffsets != nullptr || app.IsFileInMemoryTextures(customTextureUrl))
|
||||
{
|
||||
m_bCheckedForModelOffsets=true;
|
||||
}
|
||||
if(m_ppModelOffsets == nullptr && !m_bCheckedDLCForModelOffsets)
|
||||
{
|
||||
m_bCheckedDLCForModelOffsets = true;
|
||||
|
||||
// we don't have the data from the dlc skin yet
|
||||
app.DebugPrintf("m_bCheckedForModelOffsets Couldn't get model offsets for skin %X\n",m_dwSkinId);
|
||||
|
||||
// do we have it from the DLC pack?
|
||||
DLCSkinFile *pDLCSkinFile = app.m_dlcManager.getSkinFile(this->customTextureUrl);
|
||||
|
||||
if(pDLCSkinFile!=nullptr)
|
||||
{
|
||||
DWORD dwBoxC=pDLCSkinFile->getOffsetsCount();
|
||||
if(dwBoxC!=0)
|
||||
{
|
||||
app.DebugPrintf("m_bCheckedForModelOffsets Got model offsets from DLCskin for skin %X\n",m_dwSkinId);
|
||||
m_ppModelOffsets=app.SetSkinOffsets(m_dwSkinId,pDLCSkinFile->getOffsets());
|
||||
}
|
||||
|
||||
m_bCheckedForModelOffsets=true;
|
||||
}
|
||||
}
|
||||
}
|
||||
return m_ppModelOffsets;
|
||||
}
|
||||
|
||||
void Player::SetAdditionalModelParts(vector<ModelPart *> *ppAdditionalModelParts)
|
||||
{
|
||||
m_ppAdditionalModelParts=ppAdditionalModelParts;
|
||||
}
|
||||
|
||||
void Player::SetModelOffsets(vector<SKIN_OFFSET *> *ppModelOffsets)
|
||||
{
|
||||
m_ppModelOffsets=ppModelOffsets;
|
||||
}
|
||||
|
||||
#if defined(__PS3__) || defined(__ORBIS__)
|
||||
|
||||
Player::ePlayerNameValidState Player::GetPlayerNameValidState(void)
|
||||
|
|
|
|||
|
|
@ -411,6 +411,7 @@ public:
|
|||
static DWORD getCapeIdFromPath(const wstring &cape);
|
||||
static wstring getCapePathFromId(DWORD capeId);
|
||||
static unsigned int getSkinAnimOverrideBitmask(DWORD skinId);
|
||||
vector<SKIN_OFFSET *> *getSkinModelOffsets(DWORD skinId);
|
||||
|
||||
// 4J Added
|
||||
void setXuid(PlayerUID xuid);
|
||||
|
|
@ -520,6 +521,8 @@ public:
|
|||
|
||||
vector<ModelPart *> *GetAdditionalModelParts();
|
||||
void SetAdditionalModelParts(vector<ModelPart *> *ppAdditionalModelParts);
|
||||
vector<SKIN_OFFSET *> *GetModelOffsets();
|
||||
void SetModelOffsets(vector<SKIN_OFFSET *> *ppModelOffsets);
|
||||
|
||||
#if defined(__PS3__) || defined(__ORBIS__)
|
||||
enum ePlayerNameValidState
|
||||
|
|
@ -536,6 +539,9 @@ private:
|
|||
vector<ModelPart *> *m_ppAdditionalModelParts;
|
||||
bool m_bCheckedForModelParts;
|
||||
bool m_bCheckedDLCForModelParts;
|
||||
vector<SKIN_OFFSET *> *m_ppModelOffsets;
|
||||
bool m_bCheckedForModelOffsets;
|
||||
bool m_bCheckedDLCForModelOffsets;
|
||||
|
||||
#if defined(__PS3__) || defined(__ORBIS__)
|
||||
ePlayerNameValidState m_ePlayerNameValidState; // 4J-PB - to ensure we have the characters for this name in our font, or display a player number instead
|
||||
|
|
|
|||
|
|
@ -12,7 +12,9 @@ TextureAndGeometryPacket::TextureAndGeometryPacket()
|
|||
this->dwTextureBytes = 0;
|
||||
this->pbData = nullptr;
|
||||
this->dwBoxC = 0;
|
||||
this->dwOffsetC = 0;
|
||||
this->BoxDataA = nullptr;
|
||||
this->OffsetDataA = nullptr;
|
||||
uiAnimOverrideBitmask=0;
|
||||
}
|
||||
|
||||
|
|
@ -43,7 +45,9 @@ TextureAndGeometryPacket::TextureAndGeometryPacket(const wstring &textureName, P
|
|||
this->pbData = pbData;
|
||||
this->dwTextureBytes = dwBytes;
|
||||
this->dwBoxC = 0;
|
||||
this->dwOffsetC = 0;
|
||||
this->BoxDataA=nullptr;
|
||||
this->OffsetDataA=nullptr;
|
||||
this->uiAnimOverrideBitmask=0;
|
||||
}
|
||||
|
||||
|
|
@ -62,6 +66,7 @@ TextureAndGeometryPacket::TextureAndGeometryPacket(const wstring &textureName, P
|
|||
this->dwTextureBytes = dwBytes;
|
||||
this->uiAnimOverrideBitmask = pDLCSkinFile->getAnimOverrideBitmask();
|
||||
this->dwBoxC = pDLCSkinFile->getAdditionalBoxesCount();
|
||||
this->dwOffsetC = pDLCSkinFile->getOffsetsCount();
|
||||
if(this->dwBoxC!=0)
|
||||
{
|
||||
this->BoxDataA= new SKIN_BOX [this->dwBoxC];
|
||||
|
|
@ -77,9 +82,24 @@ TextureAndGeometryPacket::TextureAndGeometryPacket(const wstring &textureName, P
|
|||
{
|
||||
this->BoxDataA=nullptr;
|
||||
}
|
||||
if(this->dwOffsetC!=0)
|
||||
{
|
||||
this->OffsetDataA= new SKIN_OFFSET [this->dwOffsetC];
|
||||
vector<SKIN_OFFSET *> *pSkinOffsets=pDLCSkinFile->getOffsets();
|
||||
int iCount=0;
|
||||
|
||||
for(auto& pSkinOffset : *pSkinOffsets)
|
||||
{
|
||||
this->OffsetDataA[iCount++]=*pSkinOffset;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
this->OffsetDataA=nullptr;
|
||||
}
|
||||
}
|
||||
|
||||
TextureAndGeometryPacket::TextureAndGeometryPacket(const wstring &textureName, PBYTE pbData, DWORD dwBytes,vector<SKIN_BOX *> *pvSkinBoxes, unsigned int uiAnimOverrideBitmask)
|
||||
TextureAndGeometryPacket::TextureAndGeometryPacket(const wstring &textureName, PBYTE pbData, DWORD dwBytes, vector<SKIN_BOX *> *pvSkinBoxes, vector<SKIN_OFFSET *> *pvSkinOffsets, unsigned int uiAnimOverrideBitmask)
|
||||
{
|
||||
this->textureName = textureName;
|
||||
|
||||
|
|
@ -109,6 +129,22 @@ TextureAndGeometryPacket::TextureAndGeometryPacket(const wstring &textureName, P
|
|||
this->BoxDataA[iCount++]=*pSkinBox;
|
||||
}
|
||||
}
|
||||
if(pvSkinOffsets==nullptr)
|
||||
{
|
||||
this->dwOffsetC=0;
|
||||
this->OffsetDataA=nullptr;
|
||||
}
|
||||
else
|
||||
{
|
||||
this->dwOffsetC = static_cast<DWORD>(pvSkinOffsets->size());
|
||||
this->OffsetDataA= new SKIN_OFFSET [this->dwOffsetC];
|
||||
int iCount=0;
|
||||
|
||||
for(auto& pSkinOffset : *pvSkinOffsets)
|
||||
{
|
||||
this->OffsetDataA[iCount++]=*pSkinOffset;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
|
@ -148,6 +184,7 @@ void TextureAndGeometryPacket::read(DataInputStream *dis) //throws IOException
|
|||
uiAnimOverrideBitmask = dis->readInt();
|
||||
|
||||
short rawBoxC = dis->readShort();
|
||||
short rawOffsetC = dis->readShort();
|
||||
if (rawBoxC <= 0)
|
||||
{
|
||||
dwBoxC = 0;
|
||||
|
|
@ -160,11 +197,27 @@ void TextureAndGeometryPacket::read(DataInputStream *dis) //throws IOException
|
|||
dwBoxC = 0; // sane limit for skin boxes
|
||||
}
|
||||
}
|
||||
if (rawOffsetC <= 0)
|
||||
{
|
||||
dwOffsetC = 0;
|
||||
}
|
||||
else
|
||||
{
|
||||
dwOffsetC = (DWORD)(unsigned short)rawOffsetC;
|
||||
if (dwOffsetC > 256)
|
||||
{
|
||||
dwOffsetC = 0; // sane limit for skin offsets
|
||||
}
|
||||
}
|
||||
|
||||
if(dwBoxC>0)
|
||||
{
|
||||
this->BoxDataA= new SKIN_BOX [dwBoxC];
|
||||
}
|
||||
if(dwOffsetC>0)
|
||||
{
|
||||
this->OffsetDataA= new SKIN_OFFSET [dwOffsetC];
|
||||
}
|
||||
|
||||
for(DWORD i=0;i<dwBoxC;i++)
|
||||
{
|
||||
|
|
@ -181,6 +234,12 @@ void TextureAndGeometryPacket::read(DataInputStream *dis) //throws IOException
|
|||
this->BoxDataA[i].fM = dis->readFloat();
|
||||
this->BoxDataA[i].fS = dis->readFloat();
|
||||
}
|
||||
for(DWORD i=0;i<dwOffsetC;i++)
|
||||
{
|
||||
this->OffsetDataA[i].ePart = static_cast<eBodyOffset>(dis->readShort());
|
||||
this->OffsetDataA[i].fD = dis->readFloat();
|
||||
this->OffsetDataA[i].fO = dis->readFloat();
|
||||
}
|
||||
}
|
||||
|
||||
void TextureAndGeometryPacket::write(DataOutputStream *dos) //throws IOException
|
||||
|
|
@ -210,6 +269,14 @@ void TextureAndGeometryPacket::write(DataOutputStream *dos) //throws IOException
|
|||
dos->writeFloat(this->BoxDataA[i].fM);
|
||||
dos->writeFloat(this->BoxDataA[i].fS);
|
||||
}
|
||||
|
||||
dos->writeShort(static_cast<short>(dwOffsetC));
|
||||
for(DWORD i=0;i<dwOffsetC;i++)
|
||||
{
|
||||
dos->writeShort(static_cast<short>(this->OffsetDataA[i].ePart));
|
||||
dos->writeFloat(this->OffsetDataA[i].fD);
|
||||
dos->writeFloat(this->OffsetDataA[i].fO);
|
||||
}
|
||||
}
|
||||
|
||||
int TextureAndGeometryPacket::getEstimatedSize()
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@ using namespace std;
|
|||
#include "Packet.h"
|
||||
#include "..\Minecraft.Client\Model.h"
|
||||
#include "..\Minecraft.Client\SkinBox.h"
|
||||
#include "..\Minecraft.Client\SkinOffset.h"
|
||||
|
||||
class DLCSkinFile;
|
||||
|
||||
|
|
@ -15,14 +16,16 @@ public:
|
|||
PBYTE pbData;
|
||||
DWORD dwTextureBytes;
|
||||
SKIN_BOX *BoxDataA;
|
||||
SKIN_OFFSET *OffsetDataA;
|
||||
DWORD dwBoxC;
|
||||
DWORD dwOffsetC;
|
||||
unsigned int uiAnimOverrideBitmask;
|
||||
|
||||
TextureAndGeometryPacket();
|
||||
~TextureAndGeometryPacket();
|
||||
TextureAndGeometryPacket(const wstring &textureName, PBYTE pbData, DWORD dwBytes);
|
||||
TextureAndGeometryPacket(const wstring &textureName, PBYTE pbData, DWORD dwBytes, DLCSkinFile *pDLCSkinFile);
|
||||
TextureAndGeometryPacket(const wstring &textureName, PBYTE pbData, DWORD dwBytes, vector<SKIN_BOX *> *pvSkinBoxes, unsigned int uiAnimOverrideBitmask);
|
||||
TextureAndGeometryPacket(const wstring &textureName, PBYTE pbData, DWORD dwBytes, vector<SKIN_BOX *> *pvSkinBoxes, vector<SKIN_OFFSET *> *pvSkinOffsets, unsigned int uiAnimOverrideBitmask);
|
||||
|
||||
virtual void handle(PacketListener *listener);
|
||||
virtual void read(DataInputStream *dis);
|
||||
|
|
|
|||
Loading…
Reference in a new issue