eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-18 22:39:18 +02:00
Code Issues 121 Wiki Activity

fix material slash handling

Browse Source
This commit is contained in:
milek7
2017-08-27 22:53:11 +02:00
parent 74b252b619
commit 6d2328db6e
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
material.cpp
View File

@@ -71,13 +71,11 @@ material_manager::create( std::string const &Filename, bool const Loadnow ) {
}
filename += ".mat";
for( char &c : filename ) {
// change forward slashes to windows ones. NOTE: probably not strictly necessary, but eh
c = ( c == '/' ? '\\' : c );
}
if( filename.find( '\\' ) == std::string::npos ) {
std::replace(filename.begin(), filename.end(), '\\', '/'); // fix slashes
if( filename.find( '/' ) == std::string::npos ) {
// jeśli bieżaca ścieżka do tekstur nie została dodana to dodajemy domyślną
filename = szTexturePath + filename;
filename = global_texture_path + filename;
}
// try to locate requested material in the databank
@@ -121,7 +119,7 @@ material_manager::find_in_databank( std::string const &Materialname ) const {
return lookup->second;
}
// jeszcze próba z dodatkową ścieżką
lookup = m_materialmappings.find( szTexturePath + Materialname );
lookup = m_materialmappings.find( global_texture_path + Materialname );
return (
lookup != m_materialmappings.end() ?
@@ -136,7 +134,7 @@ material_manager::find_on_disk( std::string const &Materialname ) const {
return(
FileExists( Materialname ) ? Materialname :
FileExists( szTexturePath + Materialname ) ? szTexturePath + Materialname :
FileExists( global_texture_path + Materialname ) ? global_texture_path + Materialname :
"" );
}