TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-01-20 04:34:48 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge pull request #52 from Azaezel/Alpha40ReskinRevamp

Browse source 
reskinning fixes
This commit is contained in:
Areloch 2019-05-25 03:34:54 -05:00 committed by GitHub
parent 7bedf48046 76dbedb02f
commit 882a0d5380
2 changed files with 58 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
Engine/source/T3D/shapeBase.cpp
View file

@ -3694,29 +3694,40 @@ void ShapeBase::setSkinName(const char* name)
void ShapeBase::reSkin()
{
if ( isGhost() && mShapeInstance && mSkinNameHandle.isValidString() )
if (isGhost() && mShapeInstance)
{
mShapeInstance->resetMaterialList();
Vector<String> skins;
String(mSkinNameHandle.getString()).split( ";", skins );
for (S32 i = 0; i < skins.size(); i++)
if (mSkinNameHandle.isValidString())
{
String oldSkin( mAppliedSkinName.c_str() );
String newSkin( skins[i] );
mShapeInstance->resetMaterialList();
Vector<String> skins;
String(mSkinNameHandle.getString()).split(";", skins);
// Check if the skin handle contains an explicit "old" base string. This
// allows all models to support skinning, even if they don't follow the
// "base_xxx" material naming convention.
S32 split = newSkin.find( '=' ); // "old=new" format skin?
if ( split != String::NPos )
for (S32 i = 0; i < skins.size(); i++)
{
oldSkin = newSkin.substr( 0, split );
newSkin = newSkin.erase( 0, split+1 );
}
String oldSkin(mAppliedSkinName.c_str());
String newSkin(skins[i]);
mShapeInstance->reSkin( newSkin, oldSkin );
mAppliedSkinName = newSkin;
// Check if the skin handle contains an explicit "old" base string. This
// allows all models to support skinning, even if they don't follow the
// "base_xxx" material naming convention.
S32 split = newSkin.find('='); // "old=new" format skin?
if (split != String::NPos)
{
oldSkin = newSkin.substr(0, split);
newSkin = newSkin.erase(0, split + 1);
}
else
{
oldSkin = "";
}
mShapeInstance->reSkin(newSkin, oldSkin);
mAppliedSkinName = newSkin;
}
}
else
{
mShapeInstance->reSkin("", mAppliedSkinName);
mAppliedSkinName = "";
}
}
}

47
Engine/source/T3D/tsStatic.cpp
View file

@ -542,29 +542,40 @@ void TSStatic::setSkinName( const char *name )
void TSStatic::reSkin()
{
if ( isGhost() && mShapeInstance && mSkinNameHandle.isValidString() )
if (isGhost() && mShapeInstance)
{
mShapeInstance->resetMaterialList();
Vector<String> skins;
String(mSkinNameHandle.getString()).split( ";", skins );
for (S32 i = 0; i < skins.size(); i++)
if (mSkinNameHandle.isValidString())
{
String oldSkin( mAppliedSkinName.c_str() );
String newSkin( skins[i] );
mShapeInstance->resetMaterialList();
Vector<String> skins;
String(mSkinNameHandle.getString()).split(";", skins);
// Check if the skin handle contains an explicit "old" base string. This
// allows all models to support skinning, even if they don't follow the
// "base_xxx" material naming convention.
S32 split = newSkin.find( '=' ); // "old=new" format skin?
if ( split != String::NPos )
for (S32 i = 0; i < skins.size(); i++)
{
oldSkin = newSkin.substr( 0, split );
newSkin = newSkin.erase( 0, split+1 );
}
String oldSkin(mAppliedSkinName.c_str());
String newSkin(skins[i]);
mShapeInstance->reSkin( newSkin, oldSkin );
mAppliedSkinName = newSkin;
// Check if the skin handle contains an explicit "old" base string. This
// allows all models to support skinning, even if they don't follow the
// "base_xxx" material naming convention.
S32 split = newSkin.find('='); // "old=new" format skin?
if (split != String::NPos)
{
oldSkin = newSkin.substr(0, split);
newSkin = newSkin.erase(0, split + 1);
}
else
{
oldSkin = "";
}
mShapeInstance->reSkin(newSkin, oldSkin);
mAppliedSkinName = newSkin;
}
}
else
{
mShapeInstance->reSkin("", mAppliedSkinName);
mAppliedSkinName = "";
}
}
}