TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-12 19:31:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

reskinning fixes

Browse source 
1) falls back to assuming the word "base" is what is to be replaced if no "oldSkin = newSkin" entry exists
2) falls back to *using* base if the entry is left entriely blank
This commit is contained in:
AzaezelX 2019-05-21 12:03:19 -05:00
parent 7bedf48046
commit 76dbedb02f
2 changed files with 58 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

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 = "";
}
}
}