eu07/maszyna
1
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-03-22 15:05:03 +01:00
Code Issues Packages Projects Releases 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

8
material.cpp
View File

@@ -392,6 +392,11 @@ opengl_material::deserialize_mapping( cParser &Input, int const Priority, bool c
glossiness = std::stof(value); //m7t: handle exception
m_glossiness_priority = Priority;
}
else if (key == "shadow_rank:")
{
auto const value { deserialize_random_set( Input ) };
shadow_rank = std::stof(value); //m7t: handle exception
}
else if( key == "size:" ) {
Input.getTokens( 2 );
Input
@@ -457,8 +462,9 @@ material_manager::create( std::string const &Filename, bool const Loadnow ) {
auto filename { Filename };
if( filename.find( '|' ) != std::string::npos )
if( contains( filename, '|' ) ) {
filename.erase( filename.find( '|' ) ); // po | może być nazwa kolejnej tekstury
}
// discern references to textures generated by a script
// TBD: support file: for file resources?