eu07/maszyna
17
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-10-17 06:19:19 +02:00
Code Issues 150 Wiki Activity

Draw volumetric clouds, their shadows, a volumetric fog and catalogue stars from a new weather system in the GL 4.6 renderer

Browse Source
This commit is contained in:
Hirek
2026-10-16 21:44:47 +02:00
parent d509775269
commit 2be85410ce
47 changed files with 5092 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
gl/glsl_common.cpp
View File

@@ -63,6 +63,18 @@ void gl::glsl_common_setup()
"#define LOCAL_SHADOW_LAMPS_TEX " + std::to_string(LOCAL_SHADOW_LAMPS_TEX) + "\n" +
"#define HEADLIGHT_SHADOW_TEX " + std::to_string(HEADLIGHT_SHADOW_TEX) + "\n" +
"#define MAX_HEADLIGHT_SHADOWS " + std::to_string(MAX_HEADLIGHT_SHADOWS) + "U\n" +
"#define FOG_VOLUME_TEX " + std::to_string(FOG_VOLUME_TEX) + "\n" +
"#define CLOUD_SHADOW_TEX " + std::to_string(CLOUD_SHADOW_TEX) + "\n" +
"#define CLOUD_TEX " + std::to_string(CLOUD_TEX) + "\n" +
"#define CLOUD_SHAPE_TEX " + std::to_string(CLOUD_SHAPE_TEX) + "\n" +
"#define CLOUD_DETAIL_TEX " + std::to_string(CLOUD_DETAIL_TEX) + "\n" +
"#define CLOUD_COVERAGE_TEX " + std::to_string(CLOUD_COVERAGE_TEX) + "\n" +
"#define CLOUD_HISTORY_TEX " + std::to_string(CLOUD_HISTORY_TEX) + "\n" +
"#define WEATHER_UBO_BINDING " + std::to_string(WEATHER_UBO_BINDING) + "\n" +
"#define WEATHER_SCRATCH_SSBO_BINDING " + std::to_string(WEATHER_SCRATCH_SSBO_BINDING) + "\n" +
"#define MAX_CLOUD_LAYERS " + std::to_string(MAX_CLOUD_LAYERS) + "\n" +
"#define FOG_HORIZON_SAMPLES " + std::to_string(FOG_HORIZON_SAMPLES) + "\n" +
"#define WEATHER_GROUP_SIZE " + std::to_string(WEATHER_GROUP_SIZE) + "\n" +
R"STRING(
const uint LIGHT_SPOT = 0U;
const uint LIGHT_POINT = 1U;

59
gl/ubo.h
View File

@@ -65,6 +65,16 @@ namespace gl
// shadow maps of the headlights of vehicles (2d array, depth compared; opengl46_local_shadows), and how many of them there may be
const size_t HEADLIGHT_SHADOW_TEX = MAX_TEXTURES + HELPER_TEXTURES + 3;
const size_t MAX_HEADLIGHT_SHADOWS = 4;
// weather (opengl46_weather): the fog of the main view (3d, apply_fog.glsl) and the shadows the clouds cast (2d), read by the
// shading. bound directly, like the ones above
const size_t FOG_VOLUME_TEX = MAX_TEXTURES + HELPER_TEXTURES + 4;
const size_t CLOUD_SHADOW_TEX = MAX_TEXTURES + HELPER_TEXTURES + 5;
// the clouds drawn into the sky, and the noise the clouds and the fog are made of; bound by the passes which read them
const size_t CLOUD_TEX = MAX_TEXTURES + HELPER_TEXTURES + 6;
const size_t CLOUD_SHAPE_TEX = MAX_TEXTURES + HELPER_TEXTURES + 7;
const size_t CLOUD_DETAIL_TEX = MAX_TEXTURES + HELPER_TEXTURES + 8;
const size_t CLOUD_COVERAGE_TEX = MAX_TEXTURES + HELPER_TEXTURES + 9;
const size_t CLOUD_HISTORY_TEX = MAX_TEXTURES + HELPER_TEXTURES + 10;
struct scene_ubs
{
@@ -392,6 +402,55 @@ namespace gl
static_assert(sizeof(atmosphere_result) == 16 * (SKY_SH_COEFFICIENTS + 4), "bad size of atmosphere_result");
// weather of the opengl 4.6 renderer (opengl46_weather, weather_common.glsl): fog, clouds, their shadows
const GLuint WEATHER_UBO_BINDING = 5;
// layers of clouds drawn, see weather_conditions::max_cloud_layers
const size_t MAX_CLOUD_LAYERS = 4;
// colours of the fog towards the horizon, by the angle from the azimuth of the sun (0-180 degrees)
const size_t FOG_HORIZON_SAMPLES = 32;
// work groups of the weather passes: 8x8 for the images, 8x8x1 for the fog volume
const GLuint WEATHER_GROUP_SIZE = 8;
// layout std140: one layer of clouds (GLSL: cloud_layer_s), see weather_common.glsl
struct cloud_layer_ubs
{
glm::vec4 heights;
glm::vec4 shape;
glm::vec4 profile;
glm::vec4 motion;
glm::vec4 extra;
};
static_assert(sizeof(cloud_layer_ubs) == 80, "bad size of cloud_layer_ubs");
// layout std140: the weather for the shading and the weather passes (GLSL: weather_ubo), see weather_common.glsl
struct weather_ubs
{
glm::vec4 fog_haze;
glm::vec4 fog_ground;
glm::vec4 fog_noise;
glm::vec4 fog_light;
glm::vec4 fog_volume_params;
glm::vec4 fog_volume_target;
glm::vec4 weather_camera;
glm::vec4 weather_sun_direction;
glm::vec4 weather_sun_color;
glm::vec4 weather_ambient;
glm::vec4 cloud_shadow_params;
glm::vec4 cloud_wind;
cloud_layer_ubs cloud_layers[MAX_CLOUD_LAYERS];
// filled on the gpu (fog_horizon.comp) while the atmosphere is used, by the cpu otherwise
glm::vec4 fog_horizon[FOG_HORIZON_SAMPLES];
};
static_assert(offsetof(weather_ubs, cloud_layers) == 192, "bad layout of weather_ubs");
static_assert(offsetof(weather_ubs, fog_horizon) == 192 + 80 * MAX_CLOUD_LAYERS, "bad layout of weather_ubs");
static_assert(sizeof(weather_ubs) == 192 + 80 * MAX_CLOUD_LAYERS + 16 * FOG_HORIZON_SAMPLES, "bad size of weather_ubs");
// the weather buffer is written by fog_horizon.comp as a storage block bound here for the pass. the point is one of the
// instance culling, which binds its buffers before every use
const GLuint WEATHER_SCRATCH_SSBO_BINDING = 9;
// culling of model instances in compute passes (instance_cull.comp, instance_cull_offsets.comp). binding points of
// the shader storage blocks, apart from the ones bound for the shading so the passes don't disturb them
const GLuint INSTANCE_RECORD_SSBO_BINDING = 9; // scene::basic_cell::instance_record of the queued buckets