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

skydome: Adjust for external tonemapping

Browse Source 
Skydome was applying its own tonemapping to look good. Get rid of it and
adjust color corrections to look good with a HDR pipeline.
This commit is contained in:
Sebastian Krzyszkowiak
2026-06-30 05:47:57 +02:00
parent fdc9ea7099
commit 40c21bd4ba
1 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
environment/skydome.cpp
View File

@@ -185,7 +185,7 @@ float CSkyDome::PerezFunctionO2( float Perezcoeffs[ 5 ], const float Icostheta,
void CSkyDome::RebuildColors() { void CSkyDome::RebuildColors() {
float twilightfactor = std::clamp( -simulation::Environment.sun().getAngle(), 0.0f, 18.0f ) / 18.0f; float twilightfactor = std::clamp( -simulation::Environment.sun().getAngle(), 0.0f, 18.0f ) / 18.0f;
auto gammacorrection = glm::mix( glm::vec3( 0.45f ), glm::vec3( 1.0f ), twilightfactor ); auto gammacorrection = glm::mix( glm::vec3( 1.0f ), glm::vec3( 0.45f ), twilightfactor );
// get zenith luminance // get zenith luminance
float const chi = ( (4.0f / 9.0f) - (m_turbidity / 120.0f) ) * ( M_PI - (2.0f * m_thetasun) ); float const chi = ( (4.0f / 9.0f) - (m_turbidity / 120.0f) ) * ( M_PI - (2.0f * m_thetasun) );
@@ -211,7 +211,7 @@ void CSkyDome::RebuildColors() {
// trough all vertices // trough all vertices
glm::vec3 vertex; glm::vec3 vertex;
glm::vec3 color, colorconverter, shiftedcolor; glm::vec3 color, colorconverter;
for ( unsigned int i = 0; i < m_vertices.size(); ++i ) { for ( unsigned int i = 0; i < m_vertices.size(); ++i ) {
// grab it // grab it
@@ -258,9 +258,7 @@ void CSkyDome::RebuildColors() {
colorconverter.z = 1.0f - std::exp( -m_expfactor * colorconverter.z ); colorconverter.z = 1.0f - std::exp( -m_expfactor * colorconverter.z );
} }
if( colorconverter.z > 0.85f ) { colorconverter.z = std::pow( std::max( colorconverter.z, 0.0f ), gammacorrection.x );
colorconverter.z = 0.85f + ( colorconverter.z - 0.85f ) * 0.35f;
}
colorconverter.y = std::clamp( colorconverter.y * Global.m_skysaturationcorrection, 0.0f, 1.0f ); colorconverter.y = std::clamp( colorconverter.y * Global.m_skysaturationcorrection, 0.0f, 1.0f );
// desaturate sky colour, based on overcast level // desaturate sky colour, based on overcast level
@@ -277,12 +275,10 @@ void CSkyDome::RebuildColors() {
// this height-based factor is reduced the farther the sun is up in the sky // this height-based factor is reduced the farther the sun is up in the sky
float const shiftfactor = std::clamp( std::lerp(heightbasedphase, sunbasedphase, sunbasedphase), 0.0f, 1.0f ); float const shiftfactor = std::clamp( std::lerp(heightbasedphase, sunbasedphase, sunbasedphase), 0.0f, 1.0f );
// h = 210 makes for 'typical' sky tone // h = 210 makes for 'typical' sky tone
shiftedcolor = glm::vec3( 210.0f, colorconverter.y, colorconverter.z ); glm::vec3 const skytonecolor = colors::HSVtoRGB( glm::vec3( 210.0f, 0.5f, colorconverter.z ) );
shiftedcolor = colors::HSVtoRGB( shiftedcolor );
color = colors::HSVtoRGB(colorconverter); color = colors::HSVtoRGB( colorconverter );
color = glm::mix( color, skytonecolor, shiftfactor * Global.m_skyhuecorrection );
color = glm::mix( color, shiftedcolor, shiftfactor * Global.m_skyhuecorrection );
// crude correction for the times where the model breaks (late night) // crude correction for the times where the model breaks (late night)
// TODO: use proper night sky calculation for these times instead // TODO: use proper night sky calculation for these times instead
@@ -295,10 +291,15 @@ void CSkyDome::RebuildColors() {
color.y = 0.65f * color.z; color.y = 0.65f * color.z;
} }
// simple gradient, darkening towards the top // simple gradient, darkening towards the top
color *= std::clamp( ( 1.0f - vertex.y ), 0.2f, 1.f ); color *= std::clamp( ( 1.0f - vertex.y * 0.75f ), 0.0f, 1.f );
float const horizonboost = 1.5f + m_overcast;
float const horizonbandwidth = 0.2f; // boost tapers to 0 by ~11.5 degrees elevation
float const horizonband = std::clamp( 1.0f - vertex.y / horizonbandwidth, 0.0f, 1.0f );
color *= std::lerp( 1.0, horizonboost, horizonband );
//color *= ( 0.25f - vertex.y ); //color *= ( 0.25f - vertex.y );
// gamma correction
color = glm::pow( color, gammacorrection );
m_colours[ i ] = color; m_colours[ i ] = color;
averagecolor += color; averagecolor += color;
if( ( m_vertices.size() - i ) <= ( m_tesselation * 10 + 10 ) ) { if( ( m_vertices.size() - i ) <= ( m_tesselation * 10 + 10 ) ) {