BogdanNagirniak/blender
0
0
Fork 3
forked from blender/blender
Code Pull Requests Activity

WIP Make shadows visible for Storm delegate #80

Closed
Vasyl Pidhirskyi wants to merge 16 commits from Vasyl-Pidhirskyi/blender_bn:BLEN-469 into hydra-render
pull from: Vasyl-Pidhirskyi/blender_bn:BLEN-469
merge into: BogdanNagirniak:hydra-render

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 1 Commits 16 Files Changed 9 +5 -6
4 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit ddef9b9897 - Show all commits

4
source/blender/io/usd/hydra/light.cc
View File

@ -145,7 +145,9 @@ void LightData::update()
Object *object = (Object *)id; Object *object = (Object *)id;
Light *light = (Light *)object->data; Light *light = (Light *)object->data;
pxr::HdDirtyBits bits = pxr::HdLight::Clean; pxr::HdDirtyBits bits = pxr::HdLight::Clean;
if (id->recalc & ID_RECALC_GEOMETRY || light->id.recalc & ID_RECALC_GEOMETRY || scene_delegate_->shading_settings.use_storm_shadows) { if (id->recalc & ID_RECALC_GEOMETRY || light->id.recalc & ID_RECALC_GEOMETRY ||
scene_delegate_->shading_settings.use_storm_shadows)
{
if (prim_type(light) != prim_type_) { if (prim_type(light) != prim_type_) {
remove(); remove();
init(); init();

1
source/blender/io/usd/hydra/shadow_matrix.h
View File

@ -3,7 +3,6 @@
#include <pxr/base/gf/frustum.h> #include <pxr/base/gf/frustum.h>
#include <pxr/imaging/hdx/shadowMatrixComputation.h> #include <pxr/imaging/hdx/shadowMatrixComputation.h>
namespace blender::io::hydra { namespace blender::io::hydra {
class ShadowMatrix : public pxr::HdxShadowMatrixComputation { class ShadowMatrix : public pxr::HdxShadowMatrixComputation {
Vasyl-Pidhirskyi marked this conversation as resolved Outdated
Bogdan Nagirniak commented 2023-08-01 13:44:05 +02:00
Outdated
Review
Copy Link

Move whole class to light.cc

Move whole class to light.cc

3
source/blender/render/hydra/final_engine.cc
View File

@ -64,8 +64,7 @@ void FinalEngine::render(Depsgraph *depsgraph)
tasks.push_back(light_tasks_delegate_->skydome_task()); tasks.push_back(light_tasks_delegate_->skydome_task());
} }
tasks.push_back(light_tasks_delegate_->simple_task()); tasks.push_back(light_tasks_delegate_->simple_task());
if (hydra_scene_delegate_->shading_settings.use_storm_shadows) if (hydra_scene_delegate_->shading_settings.use_storm_shadows) {
{
tasks.push_back(light_tasks_delegate_->shadow_task()); tasks.push_back(light_tasks_delegate_->shadow_task());
} }
} }

3
source/blender/render/hydra/viewport_engine.cc
View File

@ -247,8 +247,7 @@ void ViewportEngine::render(Depsgraph *depsgraph, bContext *context)
tasks.push_back(light_tasks_delegate_->skydome_task()); tasks.push_back(light_tasks_delegate_->skydome_task());
} }
tasks.push_back(light_tasks_delegate_->simple_task()); tasks.push_back(light_tasks_delegate_->simple_task());
if (hydra_scene_delegate_->shading_settings.use_storm_shadows) if (hydra_scene_delegate_->shading_settings.use_storm_shadows) {
{
tasks.push_back(light_tasks_delegate_->shadow_task()); tasks.push_back(light_tasks_delegate_->shadow_task());
} }
} }