archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Merge branch 'master' into blender2.8

Browse Source
This commit is contained in:
Campbell Barton
2018-07-13 12:22:21 +02:00
parent 399cbd3b6b 30bffb5a3a
commit c7c7bfae75
12 changed files with 222 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source/blender/compositor/nodes/COM_MathNode.cpp
View File

@@ -89,6 +89,18 @@ void MathNode::convertToOperations(NodeConverter &converter, const CompositorCon
case NODE_MATH_ATAN2:
operation = new MathArcTan2Operation();
break;
case NODE_MATH_FLOOR:
operation = new MathFloorOperation();
break;
case NODE_MATH_CEIL:
operation = new MathCeilOperation();
break;
case NODE_MATH_FRACT:
operation = new MathFractOperation();
break;
case NODE_MATH_SQRT:
operation = new MathSqrtOperation();
break;
}
if (operation) {

47
source/blender/compositor/operations/COM_MathBaseOperation.cpp
View File

@@ -356,3 +356,50 @@ void MathArcTan2Operation::executePixelSampled(float output[4], float x, float y
clampIfNeeded(output);
}
void MathFloorOperation::executePixelSampled(float output[4], float x, float y, PixelSampler sampler)
{
float inputValue1[4];
this->m_inputValue1Operation->readSampled(inputValue1, x, y, sampler);
output[0] = floor(inputValue1[0]);
clampIfNeeded(output);
}
void MathCeilOperation::executePixelSampled(float output[4], float x, float y, PixelSampler sampler)
{
float inputValue1[4];
this->m_inputValue1Operation->readSampled(inputValue1, x, y, sampler);
output[0] = ceil(inputValue1[0]);
clampIfNeeded(output);
}
void MathFractOperation::executePixelSampled(float output[4], float x, float y, PixelSampler sampler)
{
float inputValue1[4];
this->m_inputValue1Operation->readSampled(inputValue1, x, y, sampler);
output[0] = inputValue1[0] - floor(inputValue1[0]);
clampIfNeeded(output);
}
void MathSqrtOperation::executePixelSampled(float output[4], float x, float y, PixelSampler sampler)
{
float inputValue1[4];
this->m_inputValue1Operation->readSampled(inputValue1, x, y, sampler);
if (inputValue1[0] > 0)
output[0] = sqrt(inputValue1[0]);
else
output[0] = 0.0f;
clampIfNeeded(output);
}

24
source/blender/compositor/operations/COM_MathBaseOperation.h
View File

@@ -175,4 +175,28 @@ public:
void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
};
class MathFloorOperation : public MathBaseOperation {
public:
MathFloorOperation() : MathBaseOperation() {}
void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
};
class MathCeilOperation : public MathBaseOperation {
public:
MathCeilOperation() : MathBaseOperation() {}
void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
};
class MathFractOperation : public MathBaseOperation {
public:
MathFractOperation() : MathBaseOperation() {}
void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
};
class MathSqrtOperation : public MathBaseOperation {
public:
MathSqrtOperation() : MathBaseOperation() {}
void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
};
#endif