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 +58 -9
3 changed files with 58 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 5176f868d0 - Show all commits

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

@ -338,7 +338,9 @@ void BlenderSceneDelegate::update_objects(Object *object)
if (!ObjectData::is_supported(object)) {
return;
}
if (!V3D_USES_SCENE_LIGHTS(view3d) && object->type == OB_LAMP) {
return;
}
pxr::SdfPath id = object_prim_id(object);
ObjectData *obj_data = object_data(id);
if (obj_data) {
@ -416,6 +418,36 @@ 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()
{
bool do_update_collection = false;
@ -426,7 +458,20 @@ void BlenderSceneDelegate::check_updates()
shading_flag_ = view3d->shading.flag;
do_update_world = true;
}
bool use_scene_lights_changed = false;
auto a = 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_changed = true;
}
if (use_scene_lights_changed) {
if (use_scene_lights) {
update_scene_lights();
}
else {
remove_unused_objects();
}
}
if (LOOK_DEV_STUDIO_LIGHT_ENABLED(view3d) &&
(world_data_->rotation != view3d->shading.studiolight_rot_z ||
world_data_->intensity != view3d->shading.studiolight_intensity))
@ -578,6 +623,9 @@ void BlenderSceneDelegate::remove_unused_objects()
/* Remove unused objects */
objects_.remove_if([&](auto item) {
bool ret = !available_objects.contains(item.key.GetName());
if (!V3D_USES_SCENE_LIGHTS(view3d) && ((Object *)item.value->id)->type == OB_LAMP) {
ret = true;
}
if (ret) {
item.value->remove();
}

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

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

13
source/blender/render/hydra/scene_delegate/image.cc
View File

@ -67,24 +67,23 @@ static std::string cache_image_file(Image *image,
std::string cache_or_get_image_file(Image *image, bContext *context, ImageUser *iuser)
{
std::string file_path;
char file_path[FILE_MAX];
if (image->source == IMA_SRC_GENERATED) {
file_path = cache_image_file(image, context, iuser, false);
strcpy(file_path, cache_image_file(image, context, iuser, false).c_str());
}
else if (BKE_image_has_packedfile(image)) {
file_path = cache_image_file(image, context, iuser, true);
strcpy(file_path, cache_image_file(image, context, iuser, true).c_str());
}
else {
Main *main = CTX_data_main(context);
file_path.reserve(FILE_MAX);
BKE_image_user_file_path_ex(main, iuser, image, file_path.data(), false, true);
BKE_image_user_file_path_ex(main, iuser, image, file_path, false, true);
BogdanNagirniak marked this conversation as resolved Outdated
Bogdan Nagirniak commented 2023-06-20 10:34:44 +02:00
Outdated
Review
Copy Link

Revert changes in this function and add

char str[FILE_MAX];
BKE_image_user_file_path_ex(main, iuser, image, str, false, true);
file_path = str;
Revert changes in this function and add ``` char str[FILE_MAX]; BKE_image_user_file_path_ex(main, iuser, image, str, false, true); file_path = str; ```
if (!pxr::HioImageRegistry::GetInstance().IsSupportedImageFile(file_path)) {
file_path = cache_image_file(image, context, iuser, true);
strcpy(file_path, cache_image_file(image, context, iuser, true).c_str());
}
}
CLOG_INFO(LOG_RENDER_HYDRA_SCENE, 1, "%s -> %s", image->id.name, file_path.c_str());
CLOG_INFO(LOG_RENDER_HYDRA_SCENE, 1, "%s -> %s", image->id.name, file_path);
return file_path;
}