BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

Let lighting be done only CPU side. Remove finalColorBlend implementation from shaders.

Browse Source
This commit is contained in:
RealBadAngel 2014-08-16 14:02:50 +02:00
parent 0a57b5b553
commit bf91d623c8
3 changed files with 9 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
client/shaders/nodes_shader/opengl_vertex.glsl
View File

@ -97,31 +97,5 @@ void main(void)
eyeVec = (gl_ModelViewMatrix * gl_Vertex).xyz; eyeVec = (gl_ModelViewMatrix * gl_Vertex).xyz;
tsEyeVec = eyeVec * tbnMatrix; tsEyeVec = eyeVec * tbnMatrix;
vec4 color; gl_FrontColor = gl_BackColor = gl_Color;
float day = gl_Color.r;
float night = gl_Color.g;
float light_source = gl_Color.b;
float rg = mix(night, day, dayNightRatio);
rg += light_source * 2.5; // Make light sources brighter
float b = rg;
// Moonlight is blue
b += (day - night) / 13.0;
rg -= (day - night) / 23.0;
// Emphase blue a bit in darker places
// See C++ implementation in mapblock_mesh.cpp finalColorBlend()
b += max(0.0, (1.0 - abs(b - 0.13)/0.17) * 0.025);
// Artificial light is yellow-ish
// See C++ implementation in mapblock_mesh.cpp finalColorBlend()
rg += max(0.0, (1.0 - abs(rg - 0.85)/0.15) * 0.065);
color.r = rg;
color.g = rg;
color.b = b;
color.a = gl_Color.a;
gl_FrontColor = gl_BackColor = clamp(color,0.0,1.0);
} }

28
client/shaders/water_surface_shader/opengl_vertex.glsl
View File

@ -97,31 +97,5 @@ void main(void)
eyeVec = (gl_ModelViewMatrix * gl_Vertex).xyz; eyeVec = (gl_ModelViewMatrix * gl_Vertex).xyz;
tsEyeVec = eyeVec * tbnMatrix; tsEyeVec = eyeVec * tbnMatrix;
vec4 color; gl_FrontColor = gl_BackColor = gl_Color;
float day = gl_Color.r;
float night = gl_Color.g;
float light_source = gl_Color.b;
float rg = mix(night, day, dayNightRatio);
rg += light_source * 2.5; // Make light sources brighter
float b = rg;
// Moonlight is blue
b += (day - night) / 13.0;
rg -= (day - night) / 13.0;
// Emphase blue a bit in darker places
// See C++ implementation in mapblock_mesh.cpp finalColorBlend()
b += max(0.0, (1.0 - abs(b - 0.13)/0.17) * 0.025);
// Artificial light is yellow-ish
// See C++ implementation in mapblock_mesh.cpp finalColorBlend()
rg += max(0.0, (1.0 - abs(rg - 0.85)/0.15) * 0.065);
color.r = rg;
color.g = rg;
color.b = b;
color.a = gl_Color.a;
gl_FrontColor = gl_BackColor = clamp(color,0.0,1.0);
} }

5
src/mapblock_mesh.cpp
View File

@ -1158,9 +1158,7 @@ MapBlockMesh::MapBlockMesh(MeshMakeData *data, v3s16 camera_offset):
applyFacesShading (vc, 0.836660); applyFacesShading (vc, 0.836660);
} }
} }
if(!enable_shaders) // - Classic lighting
{
// - Classic lighting (shaders handle this by themselves)
// Set initial real color and store for later updates // Set initial real color and store for later updates
u8 day = vc.getRed(); u8 day = vc.getRed();
u8 night = vc.getGreen(); u8 night = vc.getGreen();
@ -1168,7 +1166,6 @@ MapBlockMesh::MapBlockMesh(MeshMakeData *data, v3s16 camera_offset):
if(day != night) if(day != night)
m_daynight_diffs[i][j] = std::make_pair(day, night); m_daynight_diffs[i][j] = std::make_pair(day, night);
} }
}
// Create material // Create material
video::SMaterial material; video::SMaterial material;