[Bf-blender-cvs] [c78cd1c77c7] temp-compositor-patches: Compositor: Full frame vector nodes
Manuel Castilla
noreply at git.blender.org
Sat Sep 4 15:48:53 CEST 2021
Commit: c78cd1c77c73deb8b306c0b7e24cc22635d1591d
Author: Manuel Castilla
Date: Sat Sep 4 15:23:47 2021 +0200
Branches: temp-compositor-patches
https://developer.blender.org/rBc78cd1c77c73deb8b306c0b7e24cc22635d1591d
Compositor: Full frame vector nodes
Adds full frame implementation to Map Range, Map Value, Normal and
Normalize nodes. The other nodes in "Vector" sub-menu are submitted
separately.
Part of T88150.
Reviewed By: jbakker
Differential Revision: https://developer.blender.org/D12233
===================================================================
M source/blender/compositor/operations/COM_DotproductOperation.cc
M source/blender/compositor/operations/COM_DotproductOperation.h
M source/blender/compositor/operations/COM_MapRangeOperation.cc
M source/blender/compositor/operations/COM_MapRangeOperation.h
M source/blender/compositor/operations/COM_MapValueOperation.cc
M source/blender/compositor/operations/COM_MapValueOperation.h
M source/blender/compositor/operations/COM_NormalizeOperation.cc
M source/blender/compositor/operations/COM_NormalizeOperation.h
===================================================================
diff --git a/source/blender/compositor/operations/COM_DotproductOperation.cc b/source/blender/compositor/operations/COM_DotproductOperation.cc
index 07075ae1d9d..875b161e208 100644
--- a/source/blender/compositor/operations/COM_DotproductOperation.cc
+++ b/source/blender/compositor/operations/COM_DotproductOperation.cc
@@ -28,6 +28,7 @@ DotproductOperation::DotproductOperation()
this->setResolutionInputSocketIndex(0);
this->m_input1Operation = nullptr;
this->m_input2Operation = nullptr;
+ flags.can_be_constant = true;
}
void DotproductOperation::initExecution()
{
@@ -55,4 +56,15 @@ void DotproductOperation::executePixelSampled(float output[4],
output[0] = -(input1[0] * input2[0] + input1[1] * input2[1] + input1[2] * input2[2]);
}
+void DotproductOperation::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 *input1 = it.in(0);
+ const float *input2 = it.in(1);
+ *it.out = -(input1[0] * input2[0] + input1[1] * input2[1] + input1[2] * input2[2]);
+ }
+}
+
} // namespace blender::compositor
diff --git a/source/blender/compositor/operations/COM_DotproductOperation.h b/source/blender/compositor/operations/COM_DotproductOperation.h
index 728033bcf32..c3f39d43fff 100644
--- a/source/blender/compositor/operations/COM_DotproductOperation.h
+++ b/source/blender/compositor/operations/COM_DotproductOperation.h
@@ -18,11 +18,11 @@
#pragma once
-#include "COM_NodeOperation.h"
+#include "COM_MultiThreadedOperation.h"
namespace blender::compositor {
-class DotproductOperation : public NodeOperation {
+class DotproductOperation : public MultiThreadedOperation {
private:
SocketReader *m_input1Operation;
SocketReader *m_input2Operation;
@@ -33,6 +33,10 @@ class DotproductOperation : public NodeOperation {
void initExecution() override;
void deinitExecution() override;
+
+ void update_memory_buffer_partial(MemoryBuffer *output,
+ const rcti &area,
+ Span<MemoryBuffer *> inputs) override;
};
} // namespace blender::compositor
diff --git a/source/blender/compositor/operations/COM_MapRangeOperation.cc b/source/blender/compositor/operations/COM_MapRangeOperation.cc
index ada3cd6f159..82fb033bf24 100644
--- a/source/blender/compositor/operations/COM_MapRangeOperation.cc
+++ b/source/blender/compositor/operations/COM_MapRangeOperation.cc
@@ -30,6 +30,7 @@ MapRangeOperation::MapRangeOperation()
this->addOutputSocket(DataType::Value);
this->m_inputOperation = nullptr;
this->m_useClamp = false;
+ flags.can_be_constant = true;
}
void MapRangeOperation::initExecution()
@@ -104,4 +105,43 @@ void MapRangeOperation::deinitExecution()
this->m_destMaxOperation = nullptr;
}
+void MapRangeOperation::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 source_min = *it.in(1);
+ const float source_max = *it.in(2);
+ if (fabsf(source_max - source_min) < 1e-6f) {
+ it.out[0] = 0.0f;
+ continue;
+ }
+
+ float value = *it.in(0);
+ const float dest_min = *it.in(3);
+ const float dest_max = *it.in(4);
+ if (value >= -BLENDER_ZMAX && value <= BLENDER_ZMAX) {
+ value = (value - source_min) / (source_max - source_min);
+ value = dest_min + value * (dest_max - dest_min);
+ }
+ else if (value > BLENDER_ZMAX) {
+ value = dest_max;
+ }
+ else {
+ value = dest_min;
+ }
+
+ if (m_useClamp) {
+ if (dest_max > dest_min) {
+ CLAMP(value, dest_min, dest_max);
+ }
+ else {
+ CLAMP(value, dest_max, dest_min);
+ }
+ }
+
+ it.out[0] = value;
+ }
+}
+
} // namespace blender::compositor
diff --git a/source/blender/compositor/operations/COM_MapRangeOperation.h b/source/blender/compositor/operations/COM_MapRangeOperation.h
index a544c59887e..a01be14d528 100644
--- a/source/blender/compositor/operations/COM_MapRangeOperation.h
+++ b/source/blender/compositor/operations/COM_MapRangeOperation.h
@@ -18,7 +18,7 @@
#pragma once
-#include "COM_NodeOperation.h"
+#include "COM_MultiThreadedOperation.h"
#include "DNA_texture_types.h"
namespace blender::compositor {
@@ -27,7 +27,7 @@ namespace blender::compositor {
* this program converts an input color to an output value.
* it assumes we are in sRGB color space.
*/
-class MapRangeOperation : public NodeOperation {
+class MapRangeOperation : public MultiThreadedOperation {
private:
/**
* Cached reference to the inputProgram
@@ -68,6 +68,10 @@ class MapRangeOperation : public NodeOperation {
{
this->m_useClamp = value;
}
+
+ void update_memory_buffer_partial(MemoryBuffer *output,
+ const rcti &area,
+ Span<MemoryBuffer *> inputs) override;
};
} // namespace blender::compositor
diff --git a/source/blender/compositor/operations/COM_MapValueOperation.cc b/source/blender/compositor/operations/COM_MapValueOperation.cc
index 03fa80d220d..94fecc3f49e 100644
--- a/source/blender/compositor/operations/COM_MapValueOperation.cc
+++ b/source/blender/compositor/operations/COM_MapValueOperation.cc
@@ -25,6 +25,7 @@ MapValueOperation::MapValueOperation()
this->addInputSocket(DataType::Value);
this->addOutputSocket(DataType::Value);
this->m_inputOperation = nullptr;
+ flags.can_be_constant = true;
}
void MapValueOperation::initExecution()
@@ -60,4 +61,27 @@ void MapValueOperation::deinitExecution()
this->m_inputOperation = nullptr;
}
+void MapValueOperation::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 input = *it.in(0);
+ TexMapping *texmap = this->m_settings;
+ float value = (input + texmap->loc[0]) * texmap->size[0];
+ if (texmap->flag & TEXMAP_CLIP_MIN) {
+ if (value < texmap->min[0]) {
+ value = texmap->min[0];
+ }
+ }
+ if (texmap->flag & TEXMAP_CLIP_MAX) {
+ if (value > texmap->max[0]) {
+ value = texmap->max[0];
+ }
+ }
+
+ it.out[0] = value;
+ }
+}
+
} // namespace blender::compositor
diff --git a/source/blender/compositor/operations/COM_MapValueOperation.h b/source/blender/compositor/operations/COM_MapValueOperation.h
index eb7714714e9..a595eac3155 100644
--- a/source/blender/compositor/operations/COM_MapValueOperation.h
+++ b/source/blender/compositor/operations/COM_MapValueOperation.h
@@ -18,7 +18,7 @@
#pragma once
-#include "COM_NodeOperation.h"
+#include "COM_MultiThreadedOperation.h"
#include "DNA_texture_types.h"
namespace blender::compositor {
@@ -27,7 +27,7 @@ namespace blender::compositor {
* this program converts an input color to an output value.
* it assumes we are in sRGB color space.
*/
-class MapValueOperation : public NodeOperation {
+class MapValueOperation : public MultiThreadedOperation {
private:
/**
* Cached reference to the inputProgram
@@ -63,6 +63,10 @@ class MapValueOperation : public NodeOperation {
{
this->m_settings = settings;
}
+
+ void update_memory_buffer_partial(MemoryBuffer *output,
+ const rcti &area,
+ Span<MemoryBuffer *> inputs) override;
};
} // namespace blender::compositor
diff --git a/source/blender/compositor/operations/COM_NormalizeOperation.cc b/source/blender/compositor/operations/COM_NormalizeOperation.cc
index f93afcaab95..c3e72d2575f 100644
--- a/source/blender/compositor/operations/COM_NormalizeOperation.cc
+++ b/source/blender/compositor/operations/COM_NormalizeOperation.cc
@@ -27,6 +27,7 @@ NormalizeOperation::NormalizeOperation()
this->m_imageReader = nullptr;
this->m_cachedInstance = nullptr;
this->flags.complex = true;
+ flags.can_be_constant = true;
}
void NormalizeOperation::initExecution()
{
@@ -56,6 +57,7 @@ void NormalizeOperation::deinitExecution()
{
this->m_imageReader = nullptr;
delete this->m_cachedInstance;
+ m_cachedInstance = nullptr;
NodeOperation::deinitMutex();
}
@@ -127,4 +129,60 @@ void NormalizeOperation::deinitializeTileData(rcti * /*rect*/, void * /*data*/)
/* pass */
}
+void NormalizeOperation::get_area_of_interest(const int UNUSED(input_idx),
+ const rcti &UNUSED(output_area),
+ rcti &r_input_area)
+{
+ NodeOperation *input = get_input_operation(0);
+ r_input_area.xmin = 0;
+ r_input_area.xmax = input->getWidth();
+ r_input_area.ymin = 0;
+ r_input_area.ymax = input->getHeight();
+}
+
+void NormalizeOperation::update_memory_buffer_started(MemoryBuffer *UNUSED(output),
+ const rcti &UNUSED(area),
+ Span<MemoryBuffer *> inputs)
+{
+ if (m_cachedInstance == nullptr) {
+ MemoryBuffer *input = inputs[0];
+
+ /* Using generic two floats struct to store `x: min`, `y: multiply`. */
+ NodeTwoFloats *minmult = new NodeTwoFloats();
+
+ float minv = 1.0f + BLENDER_ZMAX;
+ float maxv = -1.0f - BLENDER_ZMAX;
+ for (const float *elem : input->as_range()) {
+ const float value = *elem;
+ if ((value > maxv) && (value <= BLENDER_ZMAX)) {
+ maxv = value;
+ }
+ if ((value < minv) && (value >= -BLENDER_ZMAX)) {
+ minv = value;
+ }
+ }
+
+ minmult->x = minv;
+ /* The case of a flat buffer would cause a divide by 0. */
+ minmult->y = ((maxv != minv) ? 1.0f / (maxv - minv) : 0.0
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list