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

Merge commit 'd8170c932b448ba6888e702746b5ae22632062d8' into sim

Browse Source
This commit is contained in:
milek7
2022-01-05 01:02:56 +01:00
parent ff3c38a506 d8170c932b
commit 5bafa31f9d
76 changed files with 9277 additions and 5749 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Texture.cpp
View File

@@ -1253,8 +1253,9 @@ texture_manager::unit( GLint const Textureunit ) {
texture_handle
texture_manager::create( std::string Filename, bool const Loadnow, GLint Formathint ) {
if( Filename.find( '|' ) != std::string::npos )
if( contains( Filename, '|' ) ) {
Filename.erase( Filename.find( '|' ) ); // po | może być nazwa kolejnej tekstury
}
std::pair<std::string, std::string> locator; // resource name, resource type
std::string traits;
@@ -1292,8 +1293,8 @@ texture_manager::create( std::string Filename, bool const Loadnow, GLint Formath
// clean up slashes
erase_leading_slashes( Filename );
// temporary code for legacy assets -- textures with names beginning with # are to be sharpened
if( ( Filename.front() == '#' )
|| ( Filename.find( "/#" ) != std::string::npos ) ) {
if( ( starts_with( Filename, "#" ) )
|| ( contains( Filename, "/#" ) ) ) {
traits += '#';
}
}
@@ -1318,7 +1319,7 @@ texture_manager::create( std::string Filename, bool const Loadnow, GLint Formath
locator = find_on_disk( Filename );
if( true == locator.first.empty() ) {
// there's nothing matching in the databank nor on the disk, report failure
ErrorLog( "Bad file: failed to locate texture file \"" + Filename + "\"", logtype::file );
ErrorLog( "Bad file: failed to locate texture file \"" + Filename + "\"", logtype::file );
return npos;
}
}