dillongoostudios/goo-engine
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cycles: remove unnecessary transform parameters from lights

Browse Source 
The transform matrix already specifies everything, no need to duplicate
this which can lead to mistakes.

Ref #110689
This commit is contained in:
Brecht Van Lommel
2023-08-11 17:22:32 +02:00
parent 1d2b2e23a0
commit 6fa4519b98
4 changed files with 39 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
intern/cycles/blender/light.cpp
-6
View File
@@ -52,8 +52,6 @@ void BlenderSync::sync_light(BL::Object &b_parent,
case BL::Light::type_SPOT: {
BL::SpotLight b_spot_light(b_light);
light->set_size(b_spot_light.shadow_soft_size());
light->set_axisu(transform_get_column(&tfm, 0));
light->set_axisv(transform_get_column(&tfm, 1));
light->set_light_type(LIGHT_SPOT);
light->set_spot_angle(b_spot_light.spot_size());
light->set_spot_smooth(b_spot_light.spot_blend());
@@ -74,8 +72,6 @@ void BlenderSync::sync_light(BL::Object &b_parent,
case BL::Light::type_AREA: {
BL::AreaLight b_area_light(b_light);
light->set_size(1.0f);
light->set_axisu(transform_get_column(&tfm, 0));
light->set_axisv(transform_get_column(&tfm, 1));
light->set_sizeu(b_area_light.size());
light->set_spread(b_area_light.spread());
switch (b_area_light.shape()) {
@@ -106,8 +102,6 @@ void BlenderSync::sync_light(BL::Object &b_parent,
light->set_strength(strength);
/* location and (inverted!) direction */
light->set_co(transform_get_column(&tfm, 3));
light->set_dir(-transform_get_column(&tfm, 2));
light->set_tfm(tfm);
/* shader */
intern/cycles/hydra/light.cpp
-13
View File
@@ -65,14 +65,6 @@ void HdCyclesLight::Sync(HdSceneDelegate *sceneDelegate,
.Get<GfMatrix4d>());
#endif
_light->set_tfm(tfm);
_light->set_co(transform_get_column(&tfm, 3));
_light->set_dir(-transform_get_column(&tfm, 2));
if (_lightType == HdPrimTypeTokens->diskLight || _lightType == HdPrimTypeTokens->rectLight) {
_light->set_axisu(transform_get_column(&tfm, 0));
_light->set_axisv(transform_get_column(&tfm, 1));
}
}
if (*dirtyBits & DirtyBits::DirtyParams) {
@@ -168,11 +160,6 @@ void HdCyclesLight::Sync(HdSceneDelegate *sceneDelegate,
}
_light->set_light_type(shaping ? LIGHT_SPOT : LIGHT_POINT);
if (shaping) {
_light->set_axisu(transform_get_column(&_light->get_tfm(), 0));
_light->set_axisv(transform_get_column(&_light->get_tfm(), 1));
}
}
const bool visible = sceneDelegate->GetVisible(id);
intern/cycles/scene/light.cpp
+33 -18
View File
@@ -99,15 +99,10 @@ NODE_DEFINE(Light)
SOCKET_COLOR(strength, "Strength", one_float3());
SOCKET_POINT(co, "Co", zero_float3());
SOCKET_VECTOR(dir, "Dir", zero_float3());
SOCKET_FLOAT(size, "Size", 0.0f);
SOCKET_FLOAT(angle, "Angle", 0.0f);
SOCKET_VECTOR(axisu, "Axis U", zero_float3());
SOCKET_FLOAT(sizeu, "Size U", 1.0f);
SOCKET_VECTOR(axisv, "Axis V", zero_float3());
SOCKET_FLOAT(sizev, "Size V", 1.0f);
SOCKET_BOOLEAN(ellipse, "Ellipse", false);
SOCKET_FLOAT(spread, "Spread", M_PI_F);
@@ -193,6 +188,26 @@ bool Light::has_shadow_linking() const
return false;
}
float3 Light::get_co() const
{
return transform_get_column(&tfm, 3);
}
float3 Light::get_dir() const
{
return -transform_get_column(&tfm, 2);
}
float3 Light::get_axisu() const
{
return transform_get_column(&tfm, 0);
}
float3 Light::get_axisv() const
{
return transform_get_column(&tfm, 1);
}
/* Light Manager */
LightManager::LightManager()
@@ -1144,8 +1159,8 @@ void LightManager::device_update_lights(Device *device, DeviceScene *dscene, Sce
if (light->is_portal) {
assert(light->light_type == LIGHT_AREA);
float3 extentu = light->axisu * (light->sizeu * light->size);
float3 extentv = light->axisv * (light->sizev * light->size);
float3 extentu = light->get_axisu() * (light->sizeu * light->size);
float3 extentv = light->get_axisv() * (light->sizev * light->size);
float len_u, len_v;
float3 axis_u = normalize_len(extentu, &len_u);
@@ -1160,9 +1175,9 @@ void LightManager::device_update_lights(Device *device, DeviceScene *dscene, Sce
invarea = -invarea;
}
float3 dir = safe_normalize(light->dir);
float3 dir = safe_normalize(light->get_dir());
klights[portal_index].co = light->co;
klights[portal_index].co = light->get_co();
klights[portal_index].area.axis_u = axis_u;
klights[portal_index].area.len_u = len_u;
klights[portal_index].area.axis_v = axis_v;
@@ -1225,14 +1240,14 @@ void LightManager::device_update_lights(Device *device, DeviceScene *dscene, Sce
if (light->use_mis && radius > 0.0f)
shader_id |= SHADER_USE_MIS;
klights[light_index].co = light->co;
klights[light_index].co = light->get_co();
klights[light_index].spot.radius = radius;
klights[light_index].spot.eval_fac = eval_fac;
}
else if (light->light_type == LIGHT_DISTANT) {
shader_id &= ~SHADER_AREA_LIGHT;
float3 dir = safe_normalize(light->dir);
float3 dir = safe_normalize(light->get_dir());
float angle = light->angle / 2.0f;
if (light->use_mis && angle > 0.0f) {
@@ -1276,8 +1291,8 @@ void LightManager::device_update_lights(Device *device, DeviceScene *dscene, Sce
}
else if (light->light_type == LIGHT_AREA) {
float light_size = light->size;
float3 extentu = light->axisu * (light->sizeu * light_size);
float3 extentv = light->axisv * (light->sizev * light_size);
float3 extentu = light->get_axisu() * (light->sizeu * light_size);
float3 extentv = light->get_axisv() * (light->sizev * light_size);
float len_u, len_v;
float3 axis_u = normalize_len(extentu, &len_u);
@@ -1301,12 +1316,12 @@ void LightManager::device_update_lights(Device *device, DeviceScene *dscene, Sce
const float normalize_spread = half_spread > 0.05f ? 1.0f / (tan_half_spread - half_spread) :
3.0f / powf(half_spread, 3.0f);
float3 dir = safe_normalize(light->dir);
float3 dir = safe_normalize(light->get_dir());
if (light->use_mis && area != 0.0f)
shader_id |= SHADER_USE_MIS;
klights[light_index].co = light->co;
klights[light_index].co = light->get_co();
klights[light_index].area.axis_u = axis_u;
klights[light_index].area.len_u = len_u;
klights[light_index].area.axis_v = axis_v;
@@ -1318,11 +1333,11 @@ void LightManager::device_update_lights(Device *device, DeviceScene *dscene, Sce
}
if (light->light_type == LIGHT_SPOT) {
/* Scale axes to accommodate non-uniform scaling. */
float3 scaled_axis_u = light->axisu / len_squared(light->axisu);
float3 scaled_axis_v = light->axisv / len_squared(light->axisv);
float3 scaled_axis_u = light->get_axisu() / len_squared(light->get_axisu());
float3 scaled_axis_v = light->get_axisv() / len_squared(light->get_axisv());
float len_z;
/* Keep direction normalized. */
float3 dir = safe_normalize_len(light->dir, &len_z);
float3 dir = safe_normalize_len(light->get_dir(), &len_z);
float cos_half_spot_angle = cosf(light->spot_angle * 0.5f);
float spot_smooth = 1.0f / ((1.0f - cos_half_spot_angle) * light->spot_smooth);
intern/cycles/scene/light.h
+6 -4
View File
@@ -34,15 +34,11 @@ class Light : public Node {
NODE_SOCKET_API(LightType, light_type)
NODE_SOCKET_API(float3, strength)
NODE_SOCKET_API(float3, co)
NODE_SOCKET_API(float3, dir)
NODE_SOCKET_API(float, size)
NODE_SOCKET_API(float, angle)
NODE_SOCKET_API(float3, axisu)
NODE_SOCKET_API(float, sizeu)
NODE_SOCKET_API(float3, axisv)
NODE_SOCKET_API(float, sizev)
NODE_SOCKET_API(bool, ellipse)
NODE_SOCKET_API(float, spread)
@@ -88,6 +84,12 @@ class Light : public Node {
bool has_light_linking() const;
bool has_shadow_linking() const;
/* Convenience access to transform. */
float3 get_co() const;
float3 get_dir() const;
float3 get_axisu() const;
float3 get_axisv() const;
friend class LightManager;
friend class LightTree;
};