Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2019-04-17 07:17:24 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-04-17 07:21:24 +0300
commite12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 (patch)
tree8cf3453d12edb177a218ef8009357518ec6cab6a /source/blender/compositor/operations/COM_PlaneDistortCommonOperation.cpp
parentb3dabc200a4b0399ec6b81f2ff2730d07b44fcaa (diff)
ClangFormat: apply to source, most of intern
Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
Diffstat (limited to 'source/blender/compositor/operations/COM_PlaneDistortCommonOperation.cpp')
-rw-r--r--source/blender/compositor/operations/COM_PlaneDistortCommonOperation.cpp304
1 files changed, 150 insertions, 154 deletions
diff --git a/source/blender/compositor/operations/COM_PlaneDistortCommonOperation.cpp b/source/blender/compositor/operations/COM_PlaneDistortCommonOperation.cpp
index c7f60d0dac2..ef7dfbd4116 100644
--- a/source/blender/compositor/operations/COM_PlaneDistortCommonOperation.cpp
+++ b/source/blender/compositor/operations/COM_PlaneDistortCommonOperation.cpp
@@ -35,200 +35,196 @@ extern "C" {
BLI_INLINE void warpCoord(float x, float y, float matrix[3][3], float uv[2], float deriv[2][2])
{
- float vec[3] = {x, y, 1.0f};
- mul_m3_v3(matrix, vec);
- uv[0] = vec[0] / vec[2];
- uv[1] = vec[1] / vec[2];
-
- deriv[0][0] = (matrix[0][0] - matrix[0][2] * uv[0]) / vec[2];
- deriv[1][0] = (matrix[0][1] - matrix[0][2] * uv[1]) / vec[2];
- deriv[0][1] = (matrix[1][0] - matrix[1][2] * uv[0]) / vec[2];
- deriv[1][1] = (matrix[1][1] - matrix[1][2] * uv[1]) / vec[2];
+ float vec[3] = {x, y, 1.0f};
+ mul_m3_v3(matrix, vec);
+ uv[0] = vec[0] / vec[2];
+ uv[1] = vec[1] / vec[2];
+
+ deriv[0][0] = (matrix[0][0] - matrix[0][2] * uv[0]) / vec[2];
+ deriv[1][0] = (matrix[0][1] - matrix[0][2] * uv[1]) / vec[2];
+ deriv[0][1] = (matrix[1][0] - matrix[1][2] * uv[0]) / vec[2];
+ deriv[1][1] = (matrix[1][1] - matrix[1][2] * uv[1]) / vec[2];
}
-PlaneDistortWarpImageOperation::PlaneDistortWarpImageOperation() :
- NodeOperation()
+PlaneDistortWarpImageOperation::PlaneDistortWarpImageOperation() : NodeOperation()
{
- this->addInputSocket(COM_DT_COLOR, COM_SC_NO_RESIZE);
- this->addOutputSocket(COM_DT_COLOR);
- this->m_pixelReader = NULL;
- this->m_motion_blur_samples = 1;
- this->m_motion_blur_shutter = 0.5f;
- this->setComplex(true);
+ this->addInputSocket(COM_DT_COLOR, COM_SC_NO_RESIZE);
+ this->addOutputSocket(COM_DT_COLOR);
+ this->m_pixelReader = NULL;
+ this->m_motion_blur_samples = 1;
+ this->m_motion_blur_shutter = 0.5f;
+ this->setComplex(true);
}
void PlaneDistortWarpImageOperation::calculateCorners(const float corners[4][2],
bool normalized,
int sample)
{
- BLI_assert(sample < this->m_motion_blur_samples);
- const int width = this->m_pixelReader->getWidth();
- const int height = this->m_pixelReader->getHeight();
- float frame_corners[4][2] = {{0.0f, 0.0f},
- {(float) width, 0.0f},
- {(float) width, (float) height},
- {0.0f, (float) height}};
- MotionSample *sample_data = &this->m_samples[sample];
- if (normalized) {
- for (int i = 0; i < 4; i++) {
- sample_data->frameSpaceCorners[i][0] = corners[i][0] * this->getWidth();
- sample_data->frameSpaceCorners[i][1] = corners[i][1] * this->getHeight();
- }
- }
- else {
- for (int i = 0; i < 4; i++) {
- sample_data->frameSpaceCorners[i][0] = corners[i][0];
- sample_data->frameSpaceCorners[i][1] = corners[i][1];
- }
- }
- BKE_tracking_homography_between_two_quads(sample_data->frameSpaceCorners,
- frame_corners,
- sample_data->perspectiveMatrix);
+ BLI_assert(sample < this->m_motion_blur_samples);
+ const int width = this->m_pixelReader->getWidth();
+ const int height = this->m_pixelReader->getHeight();
+ float frame_corners[4][2] = {
+ {0.0f, 0.0f}, {(float)width, 0.0f}, {(float)width, (float)height}, {0.0f, (float)height}};
+ MotionSample *sample_data = &this->m_samples[sample];
+ if (normalized) {
+ for (int i = 0; i < 4; i++) {
+ sample_data->frameSpaceCorners[i][0] = corners[i][0] * this->getWidth();
+ sample_data->frameSpaceCorners[i][1] = corners[i][1] * this->getHeight();
+ }
+ }
+ else {
+ for (int i = 0; i < 4; i++) {
+ sample_data->frameSpaceCorners[i][0] = corners[i][0];
+ sample_data->frameSpaceCorners[i][1] = corners[i][1];
+ }
+ }
+ BKE_tracking_homography_between_two_quads(
+ sample_data->frameSpaceCorners, frame_corners, sample_data->perspectiveMatrix);
}
void PlaneDistortWarpImageOperation::initExecution()
{
- this->m_pixelReader = this->getInputSocketReader(0);
+ this->m_pixelReader = this->getInputSocketReader(0);
}
void PlaneDistortWarpImageOperation::deinitExecution()
{
- this->m_pixelReader = NULL;
+ this->m_pixelReader = NULL;
}
-void PlaneDistortWarpImageOperation::executePixelSampled(float output[4], float x, float y, PixelSampler /*sampler*/)
+void PlaneDistortWarpImageOperation::executePixelSampled(float output[4],
+ float x,
+ float y,
+ PixelSampler /*sampler*/)
{
- float uv[2];
- float deriv[2][2];
- if (this->m_motion_blur_samples == 1) {
- warpCoord(x, y, this->m_samples[0].perspectiveMatrix, uv, deriv);
- m_pixelReader->readFiltered(output,
- uv[0], uv[1],
- deriv[0], deriv[1]);
- }
- else {
- zero_v4(output);
- for (int sample = 0; sample < this->m_motion_blur_samples; ++sample) {
- float color[4];
- warpCoord(x, y, this->m_samples[sample].perspectiveMatrix, uv, deriv);
- m_pixelReader->readFiltered(color,
- uv[0], uv[1],
- deriv[0], deriv[1]);
- add_v4_v4(output, color);
- }
- mul_v4_fl(output, 1.0f / (float)this->m_motion_blur_samples);
- }
+ float uv[2];
+ float deriv[2][2];
+ if (this->m_motion_blur_samples == 1) {
+ warpCoord(x, y, this->m_samples[0].perspectiveMatrix, uv, deriv);
+ m_pixelReader->readFiltered(output, uv[0], uv[1], deriv[0], deriv[1]);
+ }
+ else {
+ zero_v4(output);
+ for (int sample = 0; sample < this->m_motion_blur_samples; ++sample) {
+ float color[4];
+ warpCoord(x, y, this->m_samples[sample].perspectiveMatrix, uv, deriv);
+ m_pixelReader->readFiltered(color, uv[0], uv[1], deriv[0], deriv[1]);
+ add_v4_v4(output, color);
+ }
+ mul_v4_fl(output, 1.0f / (float)this->m_motion_blur_samples);
+ }
}
-bool PlaneDistortWarpImageOperation::determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output)
+bool PlaneDistortWarpImageOperation::determineDependingAreaOfInterest(
+ rcti *input, ReadBufferOperation *readOperation, rcti *output)
{
- float min[2], max[2];
- INIT_MINMAX2(min, max);
-
- for (int sample = 0; sample < this->m_motion_blur_samples; ++sample) {
- float UVs[4][2];
- float deriv[2][2];
- MotionSample *sample_data = &this->m_samples[sample];
- /* TODO(sergey): figure out proper way to do this. */
- warpCoord(input->xmin - 2, input->ymin - 2, sample_data->perspectiveMatrix, UVs[0], deriv);
- warpCoord(input->xmax + 2, input->ymin - 2, sample_data->perspectiveMatrix, UVs[1], deriv);
- warpCoord(input->xmax + 2, input->ymax + 2, sample_data->perspectiveMatrix, UVs[2], deriv);
- warpCoord(input->xmin - 2, input->ymax + 2, sample_data->perspectiveMatrix, UVs[3], deriv);
- for (int i = 0; i < 4; i++) {
- minmax_v2v2_v2(min, max, UVs[i]);
- }
- }
-
- rcti newInput;
-
- newInput.xmin = min[0] - 1;
- newInput.ymin = min[1] - 1;
- newInput.xmax = max[0] + 1;
- newInput.ymax = max[1] + 1;
-
- return NodeOperation::determineDependingAreaOfInterest(&newInput, readOperation, output);
+ float min[2], max[2];
+ INIT_MINMAX2(min, max);
+
+ for (int sample = 0; sample < this->m_motion_blur_samples; ++sample) {
+ float UVs[4][2];
+ float deriv[2][2];
+ MotionSample *sample_data = &this->m_samples[sample];
+ /* TODO(sergey): figure out proper way to do this. */
+ warpCoord(input->xmin - 2, input->ymin - 2, sample_data->perspectiveMatrix, UVs[0], deriv);
+ warpCoord(input->xmax + 2, input->ymin - 2, sample_data->perspectiveMatrix, UVs[1], deriv);
+ warpCoord(input->xmax + 2, input->ymax + 2, sample_data->perspectiveMatrix, UVs[2], deriv);
+ warpCoord(input->xmin - 2, input->ymax + 2, sample_data->perspectiveMatrix, UVs[3], deriv);
+ for (int i = 0; i < 4; i++) {
+ minmax_v2v2_v2(min, max, UVs[i]);
+ }
+ }
+
+ rcti newInput;
+
+ newInput.xmin = min[0] - 1;
+ newInput.ymin = min[1] - 1;
+ newInput.xmax = max[0] + 1;
+ newInput.ymax = max[1] + 1;
+
+ return NodeOperation::determineDependingAreaOfInterest(&newInput, readOperation, output);
}
-
/* ******** PlaneDistort Mask ******** */
-PlaneDistortMaskOperation::PlaneDistortMaskOperation() :
- NodeOperation()
+PlaneDistortMaskOperation::PlaneDistortMaskOperation() : NodeOperation()
{
- addOutputSocket(COM_DT_VALUE);
+ addOutputSocket(COM_DT_VALUE);
- /* Currently hardcoded to 8 samples. */
- m_osa = 8;
- this->m_motion_blur_samples = 1;
- this->m_motion_blur_shutter = 0.5f;
+ /* Currently hardcoded to 8 samples. */
+ m_osa = 8;
+ this->m_motion_blur_samples = 1;
+ this->m_motion_blur_shutter = 0.5f;
}
void PlaneDistortMaskOperation::calculateCorners(const float corners[4][2],
bool normalized,
int sample)
{
- BLI_assert(sample < this->m_motion_blur_samples);
- MotionSample *sample_data = &this->m_samples[sample];
- if (normalized) {
- for (int i = 0; i < 4; i++) {
- sample_data->frameSpaceCorners[i][0] = corners[i][0] * this->getWidth();
- sample_data->frameSpaceCorners[i][1] = corners[i][1] * this->getHeight();
- }
- }
- else {
- for (int i = 0; i < 4; i++) {
- sample_data->frameSpaceCorners[i][0] = corners[i][0];
- sample_data->frameSpaceCorners[i][1] = corners[i][1];
- }
- }
+ BLI_assert(sample < this->m_motion_blur_samples);
+ MotionSample *sample_data = &this->m_samples[sample];
+ if (normalized) {
+ for (int i = 0; i < 4; i++) {
+ sample_data->frameSpaceCorners[i][0] = corners[i][0] * this->getWidth();
+ sample_data->frameSpaceCorners[i][1] = corners[i][1] * this->getHeight();
+ }
+ }
+ else {
+ for (int i = 0; i < 4; i++) {
+ sample_data->frameSpaceCorners[i][0] = corners[i][0];
+ sample_data->frameSpaceCorners[i][1] = corners[i][1];
+ }
+ }
}
void PlaneDistortMaskOperation::initExecution()
{
- BLI_jitter_init(m_jitter, m_osa);
+ BLI_jitter_init(m_jitter, m_osa);
}
-void PlaneDistortMaskOperation::executePixelSampled(float output[4], float x, float y, PixelSampler /*sampler*/)
+void PlaneDistortMaskOperation::executePixelSampled(float output[4],
+ float x,
+ float y,
+ PixelSampler /*sampler*/)
{
- float point[2];
- int inside_counter = 0;
- if (this->m_motion_blur_samples == 1) {
- MotionSample *sample_data = &this->m_samples[0];
- for (int sample = 0; sample < this->m_osa; sample++) {
- point[0] = x + this->m_jitter[sample][0];
- point[1] = y + this->m_jitter[sample][1];
- if (isect_point_tri_v2(point, sample_data->frameSpaceCorners[0],
- sample_data->frameSpaceCorners[1],
- sample_data->frameSpaceCorners[2]) ||
- isect_point_tri_v2(point, sample_data->frameSpaceCorners[0],
- sample_data->frameSpaceCorners[2],
- sample_data->frameSpaceCorners[3]))
- {
- inside_counter++;
- }
- }
- output[0] = (float)inside_counter / this->m_osa;
- }
- else {
- for (int motion_sample = 0;
- motion_sample < this->m_motion_blur_samples;
- ++motion_sample)
- {
- MotionSample *sample_data = &this->m_samples[motion_sample];
- for (int osa_sample = 0; osa_sample < this->m_osa; ++osa_sample) {
- point[0] = x + this->m_jitter[osa_sample][0];
- point[1] = y + this->m_jitter[osa_sample][1];
- if (isect_point_tri_v2(point, sample_data->frameSpaceCorners[0],
- sample_data->frameSpaceCorners[1],
- sample_data->frameSpaceCorners[2]) ||
- isect_point_tri_v2(point, sample_data->frameSpaceCorners[0],
- sample_data->frameSpaceCorners[2],
- sample_data->frameSpaceCorners[3]))
- {
- inside_counter++;
- }
- }
- }
- output[0] = (float)inside_counter / (this->m_osa * this->m_motion_blur_samples);
- }
+ float point[2];
+ int inside_counter = 0;
+ if (this->m_motion_blur_samples == 1) {
+ MotionSample *sample_data = &this->m_samples[0];
+ for (int sample = 0; sample < this->m_osa; sample++) {
+ point[0] = x + this->m_jitter[sample][0];
+ point[1] = y + this->m_jitter[sample][1];
+ if (isect_point_tri_v2(point,
+ sample_data->frameSpaceCorners[0],
+ sample_data->frameSpaceCorners[1],
+ sample_data->frameSpaceCorners[2]) ||
+ isect_point_tri_v2(point,
+ sample_data->frameSpaceCorners[0],
+ sample_data->frameSpaceCorners[2],
+ sample_data->frameSpaceCorners[3])) {
+ inside_counter++;
+ }
+ }
+ output[0] = (float)inside_counter / this->m_osa;
+ }
+ else {
+ for (int motion_sample = 0; motion_sample < this->m_motion_blur_samples; ++motion_sample) {
+ MotionSample *sample_data = &this->m_samples[motion_sample];
+ for (int osa_sample = 0; osa_sample < this->m_osa; ++osa_sample) {
+ point[0] = x + this->m_jitter[osa_sample][0];
+ point[1] = y + this->m_jitter[osa_sample][1];
+ if (isect_point_tri_v2(point,
+ sample_data->frameSpaceCorners[0],
+ sample_data->frameSpaceCorners[1],
+ sample_data->frameSpaceCorners[2]) ||
+ isect_point_tri_v2(point,
+ sample_data->frameSpaceCorners[0],
+ sample_data->frameSpaceCorners[2],
+ sample_data->frameSpaceCorners[3])) {
+ inside_counter++;
+ }
+ }
+ }
+ output[0] = (float)inside_counter / (this->m_osa * this->m_motion_blur_samples);
+ }
}