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 +39 -59
4 changed files with 39 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 10bc06fd87 - Show all commits

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

@ -14,6 +14,14 @@ namespace blender::render::hydra {
CLG_LOGREF_DECLARE_GLOBAL(LOG_RENDER_HYDRA_SCENE, "render.hydra.scene");
bool BlenderSceneDelegate::ShadingSettings::operator==(const ShadingSettings &other)
{
return use_scene_lights == other.use_scene_lights && use_scene_world == other.use_scene_world &&
studiolight_name == other.studiolight_name &&
studiolight_rotation == other.studiolight_rotation &&
studiolight_intensity == other.studiolight_intensity;
}
BlenderSceneDelegate::BlenderSceneDelegate(pxr::HdRenderIndex *parent_index,
pxr::SdfPath const &delegate_id,
Engine *engine)
@ -432,7 +440,7 @@ void BlenderSceneDelegate::check_updates()
if (set_light_shading_settings()) {
if (shading_settings.use_scene_lights) {
add_new_objects(true);
add_new_objects();
}
else {
do_update_collection = true;
@ -512,7 +520,7 @@ void BlenderSceneDelegate::check_updates()
}
}
void BlenderSceneDelegate::add_new_objects(bool only_lights)
void BlenderSceneDelegate::add_new_objects()
{
DEGObjectIterSettings settings = {0};
settings.depsgraph = depsgraph;
@ -535,16 +543,11 @@ void BlenderSceneDelegate::add_new_objects(bool only_lights)
"Visibility: %s [%s]",
object->id.name,
std::bitset<3>(BKE_object_visibility(object, deg_mode)).to_string().c_str());
if (only_lights) {
if (object->type == OB_LAMP) {
update_objects(object);
update_instancers(object);
}
}
else {
update_objects(object);
update_instancers(object);
if (object_data(object_prim_id(object))) {
continue;
}
update_objects(object);
update_instancers(object);
}
ITER_END;
}
@ -569,10 +572,13 @@ void BlenderSceneDelegate::remove_unused_objects()
Object *,
object)
{
available_objects.add(instancer_prim_id(object).GetName());
if (ObjectData::is_supported(object)) {
if (!shading_settings.use_scene_lights && object->type == OB_LAMP) {
continue;
}
available_objects.add(object_prim_id(object).GetName());
}
available_objects.add(instancer_prim_id(object).GetName());
}
ITER_END;
@ -591,9 +597,6 @@ void BlenderSceneDelegate::remove_unused_objects()
/* Remove unused objects */
objects_.remove_if([&](auto item) {
bool ret = !available_objects.contains(item.key.GetName());
if (!shading_settings.use_scene_lights && ((Object *)item.value->id)->type == OB_LAMP) {
ret = true;
}
if (ret) {
item.value->remove();
}
@ -681,16 +684,15 @@ bool BlenderSceneDelegate::set_light_shading_settings()
BogdanNagirniak marked this conversation as resolved Outdated
Bogdan Nagirniak commented 2023-06-20 16:38:30 +02:00
Outdated
Review
Copy Link
if (!view3d) {
  return false;
}
.....
return !(shading_settings == prev_settings);
``` if (!view3d) { return false; } ..... return !(shading_settings == prev_settings); ```
bool BlenderSceneDelegate::set_world_shading_settings()
{
BogdanNagirniak marked this conversation as resolved Outdated
Bogdan Nagirniak commented 2023-06-20 13:01:08 +02:00
Outdated
Review
Copy Link

simplify by using add operator==() and copy constructor to ShadingSettings

ShadingSettings prev_settings(shading_settings);
shading_settings. ....
return shading_settings != prev_settings;
simplify by using add `operator==()` and copy constructor to ShadingSettings ``` ShadingSettings prev_settings(shading_settings); shading_settings. .... return shading_settings != prev_settings; ```
bool ret = false;
if (view3d) {
ShadingSettings prev_settings(shading_settings);
shading_settings.use_scene_world = V3D_USES_SCENE_WORLD(view3d);
shading_settings.studiolight_name = view3d->shading.lookdev_light;
shading_settings.studiolight_rotation = view3d->shading.studiolight_rot_z;
shading_settings.studiolight_intensity = view3d->shading.studiolight_intensity;
ret = shading_settings != prev_settings;
if (!view3d) {
return false;
}
return ret;
ShadingSettings prev_settings(shading_settings);
shading_settings.use_scene_world = V3D_USES_SCENE_WORLD(view3d);
shading_settings.studiolight_name = view3d->shading.lookdev_light;
shading_settings.studiolight_rotation = view3d->shading.studiolight_rot_z;
shading_settings.studiolight_intensity = view3d->shading.studiolight_intensity;
return !(shading_settings == prev_settings);
}
} // namespace blender::render::hydra

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

@ -44,22 +44,7 @@ class BlenderSceneDelegate : public pxr::HdSceneDelegate {
float studiolight_rotation;
float studiolight_intensity;
BogdanNagirniak marked this conversation as resolved Outdated
Bogdan Nagirniak commented 2023-06-20 12:39:12 +02:00
Outdated
Review
Copy Link
    bool use_scene_lights = true;
    bool use_scene_world = true;
    std::string studiolight_name;
    float studiolight_rotation;
    floatstudiolight_intensity;
``` bool use_scene_lights = true; bool use_scene_world = true; std::string studiolight_name; float studiolight_rotation; floatstudiolight_intensity; ```
bool operator==(const ShadingSettings &other)
{
return use_scene_lights == other.use_scene_lights &&
use_scene_world == other.use_scene_world &&
studiolight_name == other.studiolight_name &&
studiolight_rotation == other.studiolight_rotation &&
studiolight_intensity == other.studiolight_intensity;
}
bool operator!=(const ShadingSettings &other)
{
return use_scene_lights != other.use_scene_lights ||
use_scene_world != other.use_scene_world ||
studiolight_name != other.studiolight_name ||
studiolight_rotation != other.studiolight_rotation ||
studiolight_intensity != other.studiolight_intensity;
}
bool operator==(const ShadingSettings &other);
BogdanNagirniak marked this conversation as resolved Outdated
Bogdan Nagirniak commented 2023-06-20 16:39:46 +02:00
Outdated
Review
Copy Link

move implementation to blender_scene_delegate.cc

move implementation to blender_scene_delegate.cc
};
BlenderSceneDelegate(pxr::HdRenderIndex *parent_index,
@ -116,7 +101,7 @@ class BlenderSceneDelegate : public pxr::HdSceneDelegate {
void update_instancers(Object *object);
void update_world();
BogdanNagirniak marked this conversation as resolved Outdated
Bogdan Nagirniak commented 2023-06-20 10:31:35 +02:00
Outdated
Review
Copy Link

Move this new settings to internal struct ShadingSettings

Move this new settings to internal `struct ShadingSettings`
void check_updates();
void add_new_objects(bool only_lights = false);
void add_new_objects();
void remove_unused_objects();
void update_visibility();
BogdanNagirniak marked this conversation as resolved Outdated
Bogdan Nagirniak commented 2023-06-20 12:50:27 +02:00
Outdated
Review
Copy Link

remove parameter view3d

remove parameter `view3d`
bool set_light_shading_settings();

5
source/blender/render/hydra/scene_delegate/instancer.cc
View File

@ -272,11 +272,6 @@ void InstancerData::check_remove(Set<std::string> &available_objects)
light_instances_.remove_if([&](auto item) {
bool res = !available_objects.contains(item.key.GetName());
if (!scene_delegate_->shading_settings.use_scene_lights &&
((Object *)item.value.data->id)->type == OB_LAMP)
{
res = true;
}
if (res) {
BogdanNagirniak marked this conversation as resolved Outdated
Bogdan Nagirniak commented 2023-06-20 12:49:24 +02:00
Outdated
Review
Copy Link

use scene_delegate_->shading_settings.use_scene_lights

use `scene_delegate_->shading_settings.use_scene_lights`
Bogdan Nagirniak commented 2023-06-20 16:44:02 +02:00
Outdated
Review
Copy Link

lights shouldn't be in available_objects, this can be reverted

lights shouldn't be in available_objects, this can be reverted
item.value.transforms.clear();
update_light_instance(item.value);

24
source/blender/render/hydra/scene_delegate/world.cc
View File

@ -117,19 +117,17 @@ void WorldData::init()
}
}
else {
if (scene_delegate_->view3d && !scene_delegate_->shading_settings.use_scene_world) {
StudioLight *sl = BKE_studiolight_find(
scene_delegate_->shading_settings.studiolight_name.c_str(),
STUDIOLIGHT_ORIENTATIONS_MATERIAL_MODE);
if (sl != NULL && sl->flag & STUDIOLIGHT_TYPE_WORLD) {
texture_file = pxr::SdfAssetPath(sl->filepath, sl->filepath);
transform *= pxr::GfMatrix4d(
pxr::GfRotation(pxr::GfVec3d(0.0, 0.0, -1.0),
RAD2DEGF(scene_delegate_->shading_settings.studiolight_rotation)),
pxr::GfVec3d());
/* coefficient to follow Cycles result */
intensity = scene_delegate_->shading_settings.studiolight_intensity / 2;
}
StudioLight *sl = BKE_studiolight_find(
BogdanNagirniak marked this conversation as resolved Outdated
Bogdan Nagirniak commented 2023-06-20 16:48:33 +02:00
Outdated
Review
Copy Link

thif if can be removed

thif `if` can be removed
scene_delegate_->shading_settings.studiolight_name.c_str(),
STUDIOLIGHT_ORIENTATIONS_MATERIAL_MODE);
if (sl != NULL && sl->flag & STUDIOLIGHT_TYPE_WORLD) {
texture_file = pxr::SdfAssetPath(sl->filepath, sl->filepath);
transform *= pxr::GfMatrix4d(
pxr::GfRotation(pxr::GfVec3d(0.0, 0.0, -1.0),
RAD2DEGF(scene_delegate_->shading_settings.studiolight_rotation)),
pxr::GfVec3d());
/* coefficient to follow Cycles result */
intensity = scene_delegate_->shading_settings.studiolight_intensity / 2;
}
}