oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-07-02 16:38:41 +00:00
Code Wiki Activity

Remove volumetrics stuff and some changes

Browse source
This commit is contained in:
Gefüllte Taubenbrust 2024-10-01 20:00:24 +02:00
parent da1a688493
commit 1bf1d0b2ff
21 changed files with 311 additions and 857 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/client/game.cpp
View file

@ -435,8 +435,6 @@ class GameGlobalShaderConstantSetter : public IShaderConstantSetter
CachedPixelShaderSetting<float> m_moon_brightness_pixel{"moonBrightness"};
CachedPixelShaderSetting<float>
m_volumetric_light_strength_pixel{"volumetricLightStrength"};
CachedPixelShaderSetting<float, 3>
m_volumetric_cloud_color{"cloudColor"};
static constexpr std::array<const char*, 5> SETTING_CALLBACKS = {
"exposure_compensation",
@ -575,23 +573,6 @@ public:
video::SColorf artificial_light = lighting.artificial_light_color;
m_artificial_light.set(artificial_light, services);
// TODO: settings
Clouds* clouds = m_client->getClouds();
if (clouds && g_settings->getBool("enable_volumetric_clouds")) {
float cloud_height = clouds->getHeight() * 10.0f;
m_cloud_height_pixel.set(&cloud_height, services);
float cloud_thickness = clouds->getThickness() * 10.0f;
m_cloud_thickness_pixel.set(&cloud_thickness, services);
float cloud_density = clouds->getDensity();
m_cloud_density_pixel.set(&cloud_density, services);
v2f cloud_offset = clouds->getCloudOffset();
m_cloud_offset_pixel.set(cloud_offset, services);
float cloud_radius = g_settings->getU16("cloud_radius");
m_cloud_radius_pixel.set(&cloud_radius, services);
video::SColor cloud_color = clouds->getColor();
m_volumetric_cloud_color.set(cloud_color, services);
}
if (m_volumetric_light_enabled) {
// Map directional light to screen space
auto camera_node = m_client->getCamera()->getCameraNode();
@ -1588,7 +1569,6 @@ bool Game::createClient(const GameStartData &start_data)
*/
if (m_cache_enable_clouds)
clouds = make_irr<Clouds>(smgr, shader_src, -1, rand());
client->setClouds(clouds.get());
/* Skybox
*/
@ -4334,7 +4314,7 @@ void Game::updateClouds(float dtime)
camera_node_position.Y = camera_node_position.Y + camera_offset.Y * BS;
camera_node_position.Z = camera_node_position.Z + camera_offset.Z * BS;
this->clouds->update(camera_node_position, this->sky->getCloudColor());
if (this->clouds->isCameraInsideCloud() && this->fogEnabled() && !g_settings->getBool("enable_volumetric_clouds")) {
if (this->clouds->isCameraInsideCloud() && this->fogEnabled()) {
// If camera is inside cloud and fog is enabled, use cloud's colors as sky colors.
video::SColor clouds_dark = this->clouds->getColor().getInterpolated(
video::SColor(255, 0, 0, 0), 0.9);