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

Implement Viewport render with material preview #56

Merged
Bogdan Nagirniak merged 22 commits from BLEN-421 into hydra-render 2023-06-30 09:03:28 +02:00
Conversation 1 Commits 22 Files Changed 7 +18 -38
2 changed files with 18 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit c71afbdbe7 - Show all commits

51
source/blender/render/hydra/scene_delegate/blender_scene_delegate.cc
View File

@ -205,6 +205,8 @@ void BlenderSceneDelegate::populate(Depsgraph *deps, bContext *cont)
check_updates(); check_updates();
} }
else { else {
use_scene_lights = V3D_USES_SCENE_LIGHTS(view3d);
shading_flag_ = view3d->shading.flag;
add_new_objects(); add_new_objects();
update_world(); update_world();
} }
@ -418,36 +420,6 @@ void BlenderSceneDelegate::update_world()
} }
} }
void BlenderSceneDelegate::update_scene_lights() {
DEGObjectIterSettings settings = {0};
settings.depsgraph = depsgraph;
settings.flags = DEG_ITER_OBJECT_FLAG_LINKED_DIRECTLY | DEG_ITER_OBJECT_FLAG_LINKED_VIA_SET;
DEGObjectIterData data = {0};
data.settings = &settings;
data.graph = settings.depsgraph;
data.flag = settings.flags;
eEvaluationMode deg_mode = DEG_get_mode(depsgraph);
ITER_BEGIN (DEG_iterator_objects_begin,
DEG_iterator_objects_next,
DEG_iterator_objects_end,
&data,
Object *,
object)
{
if (object->type == OB_LAMP) {
CLOG_INFO(LOG_RENDER_HYDRA_SCENE,
2,
"Visibility: %s [%s]",
object->id.name,
std::bitset<3>(BKE_object_visibility(object, deg_mode)).to_string().c_str());
update_objects(object);
update_instancers(object);
}
}
ITER_END;
}
void BlenderSceneDelegate::check_updates() void BlenderSceneDelegate::check_updates()
{ {
bool do_update_collection = false; bool do_update_collection = false;
@ -458,15 +430,16 @@ void BlenderSceneDelegate::check_updates()
shading_flag_ = view3d->shading.flag; shading_flag_ = view3d->shading.flag;
do_update_world = true; do_update_world = true;
} }
bool use_scene_lights_changed = false; bool use_scene_lights_changed = false;
auto a = V3D_USES_SCENE_LIGHTS(view3d);
if (use_scene_lights != V3D_USES_SCENE_LIGHTS(view3d)) { if (use_scene_lights != V3D_USES_SCENE_LIGHTS(view3d)) {
use_scene_lights = V3D_USES_SCENE_LIGHTS(view3d); use_scene_lights = V3D_USES_SCENE_LIGHTS(view3d);
use_scene_lights_changed = true; use_scene_lights_changed = true;
} }
if (use_scene_lights_changed) { if (use_scene_lights_changed) {
if (use_scene_lights) { if (use_scene_lights) {
update_scene_lights(); add_new_objects(true);
} }
else { else {
remove_unused_objects(); remove_unused_objects();
@ -552,7 +525,7 @@ void BlenderSceneDelegate::check_updates()
} }
} }
void BlenderSceneDelegate::add_new_objects() void BlenderSceneDelegate::add_new_objects(bool only_lights)
{ {
DEGObjectIterSettings settings = {0}; DEGObjectIterSettings settings = {0};
settings.depsgraph = depsgraph; settings.depsgraph = depsgraph;
@ -575,8 +548,16 @@ void BlenderSceneDelegate::add_new_objects()
"Visibility: %s [%s]", "Visibility: %s [%s]",
object->id.name, object->id.name,
std::bitset<3>(BKE_object_visibility(object, deg_mode)).to_string().c_str()); std::bitset<3>(BKE_object_visibility(object, deg_mode)).to_string().c_str());
update_objects(object); if (only_lights) {
update_instancers(object); if (object->type == OB_LAMP) {
update_objects(object);
update_instancers(object);
}
}
else {
update_objects(object);
update_instancers(object);
}
} }
ITER_END; ITER_END;
} }

5
source/blender/render/hydra/scene_delegate/blender_scene_delegate.h
View File

@ -89,9 +89,8 @@ class BlenderSceneDelegate : public pxr::HdSceneDelegate {
void update_objects(Object *object); void update_objects(Object *object);
void update_instancers(Object *object); void update_instancers(Object *object);
void update_world(); void update_world();
void update_scene_lights();
void check_updates(); void check_updates();
void add_new_objects(); void add_new_objects(bool only_lights = false);
void remove_unused_objects(); void remove_unused_objects();
void update_visibility(); void update_visibility();
@ -101,7 +100,7 @@ class BlenderSceneDelegate : public pxr::HdSceneDelegate {
std::unique_ptr<WorldData> world_data_; std::unique_ptr<WorldData> world_data_;
short shading_flag_; short shading_flag_;
bool use_scene_lights = true; bool use_scene_lights = false;
}; };
#define LOOK_DEV_STUDIO_LIGHT_ENABLED(v3d) \ #define LOOK_DEV_STUDIO_LIGHT_ENABLED(v3d) \