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 +23 -14
1 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,6 +7,7 @@
#include <pxr/imaging/hd/tokens.h> #include <pxr/imaging/hd/tokens.h>
#include <pxr/usd/usdLux/tokens.h> #include <pxr/usd/usdLux/tokens.h>
#include "BLI_math_rotation.h"
#include "DNA_light_types.h" #include "DNA_light_types.h"
#include "blender_scene_delegate.h" #include "blender_scene_delegate.h"
@ -29,26 +30,30 @@ void LightData::init()
data_.clear(); data_.clear();
float intensity = light->energy; float intensity = light->energy;
if (scene_delegate_->engine_type == BlenderSceneDelegate::EngineType::PREVIEW) {
intensity *= 0.001;
}
data_[pxr::HdLightTokens->intensity] = intensity;
data_[pxr::HdLightTokens->color] = pxr::GfVec3f(light->r, light->g, light->b); data_[pxr::HdLightTokens->color] = pxr::GfVec3f(light->r, light->g, light->b);
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?
switch (light->type) { switch (light->type) {
case LA_LOCAL: case LA_LOCAL:
data_[pxr::HdLightTokens->radius] = light->area_size / 2; if (light->radius <= FLT_EPSILON) {
/* extremely small object should be considered as point */
data_[pxr::UsdLuxTokens->treatAsPoint] = 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::HdLightTokens->radius] = light->radius;
data_[pxr::HdLightTokens->normalize] = true;
}
intensity /= 40.0f; /* coefficient approximated to follow Cycles results */
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; break;
case LA_SUN: case LA_SUN:
data_[pxr::HdLightTokens->angle] = light->sun_angle * 180.0 / M_PI; data_[pxr::HdLightTokens->angle] = RAD2DEGF(light->sun_angle * 0.5f);
break; break;
case LA_SPOT: case LA_SPOT:
data_[pxr::HdLightTokens->shapingConeAngle] = light->spotsize / 2; data_[pxr::UsdLuxTokens->inputsShapingConeAngle] = RAD2DEGF(light->spotsize * 0.5f);
data_[pxr::HdLightTokens->shapingConeSoftness] = light->spotblend; data_[pxr::UsdLuxTokens->inputsShapingConeSoftness] = light->spotblend;
data_[pxr::UsdLuxTokens->treatAsPoint] = true; data_[pxr::UsdLuxTokens->treatAsPoint] = true;
intensity /= 10.0f; /* coefficient approximated to follow Cycles results */
break; break;
case LA_AREA: case LA_AREA:
@ -56,18 +61,22 @@ void LightData::init()
case LA_AREA_SQUARE: case LA_AREA_SQUARE:
data_[pxr::HdLightTokens->width] = light->area_size; data_[pxr::HdLightTokens->width] = light->area_size;
data_[pxr::HdLightTokens->height] = light->area_size; data_[pxr::HdLightTokens->height] = light->area_size;
intensity /= 4.0f; /* coefficient approximated to follow Cycles results */
break; break;
case LA_AREA_RECT: case LA_AREA_RECT:
data_[pxr::HdLightTokens->width] = light->area_size; data_[pxr::HdLightTokens->width] = light->area_size;
data_[pxr::HdLightTokens->height] = light->area_sizey; data_[pxr::HdLightTokens->height] = light->area_sizey;
intensity /= 4.0f; /* coefficient approximated to follow Cycles results */
break; break;
case LA_AREA_DISK: case LA_AREA_DISK:
data_[pxr::HdLightTokens->radius] = light->area_size / 2; data_[pxr::HdLightTokens->radius] = light->area_size / 2.0f;
intensity /= 16.0f; /* coefficient approximated to follow Cycles results */
break; break;
case LA_AREA_ELLIPSE: case LA_AREA_ELLIPSE:
data_[pxr::HdLightTokens->radius] = (light->area_size + light->area_sizey) / 4; data_[pxr::HdLightTokens->radius] = (light->area_size + light->area_sizey) / 4.0f;
intensity /= 16.0f; /* coefficient approximated to follow Cycles results */
break; break;
default: default:
@ -80,10 +89,10 @@ void LightData::init()
break; break;
} }
prim_type_ = prim_type(light); 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
/* TODO: temporary value, it should be delivered through Python UI */ prim_type_ = prim_type(light);
data_[pxr::HdLightTokens->exposure] = 1.0f;
write_transform(); write_transform();
} }