[Bf-blender-cvs] [1a0b2ef90f1] compositor-full-frame: Compositor: Full frame Defocus node
Manuel Castilla
noreply at git.blender.org
Thu Aug 12 01:06:40 CEST 2021
Commit: 1a0b2ef90f187a457f6ae3c4b9320ed02ae23b16
Author: Manuel Castilla
Date: Tue Aug 10 18:44:15 2021 +0200
Branches: compositor-full-frame
https://developer.blender.org/rB1a0b2ef90f187a457f6ae3c4b9320ed02ae23b16
Compositor: Full frame Defocus node
===================================================================
M source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.cc
M source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.h
===================================================================
diff --git a/source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.cc b/source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.cc
index 57027c11949..258310af1de 100644
--- a/source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.cc
+++ b/source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.cc
@@ -116,4 +116,31 @@ void ConvertDepthToRadiusOperation::deinitExecution()
this->m_inputOperation = nullptr;
}
+void ConvertDepthToRadiusOperation::update_memory_buffer_partial(MemoryBuffer *output,
+ const rcti &area,
+ Span<MemoryBuffer *> inputs)
+{
+ for (BuffersIterator<float> it = output->iterate_with(inputs, area); !it.is_end(); ++it) {
+ const float z = *it.in(0);
+ if (z == 0.0f) {
+ *it.out = 0.0f;
+ continue;
+ }
+
+ const float inv_z = (1.0f / z);
+
+ /* bug T6656 part 2b, do not re-scale. */
+#if 0
+ bcrad = 0.5f * fabs(aperture * (dof_sp * (cam_invfdist - iZ) - 1.0f));
+ // scale crad back to original maximum and blend
+ crad->rect[px] = bcrad + wts->rect[px] * (scf * crad->rect[px] - bcrad);
+#endif
+ const float radius = 0.5f *
+ fabsf(m_aperture * (m_dof_sp * (m_inverseFocalDistance - inv_z) - 1.0f));
+ /* 'bug' T6615, limit minimum radius to 1 pixel,
+ * not really a solution, but somewhat mitigates the problem. */
+ *it.out = CLAMPIS(radius, 0.0f, m_maxRadius);
+ }
+}
+
} // namespace blender::compositor
diff --git a/source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.h b/source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.h
index 1f4e856b128..3d163843d06 100644
--- a/source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.h
+++ b/source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.h
@@ -19,7 +19,7 @@
#pragma once
#include "COM_FastGaussianBlurOperation.h"
-#include "COM_NodeOperation.h"
+#include "COM_MultiThreadedOperation.h"
#include "DNA_object_types.h"
namespace blender::compositor {
@@ -28,7 +28,7 @@ namespace blender::compositor {
* this program converts an input color to an output value.
* it assumes we are in sRGB color space.
*/
-class ConvertDepthToRadiusOperation : public NodeOperation {
+class ConvertDepthToRadiusOperation : public MultiThreadedOperation {
private:
/**
* Cached reference to the inputProgram
@@ -83,6 +83,10 @@ class ConvertDepthToRadiusOperation : public NodeOperation {
{
this->m_blurPostOperation = operation;
}
+
+ void update_memory_buffer_partial(MemoryBuffer *output,
+ const rcti &area,
+ Span<MemoryBuffer *> inputs) override;
};
} // namespace blender::compositor
More information about the Bf-blender-cvs
mailing list