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

Need to do the same light power as Cycles in Watts for Hydra RPR #34

Merged
Bogdan Nagirniak merged 12 commits from BLEN-386 into hydra-render 2023-05-05 08:42:35 +02:00
Conversation 0 Commits 12 Files Changed 1 +11 -14
1 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 0b5e6c9d54 - Show all commits

25
source/blender/render/hydra/scene_delegate/light.cc
View File

@ -25,20 +25,23 @@ void LightData::init()
{
ID_LOG(2, "");
const float round_tolerance = 0.00001f;
Brian Savery (AMD) commented 2023-05-03 18:52:54 +02:00
Outdated
Review
Copy Link

the name here is strange. Maybe "radius_threshold". And please add a comment why.

the name here is strange. Maybe "radius_threshold". And please add a comment why.
Bogdan Nagirniak commented 2023-05-03 21:17:58 +02:00
Outdated
Review
Copy Link

use FLT_EPSILON

use FLT_EPSILON
Georgiy Markelov commented 2023-05-04 10:17:57 +02:00
Outdated
Review
Copy Link

Changed round_tolerance -> FLT_EPSILON. Added comment.

Changed round_tolerance -> FLT_EPSILON. Added comment.
Light *light = (Light *)((Object *)id)->data;
data_.clear();
float intensity = light->energy;
Bogdan Nagirniak commented 2023-05-03 09:45:15 +02:00
Outdated
Review
Copy Link

Do we still need this multiplication?

Do we still need this multiplication?
if (scene_delegate_->engine_type == BlenderSceneDelegate::EngineType::PREVIEW) {
intensity *= 0.001f;
}
data_[pxr::HdLightTokens->color] = pxr::GfVec3f(light->r, light->g, light->b);
switch (light->type) {
case LA_LOCAL:
data_[pxr::HdLightTokens->radius] = std::max(light->radius, 0.000001f);
data_[pxr::HdLightTokens->normalize] = true;
if (light->radius > round_tolerance) {
data_[pxr::HdLightTokens->radius] = light->radius;
data_[pxr::HdLightTokens->normalize] = true;
Bogdan Nagirniak commented 2023-05-03 09:47:02 +02:00
Outdated
Review
Copy Link

if radius == 0, maybe data_[pxr::UsdLuxTokens->treatAsPoint] = true; ?

if radius == 0, maybe `data_[pxr::UsdLuxTokens->treatAsPoint] = true;` ?
}
else {
data_[pxr::UsdLuxTokens->treatAsPoint] = true;
}
intensity /= 40.0f;
Brian Savery (AMD) commented 2023-05-03 18:51:37 +02:00
Outdated
Review
Copy Link

This seems like a strange value. How was this found?

This seems like a strange value. How was this found?
Georgiy Markelov commented 2023-05-04 10:17:22 +02:00
Outdated
Review
Copy Link

Every value has been found empirically.

Every value has been found empirically.
break;
@ -88,12 +91,10 @@ void LightData::init()
}
data_[pxr::HdLightTokens->intensity] = intensity;
data_[pxr::HdLightTokens->exposure] = 0.0f;
Bogdan Nagirniak commented 2023-05-03 09:50:17 +02:00
Outdated
Review
Copy Link

Remove this TODO

Remove this TODO
prim_type_ = prim_type(light);
/* TODO: temporary value, it should be delivered through Python UI */
data_[pxr::HdLightTokens->exposure] = 0.0f;
write_transform();
}
@ -122,7 +123,7 @@ void LightData::update()
}
pxr::HdDirtyBits bits = pxr::HdLight::Clean;
if (id->recalc & ID_RECALC_GEOMETRY) {
if (id->recalc & ID_RECALC_GEOMETRY || light->id.recalc & ID_RECALC_GEOMETRY) {
init();
bits = pxr::HdLight::AllDirty;
}
@ -130,10 +131,6 @@ void LightData::update()
write_transform();
bits = pxr::HdLight::DirtyTransform;
}
Bogdan Nagirniak commented 2023-05-03 09:55:13 +02:00
Outdated
Review
Copy Link

Move this check to L125 and check light->id.recalc & ID_RECALC_GEOMETRY

Move this check to L125 and check `light->id.recalc & ID_RECALC_GEOMETRY`
else if (id->recalc & ID_RECALC_COPY_ON_WRITE) {
init();
bits = pxr::HdLight::AllDirty;
}
scene_delegate_->GetRenderIndex().GetChangeTracker().MarkSprimDirty(prim_id, bits);
}