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

additional serial port data output, 3d model load failure caching, minor refactoring and bug fixes

Browse Source
This commit is contained in:
tmj-fstate
2018-03-11 15:48:30 +01:00
parent 0bf9d233aa
commit d96b259191
15 changed files with 58 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
material.cpp
View File

@@ -110,11 +110,7 @@ material_manager::create( std::string const &Filename, bool const Loadnow ) {
if( filename.find( '|' ) != std::string::npos )
filename.erase( filename.find( '|' ) ); // po | może być nazwa kolejnej tekstury
if( ( filename.rfind( '.' ) != std::string::npos )
&& ( filename.rfind( '.' ) != filename.rfind( ".." ) + 1 ) ) {
// we can get extension for .mat or, in legacy files, some image format. just trim it and set it to material file extension
filename.erase( filename.rfind( '.' ) );
}
erase_extension( filename );
filename += ".mat";
// change slashes to llinux-compatible