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

param parsing fix, use colored material alpha

Browse Source
This commit is contained in:
milek7
2018-07-30 14:05:43 +02:00
parent 88f8bf6845
commit f6f7fee8d8
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
material.cpp
View File

@@ -165,7 +165,7 @@ opengl_material::deserialize_mapping( cParser &Input, int const Priority, bool c
if( ( true == key.empty() ) || ( key == "}" ) ) { return false; } if( ( true == key.empty() ) || ( key == "}" ) ) { return false; }
auto value { Input.getToken<std::string>( true, "\n\r\t ,;" ) }; auto value { Input.getToken<std::string>( true, "\n\r\t,;" ) };
if( Priority != -1 ) { if( Priority != -1 ) {
// regular attribute processing mode // regular attribute processing mode

2
shaders/mat_colored.frag
View File

@@ -27,7 +27,7 @@ uniform samplerCube envmap;
void main() void main()
{ {
vec4 tex_color = vec4(pow(param[0].rgb, vec3(2.2)), 1.0f); vec4 tex_color = vec4(pow(param[0].rgb, vec3(2.2)), param[0].a);
vec3 normal = normalize(f_normal); vec3 normal = normalize(f_normal);
vec3 refvec = reflect(f_pos.xyz, normal); vec3 refvec = reflect(f_pos.xyz, normal);