[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46302] branches/tile/source/blender/ compositor: Tile branche

[Monique Dewanchand]

Revision: 46302
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46302
Author:   mdewanchand
Date:     2012-05-04 21:45:51 +0000 (Fri, 04 May 2012)
Log Message:
-----------
Tile branche

[#31242] Fast Gaussian blur results in a black screen

Modified Paths:
--------------
    branches/tile/source/blender/compositor/nodes/COM_BlurNode.cpp
    branches/tile/source/blender/compositor/operations/COM_FastGaussianBlurOperation.cpp
    branches/tile/source/blender/compositor/operations/COM_FastGaussianBlurOperation.h

Modified: branches/tile/source/blender/compositor/nodes/COM_BlurNode.cpp
===================================================================
--- branches/tile/source/blender/compositor/nodes/COM_BlurNode.cpp	2012-05-04 21:31:34 UTC (rev 46301)
+++ branches/tile/source/blender/compositor/nodes/COM_BlurNode.cpp	2012-05-04 21:45:51 UTC (rev 46302)
@@ -44,12 +44,12 @@
 	}
 	if (data->filtertype == R_FILTER_FAST_GAUSS) {
 		FastGaussianBlurOperation *operationfgb = new FastGaussianBlurOperation();
-		operationfgb->setdata(data);
+		operationfgb->setData(data);
 		operationfgb->setSize(size);
 		this->getInputSocket(0)->relinkConnections(operationfgb->getInputSocket(0), true, 0, graph);
 		this->getOutputSocket(0)->relinkConnections(operationfgb->getOutputSocket(0));
 		graph->addOperation(operationfgb);
-		ddPreviewOperation(graph, operationfgb->getOutputSocket(), 5);
+		addPreviewOperation(graph, operationfgb->getOutputSocket(), 5);
 	}else if (!data->bokeh) {
 		GaussianXBlurOperation *operationx = new GaussianXBlurOperation();
 		operationx->setData(data);

Modified: branches/tile/source/blender/compositor/operations/COM_FastGaussianBlurOperation.cpp
===================================================================
--- branches/tile/source/blender/compositor/operations/COM_FastGaussianBlurOperation.cpp	2012-05-04 21:31:34 UTC (rev 46301)
+++ branches/tile/source/blender/compositor/operations/COM_FastGaussianBlurOperation.cpp	2012-05-04 21:45:51 UTC (rev 46302)
@@ -24,25 +24,15 @@
 #include "MEM_guardedalloc.h"
 #include "BLI_utildefines.h"
 
-FastGaussianBlurOperation::FastGaussianBlurOperation(): NodeOperation(){
-	this->inputOperation = NULL;
-	this->addInputSocket(COM_DT_COLOR);
-	this->addOutputSocket(COM_DT_COLOR);
-	this->setComplex(true);
-	this->data = NULL;
+FastGaussianBlurOperation::FastGaussianBlurOperation(): BlurBaseOperation(){
 }
 
 void FastGaussianBlurOperation::initExecution(){
-	this->inputOperation = this->getInputSocketReader(0);
+	BlurBaseOperation::initExecution();
 	sx = data->sizex * this->size/2.0f;
 	sy = data->sizey * this->size/2.0f;
 }
 
-void FastGaussianBlurOperation::deinitExecution(){
-	this->inputOperation = NULL;
-	this->data = NULL;
-}
-
 void FastGaussianBlurOperation::executePixel(float *color,int x, int y, MemoryBuffer *inputBuffers[], void *data) {
 	MemoryBuffer *newData = (MemoryBuffer*)data;
 	
@@ -62,7 +52,7 @@
 }
 
 void* FastGaussianBlurOperation::initializeTileData(rcti *rect, MemoryBuffer **memoryBuffers){
-	MemoryBuffer *newBuf = (MemoryBuffer*)this->inputOperation->initializeTileData(rect, memoryBuffers);
+	MemoryBuffer *newBuf = (MemoryBuffer*)this->inputProgram->initializeTileData(rect, memoryBuffers);
 	MemoryBuffer *copy = newBuf->duplicate();
 	
 	int c;

Modified: branches/tile/source/blender/compositor/operations/COM_FastGaussianBlurOperation.h
===================================================================
--- branches/tile/source/blender/compositor/operations/COM_FastGaussianBlurOperation.h	2012-05-04 21:31:34 UTC (rev 46301)
+++ branches/tile/source/blender/compositor/operations/COM_FastGaussianBlurOperation.h	2012-05-04 21:45:51 UTC (rev 46302)
@@ -23,14 +23,11 @@
 #ifndef _COM_FastGaussianBlurOperation_h
 #define _COM_FastGaussianBlurOperation_h
 
-#include "COM_NodeOperation.h"
+#include "COM_BlurBaseOperation.h"
 #include "DNA_node_types.h"
 
-class FastGaussianBlurOperation: public NodeOperation {
+class FastGaussianBlurOperation: public BlurBaseOperation {
 private:
-	SocketReader *inputOperation;
-	NodeBlurData *data; 
-	float size;
 	float sx;
 	float sy;
 public:
@@ -39,9 +36,6 @@
 	void executePixel(float *color, int x, int y, MemoryBuffer *inputBuffers[], void *data);
 	
 	void initExecution();
-	void deinitExecution();
-	void setdata(NodeBlurData *data){this->data = data;}
-	void setSize(float size){this->size = size;} 
 	void IIR_gauss(MemoryBuffer *src, float sigma, int channel, int xy);
 	void* initializeTileData(rcti *rect, MemoryBuffer **memoryBuffers);
 	void deinitializeTileData(rcti *rect, MemoryBuffer **memoryBuffers, void *data);