actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

simplify

Browse Source
This commit is contained in:
Glenn Maynard
2006-07-30 18:43:09 +00:00
parent 4b647827a8
commit f424072441
1 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/Model.cpp
+6 -10
View File
@@ -253,15 +253,13 @@ void Model::LoadMaterialsFromMilkshapeAscii( const RString &_sPath )
RString sTexturePath = sDir + sDiffuseTexture; RString sTexturePath = sDir + sDiffuseTexture;
FixSlashesInPlace( sTexturePath ); FixSlashesInPlace( sTexturePath );
CollapsePath( sTexturePath ); CollapsePath( sTexturePath );
if( IsAFile(sTexturePath) ) if( !IsAFile(sTexturePath) )
{
Material.diffuse.Load( sTexturePath );
}
else
{ {
RString sError = ssprintf( "'%s' references a texture '%s' that does not exist", sPath.c_str(), sTexturePath.c_str() ); RString sError = ssprintf( "'%s' references a texture '%s' that does not exist", sPath.c_str(), sTexturePath.c_str() );
RageException::Throw( sError ); RageException::Throw( sError );
} }
Material.diffuse.Load( sTexturePath );
} }
// alpha texture // alpha texture
@@ -280,15 +278,13 @@ void Model::LoadMaterialsFromMilkshapeAscii( const RString &_sPath )
RString sTexturePath = sDir + sAlphaTexture; RString sTexturePath = sDir + sAlphaTexture;
FixSlashesInPlace( sTexturePath ); FixSlashesInPlace( sTexturePath );
CollapsePath( sTexturePath ); CollapsePath( sTexturePath );
if( IsAFile(sTexturePath) ) if( !IsAFile(sTexturePath) )
{
Material.alpha.Load( sTexturePath );
}
else
{ {
RString sError = ssprintf( "'%s' references a texture '%s' that does not exist", sPath.c_str(), sTexturePath.c_str() ); RString sError = ssprintf( "'%s' references a texture '%s' that does not exist", sPath.c_str(), sTexturePath.c_str() );
RageException::Throw( sError ); RageException::Throw( sError );
} }
Material.alpha.Load( sTexturePath );
} }
} }
} }