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

fix slashes and collapse path when loading a texture in Model

Browse Source
This commit is contained in:
Chris Danford
2003-08-23 19:10:05 +00:00
parent d69d19fc2a
commit 859ace0201
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/Model.cpp
+10 -6
View File
@@ -401,6 +401,16 @@ bool Model::LoadMilkshapeAscii( CString sPath )
sscanf (szLine, "\"%[^\"]\"", szName); sscanf (szLine, "\"%[^\"]\"", szName);
strcpy( Material.szDiffuseTexture, szName ); strcpy( Material.szDiffuseTexture, szName );
if( strcmp(Material.szDiffuseTexture, "")!=0 )
{
CString sFile = Material.szDiffuseTexture;
FixSlashesInPlace( sFile );
CString sPath = sDir + Material.szDiffuseTexture;
CollapsePath( sPath );
if( IsAFile(sPath) )
Material.aniTexture.Load( sPath );
}
// alpha texture // alpha texture
if (!fgets (szLine, 256, file)) if (!fgets (szLine, 256, file))
{ {
@@ -410,12 +420,6 @@ bool Model::LoadMilkshapeAscii( CString sPath )
strcpy (szName, ""); strcpy (szName, "");
sscanf (szLine, "\"%[^\"]\"", szName); sscanf (szLine, "\"%[^\"]\"", szName);
strcpy( Material.szAlphaTexture, szName ); strcpy( Material.szAlphaTexture, szName );
if( strcmp(Material.szDiffuseTexture, "")!=0 )
{
if( IsAFile(sDir+Material.szDiffuseTexture) )
Material.aniTexture.Load( sDir+Material.szDiffuseTexture );
}
} }
} }
} }