stule cleanup: node headers

This commit is contained in:
Campbell Barton 2012-06-13 23:31:47 +00:00
parent 906b9e0584
commit bde7e6c96b
226 changed files with 3184 additions and 3192 deletions

View File

@ -21,7 +21,7 @@
*/
#ifdef __cplusplus
extern "C" {
extern "C" {
#endif
#include "DNA_node_types.h"

View File

@ -45,7 +45,7 @@ typedef enum DataType {
*/
typedef enum CompositorQuality {
/** @brief High quality setting */
COM_QUALITY_HIGH = 0 ,
COM_QUALITY_HIGH = 0,
/** @brief Medium quality setting */
COM_QUALITY_MEDIUM = 1,
/** @brief Low quality setting */
@ -58,7 +58,7 @@ typedef enum CompositorQuality {
*/
typedef enum CompositorPriority {
/** @brief High quality setting */
COM_PRIORITY_HIGH = 2 ,
COM_PRIORITY_HIGH = 2,
/** @brief Medium quality setting */
COM_PRIORITY_MEDIUM = 1,
/** @brief Low quality setting */

View File

@ -29,7 +29,7 @@
* @brief class representing a CPU device.
* @note for every hardware thread in the system a CPUDevice instance will exist in the workscheduler
*/
class CPUDevice: public Device {
class CPUDevice : public Device {
public:
/**
* @brief execute a WorkPackage

View File

@ -94,7 +94,7 @@ public:
/**
* @brief get the index of this channel in the SocketConnection
*/
const int getNumber() const {return this->number; }
const int getNumber() const { return this->number; }
/**
* @brief set the type of channel
@ -104,7 +104,7 @@ public:
/**
* @brief get the type of channel
*/
const ChannelType getType() const {return this->type; }
const ChannelType getType() const { return this->type; }
/**
* @brief set the premultiplicatioin of this channel
@ -114,7 +114,7 @@ public:
/**
* @brief is this channel premultiplied
*/
const bool isPremultiplied() const {return this->premultiplied;}
const bool isPremultiplied() const { return this->premultiplied; }
};

View File

@ -35,11 +35,11 @@ public:
void determineDistance(ChunkOrderHotspot **hotspots, unsigned int numberOfHotspots);
friend bool operator<(const ChunkOrder& a, const ChunkOrder& b);
void setChunkNumber(unsigned int chunknumber) {this->number = chunknumber;}
void setX(int x) {this->x = x;}
void setY(int y) {this->y = y;}
unsigned int getChunkNumber() {return this->number;}
double getDistance() {return this->distance;}
void setChunkNumber(unsigned int chunknumber) { this->number = chunknumber; }
void setX(int x) { this->x = x; }
void setY(int y) { this->y = y; }
unsigned int getChunkNumber() { return this->number; }
double getDistance() { return this->distance; }
};
#endif

View File

@ -88,37 +88,37 @@ public:
/**
* @brief get the rendering field of the context
*/
bool isRendering() const {return this->rendering;}
bool isRendering() const { return this->rendering; }
/**
* @brief set the scene of the context
*/
void setScene(Scene *scene) {this->scene = scene;}
void setScene(Scene *scene) { this->scene = scene; }
/**
* @brief set the bnodetree of the context
*/
void setbNodeTree(bNodeTree *bnodetree) {this->bnodetree = bnodetree;}
void setbNodeTree(bNodeTree *bnodetree) { this->bnodetree = bnodetree; }
/**
* @brief get the bnodetree of the context
*/
const bNodeTree * getbNodeTree() const {return this->bnodetree;}
const bNodeTree *getbNodeTree() const { return this->bnodetree; }
/**
* @brief set the active groupnode of the context
*/
void setActivegNode(bNode *gnode) {this->activegNode = gnode;}
void setActivegNode(bNode *gnode) { this->activegNode = gnode; }
/**
* @brief get the active groupnode of the context
*/
const bNode * getActivegNode() const {return this->activegNode;}
const bNode *getActivegNode() const { return this->activegNode; }
/**
* @brief get the scene of the context
*/
const Scene *getScene() const {return this->scene;}
const Scene *getScene() const { return this->scene; }
/**
* @brief set the quality
@ -153,7 +153,7 @@ public:
this->hasActiveOpenCLDevices = hasAvtiveOpenCLDevices;
}
int getChunksize() {return this->getbNodeTree()->chunksize;}
int getChunksize() { return this->getbNodeTree()->chunksize; }
const int isColorManaged() const;
};

View File

@ -39,7 +39,7 @@ public:
/**
* @brief initialize the device
*/
virtual bool initialize() {return true;}
virtual bool initialize() { return true; }
/**
* @brief deinitialize the device

View File

@ -67,7 +67,7 @@ private:
/**
* @brief list of operations in this ExecutionGroup
*/
vector<NodeOperation*> operations;
vector<NodeOperation *> operations;
/**
* @brief is this ExecutionGroup an input ExecutionGroup
@ -130,13 +130,13 @@ private:
/**
* @brief a cached vector of all read operations in the execution group.
*/
vector<NodeOperation*> cachedReadOperations;
vector<NodeOperation *> cachedReadOperations;
/**
* @brief reference to the original bNodeTree, this field is only set for the 'top' execution group.
* @note can only be used to call the callbacks for progress, status and break
*/
const bNodeTree * bTree;
const bNodeTree *bTree;
/**
* @brief total number of chunks that have been calculated for this ExecutionGroup
@ -201,7 +201,7 @@ private:
* true: package(s) are scheduled
* false: scheduling is deferred (depending workpackages are scheduled)
*/
bool scheduleChunkWhenPossible(ExecutionSystem * graph, int xChunk, int yChunk);
bool scheduleChunkWhenPossible(ExecutionSystem *graph, int xChunk, int yChunk);
/**
* @brief try to schedule a specific area.
@ -213,7 +213,7 @@ private:
* true: package(s) are scheduled
* false: scheduling is deferred (depending workpackages are scheduled)
*/
bool scheduleAreaWhenPossible(ExecutionSystem * graph, rcti * rect);
bool scheduleAreaWhenPossible(ExecutionSystem *graph, rcti *rect);
/**
* @brief add a chunk to the WorkScheduler.
@ -228,7 +228,7 @@ private:
* @param readOperation The ReadBufferOperation where the area needs to be evaluated
* @param output the area needed of the ReadBufferOperation. Result
*/
void determineDependingAreaOfInterest(rcti * input, ReadBufferOperation *readOperation, rcti *output);
void determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output);
public:
@ -258,13 +258,13 @@ public:
* @note ViewerOperation, CompositeOperation, PreviewOperation.
* @see NodeOperation.isOutputOperation
*/
const int isOutputExecutionGroup() const {return this->isOutput;}
const int isOutputExecutionGroup() const { return this->isOutput; }
/**
* @brief set whether this ExecutionGroup is an output
* @param isOutput
*/
void setOutputExecutionGroup(int isOutput) {this->isOutput = isOutput;}
void setOutputExecutionGroup(int isOutput) { this->isOutput = isOutput; }
/**
* @brief determine the resolution of this ExecutionGroup
@ -276,17 +276,17 @@ public:
* @brief set the resolution of this executiongroup
* @param resolution
*/
void setResolution(unsigned int resolution[]) {this->width = resolution[0];this->height = resolution[1];}
void setResolution(unsigned int resolution[]) { this->width = resolution[0]; this->height = resolution[1]; }
/**
* @brief get the width of this execution group
*/
const unsigned int getWidth() {return this->width;}
const unsigned int getWidth() { return this->width; }
/**
* @brief get the height of this execution group
*/
const unsigned int getHeight() {return this->height;}
const unsigned int getHeight() { return this->height; }
/**
* @brief does this ExecutionGroup contains a complex NodeOperation
@ -318,7 +318,7 @@ public:
* @param chunkNumber the chunk to be calculated
* @return MemoryBuffer** the inputbuffers
*/
MemoryBuffer** getInputBuffersCPU();
MemoryBuffer **getInputBuffersCPU();
/**
* @brief get all inputbuffers needed to calculate an chunk
@ -326,7 +326,7 @@ public:
* @param chunkNumber the chunk to be calculated
* @return MemoryBuffer** the inputbuffers
*/
MemoryBuffer** getInputBuffersOpenCL(int chunkNumber);
MemoryBuffer **getInputBuffersOpenCL(int chunkNumber);
/**
* @brief allocate the outputbuffer of a chunk
@ -341,7 +341,7 @@ public:
* @param chunknumber
* @param memorybuffers
*/
void finalizeChunkExecution(int chunkNumber, MemoryBuffer** memoryBuffers);
void finalizeChunkExecution(int chunkNumber, MemoryBuffer **memoryBuffers);
/**
* @brief deinitExecution is called just after execution the whole graph.
@ -372,7 +372,7 @@ public:
* @note the area of the MemoryProxy.creator thas has to be executed.
* @param memoryProxies result
*/
void determineDependingMemoryProxies(vector<MemoryProxy*> *memoryProxies);
void determineDependingMemoryProxies(vector<MemoryProxy *> *memoryProxies);
/**
* @brief Determine the rect (minx, maxx, miny, maxy) of a chunk.
@ -387,7 +387,7 @@ public:
*/
bool isOpenCL();
void setChunksize(int chunksize) {this->chunkSize = chunksize;}
void setChunksize(int chunksize) { this->chunkSize = chunksize; }
/**
* @brief get the Render priority of this ExecutionGroup

View File

@ -113,22 +113,22 @@ private:
/**
* @brief vector of nodes
*/
vector<Node*> nodes;
vector<Node *> nodes;
/**
* @brief vector of operations
*/
vector<NodeOperation*> operations;
vector<NodeOperation *> operations;
/**
* @brief vector of groups
*/
vector<ExecutionGroup*> groups
vector<ExecutionGroup *> groups
/**
* @brief vector of connections
*/;
vector<SocketConnection*> connections;
vector<SocketConnection *> connections;
private: //methods
/**
@ -141,12 +141,12 @@ private: //methods
/**
* find all execution group with output nodes
*/
void findOutputExecutionGroup(vector<ExecutionGroup*> *result, CompositorPriority priority) const;
void findOutputExecutionGroup(vector<ExecutionGroup *> *result, CompositorPriority priority) const;
/**
* find all execution group with output nodes
*/
void findOutputExecutionGroup(vector<ExecutionGroup*> *result) const;
void findOutputExecutionGroup(vector<ExecutionGroup *> *result) const;
public:
/**
@ -200,27 +200,27 @@ public:
/**
* @brief get the reference to the compositor context
*/
CompositorContext& getContext() {return this->context;}
CompositorContext& getContext() { return this->context; }
/**
* @brief get the reference to the compositor nodes
*/
vector<Node*>& getNodes() {return this->nodes;}
vector<Node *>& getNodes() { return this->nodes; }
/**
* @brief get the reference to the compositor connections
*/
vector<SocketConnection*>& getConnections() {return this->connections;}
vector<SocketConnection *>& getConnections() { return this->connections; }
/**
* @brief get the reference to the list of execution groups
*/
vector<ExecutionGroup*>& getExecutionGroups() {return this->groups;}
vector<ExecutionGroup *>& getExecutionGroups() { return this->groups; }
/**
* @brief get the reference to the list of operations
*/
vector<NodeOperation*>& getOperations() {return this->operations;}
vector<NodeOperation *>& getOperations() { return this->operations; }
private:
@ -228,7 +228,7 @@ private:
* @brief determine the actual data types of all sockets
* @param nodes list of nodes or operations to do the data type determination
*/
void determineActualSocketDataTypes(vector<NodeBase*> &nodes);
void determineActualSocketDataTypes(vector<NodeBase *> &nodes);
void executeGroups(CompositorPriority priority);

View File

@ -48,7 +48,7 @@ public:
* @param tree bNodeTree to add
* @return Node representing the "Compositor node" of the maintree. or NULL when a subtree is added
*/
static Node *addbNodeTree(ExecutionSystem &system, int nodes_start, bNodeTree* tree, bNode *groupnode);
static Node *addbNodeTree(ExecutionSystem &system, int nodes_start, bNodeTree *tree, bNode *groupnode);
/**
* @brief add an editor node to the system.
@ -58,7 +58,7 @@ public:
* @param bNode node to add
* @return Node that represents the bNode or null when not able to convert.
*/
static Node *addNode(vector<Node*>& nodes, bNode *bNode, bool isInActiveGroup);
static Node *addNode(vector<Node *>& nodes, bNode *bNode, bool isInActiveGroup);
/**
* @brief Add a Node to a list
@ -66,7 +66,7 @@ public:
* @param nodes the list where the node needs to be added to
* @param node the node to be added
*/
static void addNode(vector<Node*>& nodes, Node *node);
static void addNode(vector<Node *>& nodes, Node *node);
/**
* @brief Add an operation to the operation list
@ -76,7 +76,7 @@ public:
* @param operations the list where the operation need to be added to
* @param operation the operation to add
*/
static void addOperation(vector<NodeOperation*> &operations, NodeOperation *operation);
static void addOperation(vector<NodeOperation *> &operations, NodeOperation *operation);
/**
* @brief Add an ExecutionGroup to a list
@ -86,7 +86,7 @@ public:
* @param executionGroups the list where the executionGroup need to be added to
* @param executionGroup the ExecutionGroup to add
*/
static void addExecutionGroup(vector<ExecutionGroup*>& executionGroups, ExecutionGroup *executionGroup);
static void addExecutionGroup(vector<ExecutionGroup *>& executionGroups, ExecutionGroup *executionGroup);
/**
* Find all Node Operations that needs to be executed.
@ -94,7 +94,7 @@ public:
* the rendering parameter will tell what type of execution we are doing
* FALSE is editing, TRUE is rendering
*/
static void findOutputNodeOperations(vector<NodeOperation*>* result, vector<NodeOperation*>& operations , bool rendering);
static void findOutputNodeOperations(vector<NodeOperation *> *result, vector<NodeOperation *>& operations, bool rendering);
/**
* @brief add a bNodeLink to the list of links
@ -107,7 +107,7 @@ public:
* @param bNodeLink the link to be added
* @return the created SocketConnection or NULL
*/
static SocketConnection *addNodeLink(NodeRange &node_range, vector<SocketConnection*>& links, bNodeLink *bNodeLink);
static SocketConnection *addNodeLink(NodeRange &node_range, vector<SocketConnection *>& links, bNodeLink *bNodeLink);
/**
* @brief create a new SocketConnection and add to a vector of links
@ -116,7 +116,7 @@ public:
* @param toSocket the endpoint of the connection
* @return the new created SocketConnection
*/
static SocketConnection *addLink(vector<SocketConnection*>& links, OutputSocket *fromSocket, InputSocket *toSocket);
static SocketConnection *addLink(vector<SocketConnection *>& links, OutputSocket *fromSocket, InputSocket *toSocket);
/**
* @brief dumps the content of the execution system to standard out

View File

@ -102,7 +102,7 @@ public:
* @param resolution the result of this operation
* @param preferredResolution the preferrable resolution as no resolution could be determined
*/
void determineResolution(unsigned int resolution[],unsigned int preferredResolution[]);
void determineResolution(unsigned int resolution[], unsigned int preferredResolution[]);
void determineActualDataType();
@ -140,13 +140,17 @@ public:
* @brief set the resize mode
* @param resizeMode the new resize mode.
*/
void setResizeMode(InputSocketResizeMode resizeMode) {this->resizeMode = resizeMode;}
void setResizeMode(InputSocketResizeMode resizeMode) {
this->resizeMode = resizeMode;
}
/**
* @brief get the resize mode of this socket
* @return InputSocketResizeMode
*/
InputSocketResizeMode getResizeMode() const {return this->resizeMode;}
InputSocketResizeMode getResizeMode() const {
return this->resizeMode;
}
const ChannelInfo *getChannelInfo(const int channelnumber);

View File

@ -56,7 +56,7 @@ private:
/**
* @brief proxy of the memory (same for all chunks in the same buffer)
*/
MemoryProxy * memoryProxy;
MemoryProxy *memoryProxy;
/**
* @brief the type of buffer COM_DT_VALUE, COM_DT_VECTOR, COM_DT_COLOR
@ -109,13 +109,13 @@ public:
/**
* @brief read the ChunkNumber of this MemoryBuffer
*/
unsigned int getChunkNumber() {return this->chunkNumber;}
unsigned int getChunkNumber() { return this->chunkNumber; }
/**
* @brief get the data of this MemoryBuffer
* @note buffer should already be available in memory
*/
float *getBuffer() {return this->buffer;}
float *getBuffer() { return this->buffer; }
/**
* @brief after execution the state will be set to available by calling this method
@ -132,7 +132,7 @@ public:
/**
* @brief is this MemoryBuffer a temporarily buffer (based on an area, not on a chunk)
*/
inline const bool isTemporarily() const {return this->state == COM_MB_TEMPORARILY;}
inline const bool isTemporarily() const { return this->state == COM_MB_TEMPORARILY; }
/**
* @brief add the content from otherBuffer to this MemoryBuffer
@ -143,7 +143,7 @@ public:
/**
* @brief get the rect of this MemoryBuffer
*/
rcti *getRect() {return &this->rect;}
rcti *getRect() { return &this->rect; }
/**
* @brief get the width of this MemoryBuffer

View File

@ -60,7 +60,7 @@ private:
/**
* @brief the allocated memory
*/
MemoryBuffer* buffer;
MemoryBuffer *buffer;
public:
MemoryProxy();
@ -69,24 +69,24 @@ public:
* @brief set the ExecutionGroup that can be scheduled to calculate a certain chunk.
* @param group the ExecutionGroup to set
*/
void setExecutor(ExecutionGroup *executor) {this->executor = executor;}
void setExecutor(ExecutionGroup *executor) { this->executor = executor; }
/**
* @brief get the ExecutionGroup that can be scheduled to calculate a certain chunk.
*/
ExecutionGroup *getExecutor() {return this->executor;}
ExecutionGroup *getExecutor() { return this->executor; }
/**
* @brief set the WriteBufferOperation that is responsible for writing to this MemoryProxy
* @param operation
*/
void setWriteBufferOperation(WriteBufferOperation *operation) {this->writeBufferOperation = operation;}
void setWriteBufferOperation(WriteBufferOperation *operation) { this->writeBufferOperation = operation; }
/**
* @brief get the WriteBufferOperation that is responsible for writing to this MemoryProxy
* @return WriteBufferOperation
*/
WriteBufferOperation *getWriteBufferOperation() {return this->writeBufferOperation;}
WriteBufferOperation *getWriteBufferOperation() { return this->writeBufferOperation; }
/**
* @brief allocate memory of size widht x height
@ -101,7 +101,7 @@ public:
/**
* @brief get the allocated memory
*/
inline MemoryBuffer* getBuffer() {return this->buffer;}
inline MemoryBuffer *getBuffer() { return this->buffer; }
};
#endif

View File

@ -38,14 +38,14 @@ class Node;
class NodeOperation;
class ExecutionSystem;
typedef vector<Node*> NodeList;
typedef vector<Node *> NodeList;
typedef NodeList::iterator NodeIterator;
typedef pair<NodeIterator, NodeIterator> NodeRange;
/**
* My node documentation.
*/
class Node:public NodeBase {
class Node : public NodeBase {
private:
/**
* @brief stores the reference to the SDNA bNode struct
@ -58,7 +58,7 @@ private:
bool inActiveGroup;
public:
Node(bNode *editorNode, bool create_sockets=true);
Node(bNode *editorNode, bool create_sockets = true);
/**
* @brief get the reference to the SDNA bNode struct
@ -69,7 +69,7 @@ public:
* @brief Is this node in the active group (the group that is being edited)
* @param isInActiveGroup
*/
void setIsInActiveGroup(bool isInActiveGroup) {this->inActiveGroup = isInActiveGroup; }
void setIsInActiveGroup(bool isInActiveGroup) { this->inActiveGroup = isInActiveGroup; }
/**
* @brief Is this node part of the active group
@ -77,7 +77,7 @@ public:
* the active group will be the main tree (all nodes that are not part of a group will be active)
* @return bool [false:true]
*/
inline bool isInActiveGroup() {return this->inActiveGroup;}
inline bool isInActiveGroup() { return this->inActiveGroup; }
/**
* @brief convert node to operation
@ -87,7 +87,7 @@ public:
* @param system the ExecutionSystem where the operations need to be added
* @param context reference to the CompositorContext
*/
virtual void convertToOperations(ExecutionSystem *system, CompositorContext * context) =0;
virtual void convertToOperations(ExecutionSystem *system, CompositorContext *context) = 0;
/**
* this method adds a SetValueOperation as input of the input socket.

View File

@ -47,23 +47,23 @@ private:
/**
* @brief the list of actual inputsockets @see InputSocket
*/
vector<InputSocket*> inputsockets;
vector<InputSocket *> inputsockets;
/**
* @brief the list of actual outputsockets @see OutputSocket
*/
vector<OutputSocket*> outputsockets;
vector<OutputSocket *> outputsockets;
protected:
/**
* @brief get access to the vector of input sockets
*/
inline vector<InputSocket*>& getInputSockets() {return this->inputsockets;}
inline vector<InputSocket *>& getInputSockets() { return this->inputsockets; }
/**
* @brief get access to the vector of input sockets
*/
inline vector<OutputSocket*>& getOutputSockets() {return this->outputsockets;}
inline vector<OutputSocket *>& getOutputSockets() { return this->outputsockets; }
public:
@ -97,7 +97,7 @@ public:
* @return [true:false]
* @see NodeOperation
*/
virtual const int isOperation() const {return false;}
virtual const int isOperation() const { return false; }
/**
* @brief check if this is an input node
@ -109,12 +109,12 @@ public:
/**
* @brief Return the number of input sockets of this node.
*/
const unsigned int getNumberOfInputSockets() const {return this->inputsockets.size();}
const unsigned int getNumberOfInputSockets() const { return this->inputsockets.size(); }
/**
* @brief Return the number of output sockets of this node.
*/
const unsigned int getNumberOfOutputSockets() const {return this->outputsockets.size();}
const unsigned int getNumberOfOutputSockets() const { return this->outputsockets.size(); }
/**
* after the data has been determined of an outputsocket that has a connection with an inputsocket this method is called on the
@ -138,7 +138,7 @@ public:
* @param index
* the index of the needed outputsocket
*/
inline OutputSocket *getOutputSocket() {return getOutputSocket(0);}
inline OutputSocket *getOutputSocket() { return getOutputSocket(0); }
/**
* get the reference to a certain inputsocket
@ -148,8 +148,8 @@ public:
InputSocket *getInputSocket(const int index);
virtual bool isStatic() const {return false;}
void getStaticValues(float *result) const {}
virtual bool isStatic() const { return false; }
void getStaticValues(float *result) const { }
protected:
NodeBase();

View File

@ -90,7 +90,7 @@ public:
* @return [true:false]
* @see NodeBase
*/
const int isOperation() const {return true;}
const int isOperation() const { return true; }
/**
* @brief determine the resolution of this node
@ -113,7 +113,7 @@ public:
*
* @return bool the result of this method
*/
virtual bool isOutputOperation(bool rendering) const {return false;}
virtual bool isOutputOperation(bool rendering) const { return false; }
/**
* isBufferOperation returns if this is an operation that work directly on buffers.
@ -123,10 +123,10 @@ public:
* @see WriteBufferOperation
* for all other operations this will result in false.
*/
virtual int isBufferOperation() {return false;}
virtual int isSingleThreaded() {return false;}
virtual int isBufferOperation() { return false; }
virtual int isSingleThreaded() { return false; }
void setbNodeTree(const bNodeTree * tree) {this->btree = tree;}
void setbNodeTree(const bNodeTree *tree) { this->btree = tree; }
virtual void initExecution();
/**
@ -136,7 +136,7 @@ public:
* @param chunkNumber the chunkNumber to be calculated
* @param memoryBuffers all input MemoryBuffer's needed
*/
virtual void executeRegion(rcti *rect, unsigned int chunkNumber, MemoryBuffer** memoryBuffers) {}
virtual void executeRegion(rcti *rect, unsigned int chunkNumber, MemoryBuffer **memoryBuffers) {}
/**
* @brief when a chunk is executed by an OpenCLDevice, this method is called
@ -151,7 +151,7 @@ public:
* @param outputBuffer the outputbuffer to write to
*/
virtual void executeOpenCLRegion(cl_context context, cl_program program, cl_command_queue queue, rcti *rect,
unsigned int chunkNumber, MemoryBuffer** memoryBuffers, MemoryBuffer* outputBuffer) {}
unsigned int chunkNumber, MemoryBuffer **memoryBuffers, MemoryBuffer *outputBuffer) {}
/**
* @brief custom handle to add new tasks to the OpenCL command queue in order to execute a chunk on an GPUDevice
@ -165,7 +165,7 @@ public:
* @param clMemToCleanUp all created cl_mem references must be added to this list. Framework will clean this after execution
* @param clKernelsToCleanUp all created cl_kernel references must be added to this list. Framework will clean this after execution
*/
virtual void executeOpenCL(cl_context context,cl_program program, cl_command_queue queue, MemoryBuffer *outputMemoryBuffer, cl_mem clOutputBuffer, MemoryBuffer** inputMemoryBuffers, list<cl_mem> *clMemToCleanUp, list<cl_kernel> *clKernelsToCleanUp) {}
virtual void executeOpenCL(cl_context context, cl_program program, cl_command_queue queue, MemoryBuffer *outputMemoryBuffer, cl_mem clOutputBuffer, MemoryBuffer **inputMemoryBuffers, list<cl_mem> *clMemToCleanUp, list<cl_kernel> *clKernelsToCleanUp) {}
virtual void deinitExecution();
bool isResolutionSet() {
@ -184,7 +184,7 @@ public:
}
void getConnectedInputSockets(vector<InputSocket*> *sockets);
void getConnectedInputSockets(vector<InputSocket *> *sockets);
/**
* @brief is this operation complex
@ -192,22 +192,22 @@ public:
* Complex operations are typically doing many reads to calculate the output of a single pixel.
* Mostly Filter types (Blurs, Convolution, Defocus etc) need this to be set to true.
*/
const bool isComplex() const {return this->complex;}
virtual const bool isSetOperation() const {return false;}
const bool isComplex() const { return this->complex; }
virtual const bool isSetOperation() const { return false; }
/**
* @brief is this operation of type ReadBufferOperation
* @return [true:false]
* @see ReadBufferOperation
*/
virtual const bool isReadBufferOperation() const {return false;}
virtual const bool isReadBufferOperation() const { return false; }
/**
* @brief is this operation of type WriteBufferOperation
* @return [true:false]
* @see WriteBufferOperation
*/
virtual const bool isWriteBufferOperation() const {return false;}
virtual const bool isWriteBufferOperation() const { return false; }
/**
* @brief is this operation the active viewer output
@ -215,9 +215,9 @@ public:
* @return [true:false]
* @see BaseViewerOperation
*/
virtual const bool isActiveViewerOutput() const {return false;}
virtual const bool isActiveViewerOutput() const { return false; }
virtual bool determineDependingAreaOfInterest(rcti * input, ReadBufferOperation *readOperation, rcti *output);
virtual bool determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output);
/**
* @brief set the index of the input socket that will determine the resolution of this operation
@ -230,7 +230,7 @@ public:
* @note only applicable for output operations like ViewerOperation
* @return CompositorPriority
*/
virtual const CompositorPriority getRenderPriority() const {return COM_PRIORITY_LOW;}
virtual const CompositorPriority getRenderPriority() const { return COM_PRIORITY_LOW; }
/**
* @brief can this NodeOperation be scheduled on an OpenCLDevice
@ -239,8 +239,8 @@ public:
*/
bool isOpenCL() { return this->openCL; }
virtual bool isViewerOperation() {return false;}
virtual bool isPreviewOperation() {return false;}
virtual bool isViewerOperation() { return false; }
virtual bool isPreviewOperation() { return false; }
inline bool isBreaked() {
return btree->test_break(btree->tbh);
@ -249,8 +249,8 @@ public:
protected:
NodeOperation();
void setWidth(unsigned int width) {this->width = width;}
void setHeight(unsigned int height) {this->height = height;}
void setWidth(unsigned int width) { this->width = width; }
void setHeight(unsigned int height) { this->height = height; }
SocketReader *getInputSocketReader(unsigned int inputSocketindex);
NodeOperation *getInputOperation(unsigned int inputSocketindex);
@ -266,20 +266,20 @@ protected:
* Complex operations are typically doing many reads to calculate the output of a single pixel.
* Mostly Filter types (Blurs, Convolution, Defocus etc) need this to be set to true.
*/
void setComplex(bool complex) {this->complex = complex;}
void setComplex(bool complex) { this->complex = complex; }
/**
* @brief set if this NodeOperation can be scheduled on a OpenCLDevice
*/
void setOpenCL(bool openCL) {this->openCL = openCL;}
void setOpenCL(bool openCL) { this->openCL = openCL; }
static cl_mem COM_clAttachMemoryBufferToKernelParameter(cl_context context, cl_kernel kernel, int parameterIndex, int offsetIndex, list<cl_mem> *cleanup, MemoryBuffer **inputMemoryBuffers, SocketReader* reader);
static cl_mem COM_clAttachMemoryBufferToKernelParameter(cl_context context, cl_kernel kernel, int parameterIndex, int offsetIndex, list<cl_mem> *cleanup, MemoryBuffer **inputMemoryBuffers, SocketReader *reader);
static void COM_clAttachMemoryBufferOffsetToKernelParameter(cl_kernel kernel, int offsetIndex, MemoryBuffer *memoryBuffers);
static void COM_clAttachOutputMemoryBufferToKernelParameter(cl_kernel kernel, int parameterIndex, cl_mem clOutputMemoryBuffer);
void COM_clAttachSizeToKernelParameter(cl_kernel kernel, int offsetIndex);
static void COM_clEnqueueRange(cl_command_queue queue, cl_kernel kernel, MemoryBuffer* outputMemoryBuffer);
static void COM_clEnqueueRange(cl_command_queue queue, cl_kernel kernel, MemoryBuffer *outputMemoryBuffer);
void COM_clEnqueueRange(cl_command_queue queue, cl_kernel kernel, MemoryBuffer *outputMemoryBuffer, int offsetIndex);
cl_kernel COM_clCreateKernel(cl_program program, const char* kernelname, list<cl_kernel> *clKernelsToCleanUp);
cl_kernel COM_clCreateKernel(cl_program program, const char *kernelname, list<cl_kernel> *clKernelsToCleanUp);
};

View File

@ -34,7 +34,7 @@ class OpenCLDevice;
* @brief device representing an GPU OpenCL device.
* an instance of this class represents a single cl_device
*/
class OpenCLDevice: public Device {
class OpenCLDevice : public Device {
private:
/**
*@brief opencl context

View File

@ -42,7 +42,7 @@ class WriteBufferOperation;
*/
class OutputSocket : public Socket {
private:
vector<SocketConnection*> connections;
vector<SocketConnection *> connections;
/**
* @brief index of the inputsocket that determines the datatype of this outputsocket
@ -56,9 +56,9 @@ private:
public:
OutputSocket(DataType datatype);
OutputSocket(DataType datatype, int inputSocketDataTypeDeterminatorIndex);
OutputSocket(OutputSocket * from);
OutputSocket(OutputSocket *from);
void addConnection(SocketConnection *connection);
SocketConnection *getConnection(unsigned int index) {return this->connections[index];}
SocketConnection *getConnection(unsigned int index) { return this->connections[index]; }
const int isConnected() const;
int isOutputSocket() const;
@ -73,17 +73,17 @@ public:
* @brief determine the actual data type and channel info.
*/
void determineActualDataType();
void relinkConnections(OutputSocket *relinkToSocket) {this->relinkConnections(relinkToSocket, false);};
void relinkConnections(OutputSocket *relinkToSocket) { this->relinkConnections(relinkToSocket, false); };
void relinkConnections(OutputSocket *relinkToSocket, bool single);
bool isActualDataTypeDeterminedByInputSocket() {
return this->inputSocketDataTypeDeterminatorIndex>-1;
return this->inputSocketDataTypeDeterminatorIndex > -1;
}
const int getNumberOfConnections() {return connections.size();}
const int getNumberOfConnections() { return connections.size(); }
/**
* @brief get the index of the inputsocket that determines the datatype of this outputsocket
*/
int getInputSocketDataTypeDeterminatorIndex() {return this->inputSocketDataTypeDeterminatorIndex;}
int getInputSocketDataTypeDeterminatorIndex() { return this->inputSocketDataTypeDeterminatorIndex; }
void clearConnections();
/**

View File

@ -39,7 +39,7 @@ public:
/**
* the inner loop of this program
*/
void executePixel(float *color, int x, int y, MemoryBuffer *inputBuffers[], void *data);
void executePixel(float *color, int x, int y, MemoryBuffer * inputBuffers[], void *data);
/**
* Initialize the execution
@ -53,8 +53,8 @@ public:
void *initializeTileData(rcti *rect, MemoryBuffer **memoryBuffers);
virtual MemoryBuffer* createMemoryBuffer(rcti *rect, MemoryBuffer **memoryBuffers) = 0;
virtual MemoryBuffer *createMemoryBuffer(rcti *rect, MemoryBuffer **memoryBuffers) = 0;
int isSingleThreaded() {return true;}
int isSingleThreaded() { return true; }
};
#endif

View File

@ -91,8 +91,8 @@ public:
virtual void determineResolution(int resolution[], unsigned int preferredResolution[]) {}
virtual void determineActualDataType() {}
void setEditorSocket(bNodeSocket *editorSocket) {this->editorSocket = editorSocket;}
bNodeSocket *getbNodeSocket() const {return this->editorSocket;}
void setEditorSocket(bNodeSocket *editorSocket) { this->editorSocket = editorSocket; }
bNodeSocket *getbNodeSocket() const { return this->editorSocket; }
};

View File

@ -94,22 +94,22 @@ public:
/**
* @brief return the Node where this connection is connected from
*/
NodeBase * getFromNode() const;
NodeBase *getFromNode() const;
/**
* @brief return the Node where this connection is connected to
*/
NodeBase * getToNode() const;
NodeBase *getToNode() const;
/**
* @brief set, whether the resize has already been done for this SocketConnection
*/
void setIgnoreResizeCheck(bool check) {this->ignoreResizeCheck = check;}
void setIgnoreResizeCheck(bool check) { this->ignoreResizeCheck = check; }
/**
* @brief has the resize already been done for this SocketConnection
*/
bool isIgnoreResizeCheck() const { return this->ignoreResizeCheck;}
bool isIgnoreResizeCheck() const { return this->ignoreResizeCheck; }
/**
* @brief does this SocketConnection need resolution conversion

View File

@ -97,17 +97,15 @@ public:
executePixel(result, x, y, dx, dy, inputBuffers);
}
virtual void *initializeTileData(rcti *rect, MemoryBuffer** memoryBuffers) {
return 0;
}
virtual void deinitializeTileData(rcti *rect, MemoryBuffer** memoryBuffers, void *data) {
virtual void *initializeTileData(rcti *rect, MemoryBuffer **memoryBuffers) { return 0; }
virtual void deinitializeTileData(rcti *rect, MemoryBuffer **memoryBuffers, void *data) {
}
virtual MemoryBuffer *getInputMemoryBuffer(MemoryBuffer** memoryBuffers) {return 0;}
virtual MemoryBuffer *getInputMemoryBuffer(MemoryBuffer **memoryBuffers) { return 0; }
inline const unsigned int getWidth() const {return this->width;}
inline const unsigned int getHeight() const {return this->height;}
inline const unsigned int getWidth() const { return this->width; }
inline const unsigned int getHeight() const { return this->height; }
};
#endif

View File

@ -53,12 +53,12 @@ public:
/**
* @brief get the ExecutionGroup
*/
ExecutionGroup *getExecutionGroup() const {return this->executionGroup;}
ExecutionGroup *getExecutionGroup() const { return this->executionGroup; }
/**
* @brief get the number of the chunk
*/
unsigned int getChunkNumber() const {return this->chunkNumber;}
unsigned int getChunkNumber() const { return this->chunkNumber; }
};
#endif

View File

@ -29,10 +29,10 @@
* @brief AlphaOverNode
* @ingroup Node
*/
class AlphaOverNode: public Node {
class AlphaOverNode : public Node {
public:
AlphaOverNode(bNode *editorNode) :Node(editorNode) {}
void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
AlphaOverNode(bNode *editorNode) : Node(editorNode) {}
void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
};
#endif

View File

@ -29,10 +29,10 @@
* @brief BilateralBlurNode
* @ingroup Node
*/
class BilateralBlurNode: public Node {
class BilateralBlurNode : public Node {
public:
BilateralBlurNode(bNode *editorNode);
void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
};
#endif

View File

@ -30,10 +30,10 @@
* @ingroup Node
*/
class BlurNode: public Node {
class BlurNode : public Node {
public:
BlurNode(bNode *editorNode);
void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
};
#endif

View File

@ -30,10 +30,10 @@
* @ingroup Node
*/
class BokehBlurNode: public Node {
class BokehBlurNode : public Node {
public:
BokehBlurNode(bNode *editorNode);
void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
};
#endif

View File

@ -29,10 +29,10 @@
* @brief BokehImageNode
* @ingroup Node
*/
class BokehImageNode: public Node {
class BokehImageNode : public Node {
public:
BokehImageNode(bNode *editorNode);
void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
};
#endif

View File

@ -29,10 +29,10 @@
* @brief BoxMaskNode
* @ingroup Node
*/
class BoxMaskNode: public Node {
class BoxMaskNode : public Node {
public:
BoxMaskNode(bNode *editorNode);
void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
};
#endif

View File

@ -29,10 +29,10 @@
* @brief BrightnessNode
* @ingroup Node
*/
class BrightnessNode: public Node {
class BrightnessNode : public Node {
public:
BrightnessNode(bNode *editorNode);
void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
};
#endif

View File

@ -29,10 +29,10 @@
* @brief ColorCorrectionNode
* @ingroup Node
*/
class ColorCorrectionNode: public Node {
class ColorCorrectionNode : public Node {
public:
ColorCorrectionNode(bNode *editorNode);
void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
};
#endif

View File

@ -29,10 +29,10 @@
* @brief ColorCurveNode
* @ingroup Node
*/
class ColorCurveNode: public Node {
class ColorCurveNode : public Node {
public:
ColorCurveNode(bNode *editorNode);
void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
};
#endif

View File

@ -29,10 +29,10 @@
* @brief ColorNode
* @ingroup Node
*/
class ColorNode: public Node {
class ColorNode : public Node {
public:
ColorNode(bNode *editorNode);
void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
};
#endif

View File

@ -33,7 +33,7 @@ class ColorRampNode : public Node
{
public:
ColorRampNode(bNode *editorNode);
void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
};
#endif // COM_ColorRampNODE_H

View File

@ -32,6 +32,6 @@
class ColourToBWNode : public Node {
public:
ColourToBWNode(bNode *editorNode);
void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
};
#endif

View File

@ -33,6 +33,6 @@
class CombineHSVANode : public CombineRGBANode {
public:
CombineHSVANode(bNode *editorNode);
void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
};
#endif

View File

@ -32,6 +32,6 @@
class CombineRGBANode : public Node {
public:
CombineRGBANode(bNode *editorNode);
void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
};
#endif

View File

@ -32,6 +32,6 @@
class CompositorNode : public Node {
public:
CompositorNode(bNode *editorNode);
void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
};
#endif

View File

@ -28,10 +28,10 @@
* @brief ConvertAlphaNode
* @ingroup Node
*/
class ConvertAlphaNode: public Node {
class ConvertAlphaNode : public Node {
public:
ConvertAlphaNode(bNode *editorNode) :Node(editorNode) {}
void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
ConvertAlphaNode(bNode *editorNode) : Node(editorNode) {}
void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
};
#endif

View File

@ -25,10 +25,10 @@
#include "COM_Node.h"
class CropNode: public Node {
class CropNode : public Node {
public:
CropNode(bNode *editorNode);
void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
};
#endif

View File

@ -30,10 +30,10 @@
* @ingroup Node
*/
class DefocusNode: public Node {
class DefocusNode : public Node {
public:
DefocusNode(bNode *editorNode);
void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
};
#endif

View File

@ -33,7 +33,7 @@ class DifferenceMatteNode : public Node
{
public:
DifferenceMatteNode(bNode *editorNode);
void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
};
#endif // COM_DifferenceMatteNODE_H

View File

@ -29,10 +29,10 @@
* @brief DilateErodeNode
* @ingroup Node
*/
class DilateErodeNode: public Node {
class DilateErodeNode : public Node {
public:
DilateErodeNode(bNode *editorNode);
void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
};
#endif

View File

@ -29,10 +29,10 @@
* @brief DirectionalBlurNode
* @ingroup Node
*/
class DirectionalBlurNode: public Node {
class DirectionalBlurNode : public Node {
public:
DirectionalBlurNode(bNode *editorNode);
void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
};
#endif

View File

@ -31,6 +31,6 @@
class DisplaceNode : public Node {
public:
DisplaceNode(bNode *editorNode);
void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
};
#endif

View File

@ -29,10 +29,10 @@
* @brief DoubleEdgeMaskNode
* @ingroup Node
*/
class DoubleEdgeMaskNode: public Node {
class DoubleEdgeMaskNode : public Node {
public:
DoubleEdgeMaskNode(bNode *editorNode);
void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
};
#endif

View File

@ -29,10 +29,10 @@
* @brief EllipseMaskNode
* @ingroup Node
*/
class EllipseMaskNode: public Node {
class EllipseMaskNode : public Node {
public:
EllipseMaskNode(bNode *editorNode);
void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
};
#endif

View File

@ -33,7 +33,7 @@ class FilterNode : public Node
{
public:
FilterNode(bNode *editorNode);
void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
};
#endif // COM_FILTERNODE_H

View File

@ -29,10 +29,10 @@
* @brief FlipNode
* @ingroup Node
*/
class FlipNode: public Node {
class FlipNode : public Node {
public:
FlipNode(bNode *editorNode);
void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
};
#endif

View File

@ -29,10 +29,10 @@
* @brief GammaNode
* @ingroup Node
*/
class GammaNode: public Node {
class GammaNode : public Node {
public:
GammaNode(bNode *editorNode);
void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
};
#endif

View File

@ -29,10 +29,10 @@
* @brief GlareNode
* @ingroup Node
*/
class GlareNode: public Node {
class GlareNode : public Node {
public:
GlareNode(bNode *editorNode);
void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
};
#endif

View File

@ -30,10 +30,10 @@
* @brief Represents a group node
* @ingroup Node
*/
class GroupNode: public Node {
class GroupNode : public Node {
public:
GroupNode(bNode *editorNode);
void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
/**
* @brief check if this node a group node.

View File

@ -32,6 +32,6 @@
class HueSaturationValueCorrectNode : public Node {
public:
HueSaturationValueCorrectNode(bNode *editorNode);
void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
};
#endif

View File

@ -32,6 +32,6 @@
class HueSaturationValueNode : public Node {
public:
HueSaturationValueNode(bNode *editorNode);
void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
};
#endif

View File

@ -29,10 +29,10 @@
* @brief IDMaskNode
* @ingroup Node
*/
class IDMaskNode: public Node {
class IDMaskNode : public Node {
public:
IDMaskNode(bNode *editorNode);
void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
};
#endif

View File

@ -39,6 +39,6 @@ private:
NodeOperation *doMultilayerCheck(ExecutionSystem *system, RenderLayer *rl, Image *image, ImageUser *user, int framenumber, int outputsocketIndex, int pass, DataType datatype);
public:
ImageNode(bNode *editorNode);
void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
};

View File

@ -29,10 +29,10 @@
* @brief InvertNode
* @ingroup Node
*/
class InvertNode: public Node {
class InvertNode : public Node {
public:
InvertNode(bNode *editorNode);
void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
};
#endif

View File

@ -29,10 +29,10 @@
* @brief LensDistortionNode
* @ingroup Node
*/
class LensDistortionNode: public Node {
class LensDistortionNode : public Node {
public:
LensDistortionNode(bNode *editorNode);
void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
};
#endif

View File

@ -31,6 +31,6 @@
class MapUVNode : public Node {
public:
MapUVNode(bNode *editorNode);
void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
};
#endif

View File

@ -32,6 +32,6 @@
class MapValueNode : public Node {
public:
MapValueNode(bNode *editorNode);
void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
};
#endif

View File

@ -29,10 +29,10 @@
* @brief MathNode
* @ingroup Node
*/
class MathNode: public Node {
class MathNode : public Node {
public:
MathNode(bNode *editorNode) :Node(editorNode) {}
void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
MathNode(bNode *editorNode) : Node(editorNode) {}
void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
};
#endif

View File

@ -32,6 +32,6 @@
class MixNode : public Node {
public:
MixNode(bNode *editorNode);
void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
};
#endif

View File

@ -32,6 +32,6 @@ class MovieClipNode : public Node {
public:
MovieClipNode(bNode *editorNode);
void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
};

View File

@ -29,10 +29,10 @@
* @brief MovieDistortionNode
* @ingroup Node
*/
class MovieDistortionNode: public Node {
class MovieDistortionNode : public Node {
public:
MovieDistortionNode(bNode *editorNode);
void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
};
#endif

View File

@ -29,12 +29,12 @@
* @brief MuteNode
* @ingroup Node
*/
class MuteNode: public Node {
class MuteNode : public Node {
public:
MuteNode(bNode *editorNode);
void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
private:
void reconnect(ExecutionSystem *graph, OutputSocket * output);
void reconnect(ExecutionSystem *graph, OutputSocket *output);
};
#endif

View File

@ -33,7 +33,7 @@ class NormalNode : public Node
{
public:
NormalNode(bNode *editorNode);
void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
};
#endif // COM_NormalNODE_H

View File

@ -28,10 +28,10 @@
* @brief NormalizeNode
* @ingroup Node
*/
class NormalizeNode: public Node {
class NormalizeNode : public Node {
public:
NormalizeNode(bNode *editorNode);
void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
};
#endif

View File

@ -34,7 +34,7 @@
class OutputFileNode : public Node {
public:
OutputFileNode(bNode *editorNode);
void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
};
#endif

View File

@ -31,7 +31,7 @@
class RenderLayersNode : public Node {
public:
RenderLayersNode(bNode *editorNode);
void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
private:
void testSocketConnection(ExecutionSystem *graph, int outputSocketNumber, RenderLayersBaseProg * operation);
void testSocketConnection(ExecutionSystem *graph, int outputSocketNumber, RenderLayersBaseProg *operation);
};

View File

@ -29,10 +29,10 @@
* @brief RotateNode
* @ingroup Node
*/
class RotateNode: public Node {
class RotateNode : public Node {
public:
RotateNode(bNode *editorNode);
void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
};
#endif

View File

@ -29,10 +29,10 @@
* @brief ScaleNode
* @ingroup Node
*/
class ScaleNode: public Node {
class ScaleNode : public Node {
public:
ScaleNode(bNode *editorNode);
void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
};
#endif

View File

@ -34,6 +34,6 @@
class SeparateHSVANode : public SeparateRGBANode {
public:
SeparateHSVANode(bNode *editorNode);
void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
};
#endif

View File

@ -32,6 +32,6 @@
class SeparateRGBANode : public Node {
public:
SeparateRGBANode(bNode *editorNode);
void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
};
#endif

View File

@ -29,10 +29,10 @@
* @brief SetAlphaNode
* @ingroup Node
*/
class SetAlphaNode: public Node {
class SetAlphaNode : public Node {
public:
SetAlphaNode(bNode *editorNode) :Node(editorNode) {}
void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
SetAlphaNode(bNode *editorNode) : Node(editorNode) {}
void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
};
#endif

View File

@ -29,10 +29,10 @@
* @brief SocketProxyNode
* @ingroup Node
*/
class SocketProxyNode: public Node {
class SocketProxyNode : public Node {
public:
SocketProxyNode(bNode *editorNode, bNodeSocket *editorInput, bNodeSocket *editorOutput);
void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
virtual bool isProxyNode() const { return true; }
};

View File

@ -32,6 +32,6 @@
class SplitViewerNode : public Node {
public:
SplitViewerNode(bNode *editorNode);
void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
};
#endif

View File

@ -30,5 +30,5 @@
class Stabilize2dNode : public Node {
public:
Stabilize2dNode(bNode *editorNode);
void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
};

View File

@ -33,6 +33,6 @@
class SwitchNode : public Node {
public:
SwitchNode(bNode *editorNode);
void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
};
#endif

View File

@ -30,5 +30,5 @@
class TextureNode : public Node {
public:
TextureNode(bNode *editorNode);
void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
};

View File

@ -29,10 +29,10 @@
* @brief TimeNode
* @ingroup Node
*/
class TimeNode: public Node {
class TimeNode : public Node {
public:
TimeNode(bNode *editorNode);
void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
};
#endif

View File

@ -29,10 +29,10 @@
* @brief TonemapNode
* @ingroup Node
*/
class TonemapNode: public Node {
class TonemapNode : public Node {
public:
TonemapNode(bNode *editorNode);
void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
};
#endif

View File

@ -30,5 +30,5 @@
class TransformNode : public Node {
public:
TransformNode(bNode *editorNode);
void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
};

View File

@ -29,10 +29,10 @@
* @brief TranslateNode
* @ingroup Node
*/
class TranslateNode: public Node {
class TranslateNode : public Node {
public:
TranslateNode(bNode *editorNode);
void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
};
#endif

View File

@ -29,10 +29,10 @@
* @brief ValueNode
* @ingroup Node
*/
class ValueNode: public Node {
class ValueNode : public Node {
public:
ValueNode(bNode *editorNode);
void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
};
#endif

View File

@ -29,10 +29,10 @@
* @brief VectorBlurNode
* @ingroup Node
*/
class VectorBlurNode: public Node {
class VectorBlurNode : public Node {
public:
VectorBlurNode(bNode *editorNode);
void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
};
#endif

View File

@ -29,10 +29,10 @@
* @brief VectorCurveNode
* @ingroup Node
*/
class VectorCurveNode: public Node {
class VectorCurveNode : public Node {
public:
VectorCurveNode(bNode *editorNode);
void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
};
#endif

View File

@ -29,10 +29,10 @@
* @brief ViewLevelsNode
* @ingroup Node
*/
class ViewLevelsNode: public Node {
class ViewLevelsNode : public Node {
public:
ViewLevelsNode(bNode *editorNode);
void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
};
#endif

View File

@ -32,6 +32,6 @@
class ViewerNode : public Node {
public:
ViewerNode(bNode *editorNode);
void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
};
#endif

View File

@ -29,10 +29,10 @@
* @brief ZCombineNode
* @ingroup Node
*/
class ZCombineNode: public Node {
class ZCombineNode : public Node {
public:
ZCombineNode(bNode *editorNode) :Node(editorNode) {}
void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
ZCombineNode(bNode *editorNode) : Node(editorNode) {}
void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
};
#endif

View File

@ -39,6 +39,6 @@ public:
/**
* the inner loop of this program
*/
void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]);
void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]);
};
#endif

View File

@ -41,8 +41,8 @@ public:
/**
* the inner loop of this program
*/
void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]);
void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]);
void setX(float x) {this->x = x;}
void setX(float x) { this->x = x; }
};
#endif

View File

@ -39,7 +39,7 @@ public:
/**
* the inner loop of this program
*/
void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]);
void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]);
};
#endif

View File

@ -35,7 +35,7 @@ protected:
/**
* @brief Cached reference to the reader
*/
SocketReader * valueReader;
SocketReader *valueReader;
char *buffer;
public:
AntiAliasOperation();
@ -43,7 +43,7 @@ public:
/**
* the inner loop of this program
*/
void executePixel(float *color, int x, int y, MemoryBuffer *inputBuffers[], void * data);
void executePixel(float *color, int x, int y, MemoryBuffer * inputBuffers[], void *data);
/**
* Initialize the execution

View File

@ -38,7 +38,7 @@ public:
/**
* the inner loop of this program
*/
void executePixel(float *color, int x, int y, MemoryBuffer *inputBuffers[], void *data);
void executePixel(float *color, int x, int y, MemoryBuffer * inputBuffers[], void *data);
/**
* Initialize the execution
@ -52,6 +52,6 @@ public:
bool determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output);
void setData(NodeBilateralBlurData *data) {this->data = data;}
void setData(NodeBilateralBlurData *data) { this->data = data; }
};
#endif

View File

@ -34,7 +34,7 @@ protected:
*/
SocketReader *inputProgram;
SocketReader *inputSize;
NodeBlurData * data;
NodeBlurData *data;
BlurBaseOperation();
float *make_gausstab(int rad);
float size;
@ -52,10 +52,10 @@ public:
*/
void deinitExecution();
void setData(NodeBlurData *data) {this->data = data;}
void setData(NodeBlurData *data) { this->data = data; }
void deleteDataWhenFinished() {this->deleteData = true;}
void deleteDataWhenFinished() { this->deleteData = true; }
void setSize(float size) {this->size = size; sizeavailable = true;}
void setSize(float size) { this->size = size; sizeavailable = true; }
};
#endif

View File

@ -41,7 +41,7 @@ public:
/**
* the inner loop of this program
*/
void executePixel(float *color, int x, int y, MemoryBuffer *inputBuffers[], void *data);
void executePixel(float *color, int x, int y, MemoryBuffer * inputBuffers[], void *data);
/**
* Initialize the execution
@ -55,7 +55,7 @@ public:
bool determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output);
void setSize(float size) {this->size = size;}
void setSize(float size) { this->size = size; }
void executeOpenCL(cl_context context, cl_program program, cl_command_queue queue, MemoryBuffer *outputMemoryBuffer, cl_mem clOutputBuffer, MemoryBuffer **inputMemoryBuffers, list<cl_mem> *clMemToCleanUp, list<cl_kernel> *clKernelsToCleanUp);
};

View File

@ -47,7 +47,7 @@ public:
/**
* the inner loop of this program
*/
void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]);
void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]);
/**
* Initialize the execution
@ -61,7 +61,7 @@ public:
void determineResolution(unsigned int resolution[], unsigned int preferredResolution[]);
void setData(NodeBokehImage *data) {this->data = data;}
void deleteDataOnFinish() {this->deleteData = true;}
void setData(NodeBokehImage *data) { this->data = data; }
void deleteDataOnFinish() { this->deleteData = true; }
};
#endif

View File

@ -30,8 +30,8 @@ private:
/**
* Cached reference to the inputProgram
*/
SocketReader * inputMask;
SocketReader * inputValue;
SocketReader *inputMask;
SocketReader *inputValue;
float sine;
float cosine;
@ -45,7 +45,7 @@ public:
/**
* the inner loop of this program
*/
void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]);
void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]);
/**
* Initialize the execution
@ -57,9 +57,9 @@ public:
*/
void deinitExecution();
void setData(NodeBoxMask *data) {this->data = data;}
void setData(NodeBoxMask *data) { this->data = data; }
void setMaskType(int maskType) {this->maskType = maskType;}
void setMaskType(int maskType) { this->maskType = maskType; }
};
#endif

View File

@ -40,7 +40,7 @@ public:
/**
* the inner loop of this program
*/
void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]);
void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]);
/**
* Initialize the execution

View File

@ -34,7 +34,7 @@ protected:
/**
* @brief Cached reference to the reader
*/
SocketReader * imageReader;
SocketReader *imageReader;
bool iscalculated;
float result;
@ -46,7 +46,7 @@ public:
/**
* the inner loop of this program
*/
void executePixel(float *color, int x, int y, MemoryBuffer *inputBuffers[], void * data);
void executePixel(float *color, int x, int y, MemoryBuffer * inputBuffers[], void *data);
/**
* Initialize the execution
@ -61,7 +61,7 @@ public:
void deinitExecution();
bool determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output);
void setSetting(int setting) {this->setting = setting;}
void setSetting(int setting) { this->setting = setting; }
protected:
void calculateMean(MemoryBuffer *tile);

Some files were not shown because too many files have changed in this diff Show More