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

BLEN-335: Export environment light #1

Merged
Bogdan Nagirniak merged 13 commits from BLEN-335 into hydra-render 2023-02-17 14:46:46 +01:00
Conversation 0 Commits 13 Files Changed 9 +33 -27
4 changed files with 33 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 2a3828de41 - Show all commits

10
source/blender/render/hydra/sceneDelegate/blenderSceneDelegate.cc
View File

@ -61,16 +61,20 @@ void BlenderSceneDelegate::add_update_world(World *world)
LOG(INFO) << "Add world: " << world_light_id;
if (!world) {
world_data.reset();
world_data = nullptr;
DagerD marked this conversation as resolved
Bogdan Nagirniak commented 2023-02-16 15:10:46 +01:00
Review
Copy Link

world_data = nullptr;

`world_data = nullptr;`
GetRenderIndex().RemoveSprim(HdPrimTypeTokens->domeLight, world_light_id);
DagerD marked this conversation as resolved
Bogdan Nagirniak commented 2023-02-16 15:16:34 +01:00
Review
Copy Link

if (world_data) ...

if (world_data) ...
return;
}
if (!world_data) {
world_data = make_unique<WorldData>(world, (bContext *)b_context->ptr.data);
DagerD marked this conversation as resolved
Bogdan Nagirniak commented 2023-02-16 15:16:11 +01:00
Review
Copy Link
if (!world_data) {
world_data = make_unique....
insertSprim
}
else {
world_data = make_unique....
changetracker
}
``` if (!world_data) { world_data = make_unique.... insertSprim } else { world_data = make_unique.... changetracker } ```
GetRenderIndex().InsertSprim(HdPrimTypeTokens->domeLight, this, world_light_id);
}
else {
world_data = make_unique<WorldData>(world, (bContext *)b_context->ptr.data);
GetRenderIndex().GetChangeTracker().MarkSprimDirty(world_light_id, HdLight::AllDirty);
}
}
bool BlenderSceneDelegate::GetVisible(SdfPath const &id)
{
@ -464,7 +468,6 @@ VtValue BlenderSceneDelegate::GetLightParamValue(SdfPath const& id, TfToken cons
HdRenderIndex &index = GetRenderIndex();
if (index.HasRprim(id)) {
ObjectData *obj_data = object_data(id);
if (obj_data) {
if (obj_data->has_data(key)) {
@ -475,7 +478,6 @@ VtValue BlenderSceneDelegate::GetLightParamValue(SdfPath const& id, TfToken cons
ret = 1.0f;
}
}
}
else if (id == world_id()) {
if (world_data->has_data(key)) {
ret = world_data->get_data(key);

4
source/blender/render/hydra/sceneDelegate/world.cc
View File

@ -47,7 +47,7 @@ WorldData::WorldData(World *world, bContext *b_context)
bNode *output_node = ntreeShaderOutputNode(world->nodetree, SHD_OUTPUT_ALL);
bNodeSocket input_socket = output_node->input_by_identifier("Surface");
bNodeLink const *link = input_socket.directly_linked_links()[0];
if (!link) {
if (input_socket.directly_linked_links().is_empty()) {
return;
}
@ -91,7 +91,7 @@ WorldData::WorldData(World *world, bContext *b_context)
}
}
GfMatrix4d WorldData::transform(string renderer_name)
GfMatrix4d WorldData::transform(string const &renderer_name)
DagerD marked this conversation as resolved
Bogdan Nagirniak commented 2023-02-16 15:04:59 +01:00
Review
Copy Link

string const &

`string const &`
{
GfMatrix4d transform = GfMatrix4d().SetIdentity();

2
source/blender/render/hydra/sceneDelegate/world.h
View File

@ -22,7 +22,7 @@ public:
WorldData(World *world, bContext *b_context);
pxr::TfToken prim_type();
pxr::GfMatrix4d transform(std::string renderer_name);
pxr::GfMatrix4d transform(std::string const &renderer_name);
pxr::VtValue &get_data(pxr::TfToken const &key);
template<class T>

22
source/blender/render/hydra/utils.cc
View File

@ -15,7 +15,6 @@
#include "utils.h"
using namespace pxr;
using namespace std;
DagerD marked this conversation as resolved
Bogdan Nagirniak commented 2023-02-16 14:58:19 +01:00
Review
Copy Link

remove this

remove this
using namespace pxr;
@ -34,22 +33,27 @@ string format_duration(chrono::milliseconds millisecs)
{
stringstream ss;
bool neg = millisecs < 0ms;
if (neg)
if (neg) {
millisecs = -millisecs;
}
auto m = chrono::duration_cast<chrono::minutes>(millisecs);
millisecs -= m;
auto s = chrono::duration_cast<chrono::seconds>(millisecs);
millisecs -= s;
if (neg)
if (neg) {
ss << "-";
DagerD marked this conversation as resolved
Bogdan Nagirniak commented 2023-02-16 14:58:54 +01:00
Review
Copy Link

add {...}

add {...}
if (m < 10min)
}
if (m < 10min) {
ss << "0";
}
ss << to_string(m / 1min) << ":";
if (s < 10s)
if (s < 10s) {
ss << "0";
}
ss << to_string(s / 1s) << ":";
if (millisecs < 10ms)
if (millisecs < 10ms) {
ss << "0";
}
ss << to_string(millisecs / 1ms / 10);
return ss.str();
}
@ -86,13 +90,13 @@ string cache_image(Main *bmain,
BLI_path_join(tempfile, sizeof(tempfile), BKE_tempdir_session(), image_name.c_str());
STRNCPY(opts->filepath, tempfile);
if (BKE_image_save(reports, bmain, image, iuser, opts)) {
if (!BKE_image_save(reports, bmain, image, iuser, opts)) {
BKE_image_save_options_free(opts);
return tempfile;
return "";
};
BKE_image_save_options_free(opts);
return "";
return tempfile;
}
} // namespace blender::render::hydra