Revision: 47941
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47941
Author: campbellbarton
Date: 2012-06-15 09:58:52 +0000 (Fri, 15 Jun 2012)
Log Message:
-----------
style cleanup: composite/blur
Modified Paths:
--------------
trunk/blender/source/blender/compositor/nodes/COM_BilateralBlurNode.cpp
trunk/blender/source/blender/compositor/nodes/COM_BlurNode.cpp
trunk/blender/source/blender/compositor/nodes/COM_BokehBlurNode.cpp
trunk/blender/source/blender/compositor/nodes/COM_DirectionalBlurNode.cpp
trunk/blender/source/blender/compositor/nodes/COM_VectorBlurNode.cpp
trunk/blender/source/blender/compositor/operations/COM_BilateralBlurOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_BlurBaseOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_BokehBlurOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_DirectionalBlurOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_FastGaussianBlurOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_FastGaussianBlurOperation.h
trunk/blender/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_GaussianXBlurOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_GaussianYBlurOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_KeyingBlurOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_KeyingBlurOperation.h
trunk/blender/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_VectorBlurOperation.cpp
trunk/blender/source/blender/nodes/composite/nodes/node_composite_bilateralblur.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_blur.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_bokehblur.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_directionalblur.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_vecBlur.c
Modified:
trunk/blender/source/blender/compositor/nodes/COM_BilateralBlurNode.cpp
===================================================================
--- trunk/blender/source/blender/compositor/nodes/COM_BilateralBlurNode.cpp
2012-06-15 09:56:06 UTC (rev 47940)
+++ trunk/blender/source/blender/compositor/nodes/COM_BilateralBlurNode.cpp
2012-06-15 09:58:52 UTC (rev 47941)
@@ -26,13 +26,13 @@
#include "COM_ExecutionSystem.h"
#include "COM_BilateralBlurOperation.h"
-BilateralBlurNode::BilateralBlurNode(bNode *editorNode): Node(editorNode)
+BilateralBlurNode::BilateralBlurNode(bNode *editorNode) : Node(editorNode)
{
}
-void BilateralBlurNode::convertToOperations(ExecutionSystem *graph,
CompositorContext * context)
+void BilateralBlurNode::convertToOperations(ExecutionSystem *graph,
CompositorContext *context)
{
- NodeBilateralBlurData *data =
(NodeBilateralBlurData*)this->getbNode()->storage;
+ NodeBilateralBlurData *data = (NodeBilateralBlurData
*)this->getbNode()->storage;
BilateralBlurOperation *operation = new BilateralBlurOperation();
operation->setQuality(context->getQuality());
operation->setData(data);
Modified: trunk/blender/source/blender/compositor/nodes/COM_BlurNode.cpp
===================================================================
--- trunk/blender/source/blender/compositor/nodes/COM_BlurNode.cpp
2012-06-15 09:56:06 UTC (rev 47940)
+++ trunk/blender/source/blender/compositor/nodes/COM_BlurNode.cpp
2012-06-15 09:58:52 UTC (rev 47941)
@@ -29,19 +29,19 @@
#include "COM_GaussianBokehBlurOperation.h"
#include "COM_FastGaussianBlurOperation.h"
-BlurNode::BlurNode(bNode *editorNode): Node(editorNode)
+BlurNode::BlurNode(bNode *editorNode) : Node(editorNode)
{
}
-void BlurNode::convertToOperations(ExecutionSystem *graph, CompositorContext *
context)
+void BlurNode::convertToOperations(ExecutionSystem *graph, CompositorContext
*context)
{
bNode *editorNode = this->getbNode();
- NodeBlurData * data = (NodeBlurData*)editorNode->storage;
- InputSocket * inputSizeSocket = this->getInputSocket(1);
+ NodeBlurData *data = (NodeBlurData *)editorNode->storage;
+ InputSocket *inputSizeSocket = this->getInputSocket(1);
bool connectedSizeSocket = inputSizeSocket->isConnected();
const bNodeSocket *sock = this->getInputSocket(1)->getbNodeSocket();
- const float size = ((const
bNodeSocketValueFloat*)sock->default_value)->value;
+ const float size = ((const bNodeSocketValueFloat
*)sock->default_value)->value;
CompositorQuality quality = context->getQuality();
Modified: trunk/blender/source/blender/compositor/nodes/COM_BokehBlurNode.cpp
===================================================================
--- trunk/blender/source/blender/compositor/nodes/COM_BokehBlurNode.cpp
2012-06-15 09:56:06 UTC (rev 47940)
+++ trunk/blender/source/blender/compositor/nodes/COM_BokehBlurNode.cpp
2012-06-15 09:58:52 UTC (rev 47941)
@@ -30,11 +30,11 @@
#include "COM_VariableSizeBokehBlurOperation.h"
#include "COM_ConvertDepthToRadiusOperation.h"
-BokehBlurNode::BokehBlurNode(bNode *editorNode): Node(editorNode)
+BokehBlurNode::BokehBlurNode(bNode *editorNode) : Node(editorNode)
{
}
-void BokehBlurNode::convertToOperations(ExecutionSystem *graph,
CompositorContext * context)
+void BokehBlurNode::convertToOperations(ExecutionSystem *graph,
CompositorContext *context)
{
Object *camob = context->getScene()->camera;
@@ -58,7 +58,7 @@
this->getInputSocket(0)->relinkConnections(operation->getInputSocket(0), 0,
graph);
this->getInputSocket(1)->relinkConnections(operation->getInputSocket(1), 1,
graph);
this->getInputSocket(3)->relinkConnections(operation->getInputSocket(2), 3,
graph);
-
operation->setSize(((bNodeSocketValueFloat*)this->getInputSocket(2)->getbNodeSocket()->default_value)->value);
+ operation->setSize(((bNodeSocketValueFloat
*)this->getInputSocket(2)->getbNodeSocket()->default_value)->value);
operation->setQuality(context->getQuality());
graph->addOperation(operation);
this->getOutputSocket(0)->relinkConnections(operation->getOutputSocket());
Modified:
trunk/blender/source/blender/compositor/nodes/COM_DirectionalBlurNode.cpp
===================================================================
--- trunk/blender/source/blender/compositor/nodes/COM_DirectionalBlurNode.cpp
2012-06-15 09:56:06 UTC (rev 47940)
+++ trunk/blender/source/blender/compositor/nodes/COM_DirectionalBlurNode.cpp
2012-06-15 09:58:52 UTC (rev 47941)
@@ -26,13 +26,13 @@
#include "COM_ExecutionSystem.h"
#include "COM_DirectionalBlurOperation.h"
-DirectionalBlurNode::DirectionalBlurNode(bNode *editorNode): Node(editorNode)
+DirectionalBlurNode::DirectionalBlurNode(bNode *editorNode) : Node(editorNode)
{
}
-void DirectionalBlurNode::convertToOperations(ExecutionSystem *graph,
CompositorContext * context)
+void DirectionalBlurNode::convertToOperations(ExecutionSystem *graph,
CompositorContext *context)
{
- NodeDBlurData *data = (NodeDBlurData*)this->getbNode()->storage;
+ NodeDBlurData *data = (NodeDBlurData *)this->getbNode()->storage;
DirectionalBlurOperation *operation = new DirectionalBlurOperation();
operation->setQuality(context->getQuality());
operation->setData(data);
Modified: trunk/blender/source/blender/compositor/nodes/COM_VectorBlurNode.cpp
===================================================================
--- trunk/blender/source/blender/compositor/nodes/COM_VectorBlurNode.cpp
2012-06-15 09:56:06 UTC (rev 47940)
+++ trunk/blender/source/blender/compositor/nodes/COM_VectorBlurNode.cpp
2012-06-15 09:58:52 UTC (rev 47941)
@@ -24,14 +24,14 @@
#include "DNA_node_types.h"
#include "COM_VectorBlurOperation.h"
-VectorBlurNode::VectorBlurNode(bNode *editorNode): Node(editorNode)
+VectorBlurNode::VectorBlurNode(bNode *editorNode) : Node(editorNode)
{
}
-void VectorBlurNode::convertToOperations(ExecutionSystem *system,
CompositorContext * context)
+void VectorBlurNode::convertToOperations(ExecutionSystem *system,
CompositorContext *context)
{
bNode *node = this->getbNode();
- NodeBlurData *vectorBlurSettings = (NodeBlurData*)node->storage;
+ NodeBlurData *vectorBlurSettings = (NodeBlurData *)node->storage;
VectorBlurOperation *operation = new VectorBlurOperation();
operation->setVectorBlurSettings(vectorBlurSettings);
operation->setQuality(context->getQuality());
Modified:
trunk/blender/source/blender/compositor/operations/COM_BilateralBlurOperation.cpp
===================================================================
---
trunk/blender/source/blender/compositor/operations/COM_BilateralBlurOperation.cpp
2012-06-15 09:56:06 UTC (rev 47940)
+++
trunk/blender/source/blender/compositor/operations/COM_BilateralBlurOperation.cpp
2012-06-15 09:58:52 UTC (rev 47941)
@@ -65,14 +65,14 @@
zero_v4(blurColor);
blurDivider = 0.0f;
- for (int yi = miny ; yi < maxy ; yi+=QualityStepHelper::getStep()) {
- for (int xi = minx ; xi < maxx ;
xi+=QualityStepHelper::getStep()) {
+ for (int yi = miny; yi < maxy; yi += QualityStepHelper::getStep()) {
+ for (int xi = minx; xi < maxx; xi +=
QualityStepHelper::getStep()) {
// read determinator
this->inputDeterminatorProgram->read(determinator, xi,
yi, inputBuffers, data);
deltaColor = (fabsf(determinatorReferenceColor[0] -
determinator[0]) +
fabsf(determinatorReferenceColor[1] -
determinator[1]) +
fabsf(determinatorReferenceColor[2] -
determinator[2])); // do not take the alpha channel into account
- if (deltaColor< sigmacolor) {
+ if (deltaColor < sigmacolor) {
// add this to the blur
this->inputColorProgram->read(tempColor, xi,
yi, inputBuffers, data);
add_v4_v4(blurColor, tempColor);
@@ -101,7 +101,7 @@
bool BilateralBlurOperation::determineDependingAreaOfInterest(rcti *input,
ReadBufferOperation *readOperation, rcti *output)
{
rcti newInput;
- int add = ceil(this->space)+1;
+ int add = ceil(this->space) + 1;
newInput.xmax = input->xmax + (add);
newInput.xmin = input->xmin - (add);
Modified:
trunk/blender/source/blender/compositor/operations/COM_BlurBaseOperation.cpp
===================================================================
---
trunk/blender/source/blender/compositor/operations/COM_BlurBaseOperation.cpp
2012-06-15 09:56:06 UTC (rev 47940)
+++
trunk/blender/source/blender/compositor/operations/COM_BlurBaseOperation.cpp
2012-06-15 09:58:52 UTC (rev 47941)
@@ -27,7 +27,7 @@
#include "RE_pipeline.h"
}
-BlurBaseOperation::BlurBaseOperation(): NodeOperation()
+BlurBaseOperation::BlurBaseOperation() : NodeOperation()
{
this->addInputSocket(COM_DT_COLOR);
this->addInputSocket(COM_DT_VALUE);
@@ -37,7 +37,7 @@
this->data = NULL;
this->size = 1.0f;
this->deleteData = false;
- this->sizeavailable=false;
+ this->sizeavailable = false;
}
void BlurBaseOperation::initExecution()
{
@@ -47,18 +47,18 @@
this->data->image_in_height = this->getHeight();
if (this->data->relative) {
switch (this->data->aspect) {
- case CMP_NODE_BLUR_ASPECT_NONE:
- this->data->sizex =
(int)(this->data->percentx*0.01f*this->data->image_in_width);
- this->data->sizey =
(int)(this->data->percenty*0.01f*this->data->image_in_height);
- break;
- case CMP_NODE_BLUR_ASPECT_Y:
- this->data->sizex =
(int)(this->data->percentx*0.01f*this->data->image_in_width);
- this->data->sizey =
(int)(this->data->percenty*0.01f*this->data->image_in_width);
- break;
- case CMP_NODE_BLUR_ASPECT_X:
- this->data->sizex =
(int)(this->data->percentx*0.01f*this->data->image_in_height);
- this->data->sizey =
(int)(this->data->percenty*0.01f*this->data->image_in_height);
- break;
+ case CMP_NODE_BLUR_ASPECT_NONE:
+ this->data->sizex = (int)(this->data->percentx
* 0.01f * this->data->image_in_width);
+ this->data->sizey = (int)(this->data->percenty
* 0.01f * this->data->image_in_height);
+ break;
+ case CMP_NODE_BLUR_ASPECT_Y:
+ this->data->sizex = (int)(this->data->percentx
* 0.01f * this->data->image_in_width);
+ this->data->sizey = (int)(this->data->percenty
* 0.01f * this->data->image_in_width);
+ break;
+ case CMP_NODE_BLUR_ASPECT_X:
+ this->data->sizex = (int)(this->data->percentx
* 0.01f * this->data->image_in_height);
+ this->data->sizey = (int)(this->data->percenty
* 0.01f * this->data->image_in_height);
+ break;
}
}
@@ -77,14 +77,14 @@
sum = 0.0f;
for (i = -rad; i <= rad; i++) {
- val = RE_filter_value(this->data->filtertype,
(float)i/(float)rad);
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
