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

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

6
scenenode.cpp
View File

@@ -206,17 +206,17 @@ shape_node::import( cParser &Input, scene::node_data const &Nodedata ) {
opengl_texture() ); // dirty workaround for lack of better api
bool const clamps = (
texturehandle ?
texture.traits.find( 's' ) != std::string::npos :
contains( texture.traits, 's' ) :
false );
bool const clampt = (
texturehandle ?
texture.traits.find( 't' ) != std::string::npos :
contains( texture.traits, 't' ) :
false );
// remainder of legacy 'problend' system -- geometry assigned a texture with '@' in its name is treated as translucent, opaque otherwise
if( texturehandle != null_handle ) {
m_data.translucent = (
( ( texture.name.find( '@' ) != std::string::npos )
( ( contains( texture.name, '@' ) )
&& ( true == texture.has_alpha ) ) ?
true :
false );