griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'blender-v4.2-release'

Browse Source
This commit is contained in:
Lukas Stockner
2024-06-05 16:27:58 +02:00
parent 28ad3e59a7 56ff0d414a
commit f436d45cb6
2 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
source/blender/draw/engines/eevee_next/shaders/eevee_shadow_tracing_lib.glsl
View File

@@ -342,17 +342,21 @@ vec3 shadow_pcf_offset(vec3 L, vec3 Ng, vec2 random)
*/
float shadow_texel_radius_at_position(LightData light, const bool is_directional, vec3 P)
{
/* For direction, footprint of the sampled clipmap (or cascade) at the given position.
* For punctual, footprint of the tilemap at given position scaled by the LOD level.
* Each of these a smooth upper bound estimation (will transition smoothly to the next level). */
float scale = 1.0;
if (is_directional) {
vec3 lP = light_world_to_local_point(light, P);
vec3 lP = transform_direction_transposed(light.object_to_world, P);
lP -= light_position_get(light);
LightSunData sun = light_sun_data_get(light);
if (light.type == LIGHT_SUN) {
/* Simplification of `coverage_get(shadow_directional_level_fractional)`. */
const float narrowing = float(SHADOW_TILEMAP_RES) / (float(SHADOW_TILEMAP_RES) - 1.0001);
scale = length(lP) * narrowing;
/* Simplification of `coverage_get(shadow_directional_level_fractional)`.
* Do not apply the narrowing since we want the size of the tilemap (not its application
* radius). */
scale = length(lP) * 2.0;
scale = max(scale * exp2(light.lod_bias), exp2(light.lod_min));
scale = min(scale, exp2(float(sun.clipmap_lod_max)));
scale = clamp(scale, exp2(float(sun.clipmap_lod_min)), exp2(float(sun.clipmap_lod_max)));
}
else {
/* Uniform distribution everywhere. No distance scaling.
@@ -371,14 +375,15 @@ float shadow_texel_radius_at_position(LightData light, const bool is_directional
drw_view_z_distance(P),
uniform_buf.shadow.film_pixel_radius);
/* This gives the size of pixels at Z = 1. */
scale = 0.5 / scale;
scale = 1.0 / scale;
scale = min(scale, float(1 << (SHADOW_TILEMAP_LOD - 1)));
/* Now scale by distance to the light. */
scale *= reduce_max(abs(lP));
}
/* Footprint of a tilemap at unit distance from the camera. */
const float texel_footprint = 2.0 * M_SQRT2 / SHADOW_MAP_MAX_RES;
return texel_footprint * scale;
/* Pixel bounding radius inside a tilemap of unit scale.
* Take only half of it because we want the radius and not the diameter. */
const float texel_radius = M_SQRT2 / SHADOW_MAP_MAX_RES;
return texel_radius * scale;
}
/**

9
source/blender/editors/space_node/node_shader_preview.cc
View File

@@ -817,10 +817,15 @@ static void ensure_nodetree_previews(const bContext &C,
original_path;
original_path = original_path->next)
{
bNodeTreePath *new_path = MEM_cnew<bNodeTreePath>(__func__);
memcpy(new_path, original_path, sizeof(bNodeTreePath));
bNode *parent = bke::nodeFindNodebyName(job_data->treepath_copy.last()->nodetree,
original_path->node_name);
if (parent == nullptr) {
/* In some cases (e.g. muted nodes), there may not be an equivalent node in the copied
* nodetree. In that case, just skip the node. */
continue;
}
bNodeTreePath *new_path = MEM_cnew<bNodeTreePath>(__func__);
memcpy(new_path, original_path, sizeof(bNodeTreePath));
new_path->nodetree = reinterpret_cast<bNodeTree *>(parent->id);
job_data->treepath_copy.append(new_path);
}